Changeset 683 for trunk/kernel/syscalls/sys_kill.c

Timestamp:

Jan 13, 2021, 12:36:17 AM (3 years ago)

Author:

alain

Message:

All modifications required to support the <tcp_chat> application
including error recovery in case of packet loss.A

File:

• trunk/kernel/syscalls/sys_kill.c (modified) (7 diffs)

trunk/kernel/syscalls/sys_kill.c

@@ -2 +2 @@
  * sys_kill.c - Kernel function implementing the "kill" system call.
  * 
- * Author    Alain Greiner (2016,2017,2018)
+ * Author    Alain Greiner     (2016,2017,2018,2019,2020)
  *
  * Copyright (c)  UPMC Sorbonne Universites
@@ -67 +67 @@
     process_t * process = this->process;
 
-#if (DEBUG_SYS_KILL || CONFIG_INSTRUMENTATION_SYSCALLS)
+#if DEBUG_SYS_KILL || DEBUG_SYSCALLS_ERROR || CONFIG_INSTRUMENTATION_SYSCALLS
 uint64_t     tm_start = hal_get_cycles();
 #endif
 
 #if DEBUG_SYS_KILL
-tm_start = hal_get_cycles();
 if( DEBUG_SYS_KILL < tm_start )
 printk("\n[%s] thread[%x,%x] enter : %s to process %x / cycle %d\n",
@@ -95 +94 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : process %x not found\n", __FUNCTION__, pid );
+if( DEBUG_SYSCALLS_ERROR < tm_start )
+printk("\n[ERROR] in %s : thread[%x,%x] / process %x not found\n",
+__FUNCTION__, process->pid, this->trdid, pid );
 #endif
         this->errno = EINVAL;
@@ -175 +176 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : process %x cannot kill itself\n", __FUNCTION__, pid );
+if( DEBUG_SYSCALLS_ERROR < tm_start )
+printk("\n[ERROR] in %s : thread[%x,%x] / process %x cannot kill itself\n",
+__FUNCTION__, process->pid, this->trdid, pid );
 #endif
                 this->errno = EINVAL;
@@ -186 +189 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : process_init cannot be killed\n", __FUNCTION__ );
+if( DEBUG_SYSCALLS_ERROR < tm_start )
+printk("\n[ERROR] in %s : thread[%x,%x] / process_init cannot be killed\n",
+ __FUNCTION__, process->pid, this->trdid);
 #endif
                         this->errno = EINVAL;
@@ -219 +224 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : illegal signal %d / process %x\n", __FUNCTION__, sig_id, pid );
+if( DEBUG_SYSCALLS_ERROR < tm_start )
+printk("\n[ERROR] in %s : thread[%x,%x] / illegal signal %d\n",
+__FUNCTION__, process->pid, this->trdid, sig_id );
 #endif
             this->errno = EINVAL;
@@ -234 +241 @@
 #if DEBUG_SYS_KILL
 if( DEBUG_SYS_KILL < tm_end )
-printk("\n[%s] thread[%x,%x] exit / process %x / %s / cost = %d / cycle %d\n",
+printk("\n[%s] thread[%x,%x] exit / process %x / %s / cycle %d\n",
 __FUNCTION__ , this->process->pid, this->trdid, pid,
-sig_type_str(sig_id), (uint32_t)(tm_end - tm_start), (uint32_t)tm_end );
+sig_type_str(sig_id), (uint32_t)tm_end );
 #endif