Changeset 443 for trunk/kernel/syscalls/sys_thread_cancel.c

Timestamp:

May 16, 2018, 4:15:22 PM (6 years ago)

Author:

alain

Message:

Fix few bugs whike debugging the sort multi-thread application.

File:

• trunk/kernel/syscalls/sys_thread_cancel.c (modified) (5 diffs)

trunk/kernel/syscalls/sys_thread_cancel.c

@@ -37 +37 @@
     cxy_t        target_cxy;    // target thread cluster identifier
     ltid_t       target_ltid;   // target thread local index
+    xptr_t       owner_xp;      // extended pointer on owner process
     cxy_t        owner_cxy;     // process owner cluster identifier
-    xptr_t       owner_xp;      // extended pointer on owner process
 
     // get killer thread pointers
@@ -44 +44 @@
     process_t  * process = this->process;
     pid_t        pid     = process->pid;
+
+#if DEBUG_SYS_THREAD_CANCEL
+uint64_t     tm_start;
+uint64_t     tm_end;
+tm_start = hal_get_cycles();
+if( DEBUG_SYS_THREAD_CANCEL < tm_start )
+printk("\n[DBG] %s : thread %x enter to kill thread %x in process %x / cycle %d\n",
+__FUNCTION__, this , trdid , pid , (uint32_t)tm_start );
+#endif
 
     // get extended pointer on target thread
@@ -59 +68 @@
     }
 
-#if DEBUG_SYS_THREAD_CANCEL
-uint64_t     tm_start;
-uint64_t     tm_end;
-tm_start = hal_get_cycles();
-if( DEBUG_SYS_THREAD_CANCEL < tm_start )
-printk("\n[DBG] %s : thread %x enter to kill thread %x / cycle %d\n",
-__FUCTION__, this, GET_PTR( target_xp ), (uint32_t)tm_start );
-#endif
-
-    // get process owner cluster identifier
-    owner_cxy = CXY_FROM_PID( pid );
+    // get process owner cluster
+    owner_xp  = process->owner_xp;
+    owner_cxy = GET_CXY( owner_xp );
 
     // get target thread ltid and cluster
@@ -79 +80 @@
     if( (target_cxy == owner_cxy) && (target_ltid == 0) )
     {
-        // get extended pointer on owner cluster
-        owner_xp = cluster_get_owner_process_from_pid( pid );
-
         // mark for delete all threads but the main 
         hal_enable_irq( &save_sr );
@@ -107 +105 @@
 tm_end = hal_get_cycles();
 if( DEBUG_SYS_THREAD_CANCEL < tm_end )
-printk("\n[DBG] %s : thread %x exit after kill thread %x / cycle %d\n",
-__FUCTION__, this, GET_PTR( target_xp ), (uint32_t)tm_end );
+printk("\n[DBG] %s : thread %x exit after kill thread %x in process %x / cycle %d\n",
+__FUNCTION__, this , trdid , pid , (uint32_t)tm_end );
 #endif