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

Timestamp:

Feb 14, 2018, 3:40:19 PM (6 years ago)

Author:

alain

Message:

blip

File:

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

trunk/kernel/syscalls/sys_exit.c

@@ -36 +36 @@
 int sys_exit( uint32_t status )
 {
-    uint32_t    save_sr;       // required to enable IRQs
+    reg_t       save_sr;       // required to enable IRQs
 
-    thread_t  * this = CURRENT_THREAD;
-    pid_t       pid  = this->process->pid;
+    thread_t  * this    = CURRENT_THREAD;
+    process_t * process = this->process;
+    pid_t       pid     = process->pid;
 
-#if CONFIG_SYSCALL_DEBUG
+#if CONFIG_DEBUG_SYS_EXIT
 uint64_t    tm_start;
 uint64_t    tm_end;
 tm_start = hal_get_cycles();
-printk("\n[DBG] %s : core[%x,%d] enter / process %x / status %x / cycle %d\n",
-__FUNCTION__ , local_cxy , this->core->lid , pid , status , (uint32_t)tm_start );
+if( CONFIG_DEBUG_SYS_EXIT < tm_start )
+printk("\n[DBG] %s : thread %x enter / process %x / status %x / cycle %d\n",
+__FUNCTION__ , this, pid , status , (uint32_t)tm_start );
 #endif
 
-    // get owner process cluster 
-    cxy_t   owner_cxy  = CXY_FROM_PID( pid );
+    // 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 );
+
+    assert( (owner_xp != XPTR_NULL) , __FUNCTION__ , "owner_xp cannot be NULL\n" );
 
     // enable IRQs
     hal_enable_irq( &save_sr );
 
-    // execute process_make_exit() function in owner cluster
-    if( local_cxy == owner_cxy )                                // owner is local 
-    {
-        process_make_exit( pid , status );
-    }
-    else                                                        // owner is remote
-    {
-        rpc_process_make_exit_client( owner_cxy, pid , status );
-    }
+    // 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 );
 
     // restore IRQs
@@ -70 +70 @@
     hal_fence();
 
-#if CONFIG_SYSCALL_DEBUG
+#if CONFIG_DEBUG_SYS_EXIT
 tm_end = hal_get_cycles();
-printk("\n[DBG] %s : core[%x,%d] exit / process %x / status %x / cost = %d\n",
-__FUNCTION__ , local_cxy , this->core->lid , pid , status , (uint32_t)(tm_end - tm_start) );
+if( CONFIG_DEBUG_SYS_EXIT < tm_end )
+printk("\n[DBG] %s : thread %x exit / process %x / status %x / cost = %d / cycle %d\n",
+__FUNCTION__, this, pid, status, (uint32_t)(tm_end - tm_start), (uint32_t)tm_end );
 #endif