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

Timestamp:

Jun 19, 2018, 5:12:57 PM (6 years ago)

Author:

alain

Message:

miscelaneous...

File:

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

trunk/kernel/syscalls/sys_kill.c

@@ -37 +37 @@
               uint32_t sig_id )
 {
-    xptr_t      owner_xp;      // extended pointer on target process in owner cluster
-    cxy_t       owner_cxy;     // target process in owner cluster
-    process_t * owner_ptr;     // local pointer on target process in owner cluster
-    uint32_t    retval;        // return value for the switch
+    reg_t       save_sr;           // required to enable IRQs
+    xptr_t      owner_xp;          // extended pointer on process in owner cluster
+    cxy_t       owner_cxy;         // process owner cluster
+    process_t * owner_ptr;         // local pointer on process in owner cluster
+    uint32_t    retval;            // return value for the switch
+    xptr_t      parent_xp;         // extended pointer on parent process
+    cxy_t       parent_cxy;        // parent process cluster
+    process_t * parent_ptr;        // local pointer on parent process
+    xptr_t      children_lock_xp;  // extended pointer on children lock in parent
+    thread_t  * parent_main_ptr;   // local pointer on parent main thread
+    xptr_t      parent_main_xp;    // extended pointer on parent main thread
 
     thread_t  * this    = CURRENT_THREAD;
@@ -59 +66 @@
     owner_ptr = GET_PTR( owner_xp );
     
+#if (DEBUG_SYS_KILL & 1)
+if( DEBUG_SYS_KILL < tm_start )
+printk("\n[DBG] %s : thread %x found process %x in cluster %x\n",
+__FUNCTION__ , this, owner_ptr, owner_cxy );
+#endif
+
     // check process found
     if( owner_xp == XPTR_NULL)
@@ -92 +105 @@
     }
 
+    // get parent process descriptor pointers
+    parent_xp  = (xptr_t)hal_remote_lwd( XPTR( owner_cxy , &owner_ptr->parent_xp ) );
+    parent_cxy = GET_CXY( parent_xp );
+    parent_ptr = GET_PTR( parent_xp );
+
+#if (DEBUG_SYS_KILL & 1)
+if( DEBUG_SYS_KILL < tm_start )
+printk("\n[DBG] %s : thread %x get parent process %x in cluster %x\n",
+__FUNCTION__ , this, parent_ptr, parent_cxy );
+#endif
+
+    // get extended pointer on lock protecting children list in parent process
+    children_lock_xp = XPTR( parent_cxy , &parent_ptr->children_lock ); 
+
+    // get pointers on the parent process main thread
+    parent_main_ptr = hal_remote_lpt( XPTR( parent_cxy , &parent_ptr->th_tbl[0] ) ); 
+    parent_main_xp  = XPTR( parent_cxy , parent_main_ptr );
+
     // analyse signal type / supported values are : 0, SIGSTOP, SIGCONT, SIGKILL
     switch( sig_id )
@@ -108 +139 @@
             process_sigaction( pid , BLOCK_ALL_THREADS );
 
-            // get pointer on target process main thread
+            // block the main thread
             xptr_t main_xp = XPTR( owner_cxy , &owner_ptr->th_tbl[0] );
-
-            // block main thread
             thread_block( main_xp , THREAD_BLOCKED_GLOBAL );
 
@@ -117 +146 @@
             hal_remote_atomic_or( XPTR( owner_cxy , &owner_ptr->term_state ) ,
                                   PROCESS_TERM_STOP );
+
+            // take the children lock and unblock the parent process main thread 
+            remote_spinlock_lock( children_lock_xp );
+            thread_unblock( parent_main_xp , THREAD_BLOCKED_WAIT );
+            remote_spinlock_unlock( children_lock_xp );
+
             retval = 0;
             break;
@@ -137 +172 @@
             process_txt_detach( owner_xp );
 
-            // mark for delete all process threads in all clusters, but the main 
+            // mark for delete all threads in all clusters, but the main 
+            hal_enable_irq( &save_sr );
             process_sigaction( pid , DELETE_ALL_THREADS );
-
-            // get pointer on target process main thread
+            hal_restore_irq( save_sr );
+
+            // block main thread
             xptr_t main_xp = XPTR( owner_cxy , &owner_ptr->th_tbl[0] );
-
-            // block main thread
             thread_block( main_xp , THREAD_BLOCKED_GLOBAL );
 
@@ -150 +185 @@
             hal_remote_atomic_or( XPTR( owner_cxy , &owner_ptr->term_state ) ,
                                   PROCESS_TERM_KILL );
+
+            // take the children lock and unblock the parent process main thread 
+            remote_spinlock_lock( children_lock_xp );
+            thread_unblock( parent_main_xp , THREAD_BLOCKED_WAIT );
+            remote_spinlock_unlock( children_lock_xp );
+
             retval = 0;
             break;