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

Timestamp:

May 3, 2018, 5:51:22 PM (6 years ago)

Author:

alain

Message:

1/ Fix a bug in the Multithreaded "sort" applicationr:
The pthread_create() arguments must be declared as global variables.
2/ The exit syscall can be called by any thread of a process..

File:

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

trunk/kernel/syscalls/sys_thread_cancel.c

@@ -23 +23 @@
 
 #include <hal_types.h>
+#include <hal_irqmask.h>
 #include <hal_remote.h>
 #include <hal_special.h>
@@ -32 +33 @@
 int sys_thread_cancel( trdid_t trdid )
 {
+    reg_t        save_sr;       // required to enable IRQs
     xptr_t       target_xp;     // target thread extended pointer
+    cxy_t        target_cxy;    // target thread cluster identifier
+    ltid_t       target_ltid;   // target thread local index
+    cxy_t        owner_cxy;     // process owner cluster identifier
+    xptr_t       owner_xp;      // extended pointer on owner process
 
     // get killer thread pointers
         thread_t   * this    = CURRENT_THREAD;
     process_t  * process = this->process;
+    pid_t        pid     = process->pid;
 
     // get extended pointer on target thread
-        target_xp  = thread_get_xptr( process->pid , trdid );
+        target_xp  = thread_get_xptr( pid , trdid );
 
     // check target_xp
@@ -61 +68 @@
 #endif
 
-    // cal the relevant kernel function
-    thread_kill( target_xp,
-                 0,           // is_exit
-                 0 );         // is forced
+    // get process owner cluster identifier
+    owner_cxy = CXY_FROM_PID( pid );
+
+    // get target thread ltid and cluster
+    target_cxy  = CXY_FROM_TRDID( trdid );
+    target_ltid = LTID_FROM_TRDID( trdid );
+
+    // If target thread is the main thread, the process must be deleted, 
+    // This require synchronisation with parent process
+    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 );
+        process_sigaction( pid , DELETE_ALL_THREADS );
+        hal_restore_irq( save_sr );
+
+        // remove process from TXT list
+        process_txt_detach( owner_xp );
+
+        // block the main thread 
+        thread_block( XPTR( local_cxy ,this ) , THREAD_BLOCKED_GLOBAL );
+
+        // atomically update owner process descriptor term_state to ask
+        // the parent process sys_wait() function to delete the main thread 
+        hal_remote_atomic_or( XPTR( local_cxy , &process->term_state ) ,
+                              PROCESS_TERM_EXIT );
+    }
+    else
+    {
+        // block target thread and mark it for delete
+        thread_delete( target_xp , pid , false );
+    }
 
 #if DEBUG_SYS_THREAD_CANCEL