Changeset 435 for trunk/kernel/syscalls/sys_exit.c

Timestamp:

Feb 20, 2018, 5:32:17 PM (6 years ago)

Author:

alain

Message:

Fix a bad bug in scheduler...

File:

• trunk/kernel/syscalls/sys_exit.c (modified) (2 diffs)

trunk/kernel/syscalls/sys_exit.c

@@ -29 +29 @@
 #include <printk.h>
 #include <process.h>
-#include <signal.h>
+#include <shared_syscalls.h>
 #include <cluster.h>
 #include <rpc.h>
@@ -51 +51 @@
 #endif
 
-    // get cluster and pointers on process in owner cluster
-    xptr_t      owner_xp  = cluster_get_owner_process_from_pid( pid );
-    cxy_t       owner_cxy = GET_CXY( owner_xp );
-    process_t * owner_ptr = GET_PTR( owner_xp );
+    // get owner cluster
+    cxy_t  owner_cxy = CXY_FROM_PID( pid );
 
-    assert( (owner_xp != XPTR_NULL) , __FUNCTION__ , "owner_xp cannot be NULL\n" );
+    // exit must be called by the main thread
+    if( (owner_cxy != local_cxy) || (LTID_FROM_TRDID( this->trdid ) != 0) )
+    {
+
+#if CONFIG_DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] %s must be called by thread 0 in process owner cluster\n"
+       "         trdid = %x / pid = %x / local_cxy = %x\n",
+__FUNCTION__, this->trdid, pid, local_cxy );
+#endif
+         this->errno = EINVAL;
+         return -1;
+    }
 
     // enable IRQs
     hal_enable_irq( &save_sr );
 
-    // the process_make_kill() function must be executed
-    // by an RPC thread in reference cluster
-    rpc_process_make_kill_client( owner_cxy, owner_ptr, true , status );
+    // register exit_status in owner process descriptor
+    process->term_state = status;
+
+    // remove TXT ownership from owner process descriptor
+    process_txt_reset_ownership( XPTR( local_cxy , process ) );
+
+    // block all process threads in all clusters
+    process_sigaction( pid , BLOCK_ALL_THREADS );
+
+    // mark all process threads in all clusters for delete 
+    process_sigaction( pid , DELETE_ALL_THREADS );
 
     // restore IRQs
     hal_restore_irq( save_sr );
 
+    // atomically update owner process descriptor term_state
+    hal_remote_atomic_or( XPTR( local_cxy , &process->term_state ) ,
+                          PROCESS_TERM_EXIT );
     hal_fence();