Changeset 584 for trunk/kernel/syscalls/sys_thread_exit.c

Timestamp:

Nov 1, 2018, 12:13:45 PM (6 years ago)

Author:

alain

Message:

Introduce sys_place_fork() function.

File:

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

trunk/kernel/syscalls/sys_thread_exit.c

@@ -36 +36 @@
 int sys_thread_exit( void * exit_value )
 {
-    reg_t       save_sr;    // required to enable IRQs
-    xptr_t      owner_xp;   // extended pointer on owner process
- 
         thread_t  * this      = CURRENT_THREAD;
     trdid_t     trdid     = this->trdid;
     process_t * process   = this->process;
     pid_t       pid       = process->pid;
-    cxy_t       owner_cxy = CXY_FROM_PID( pid );
 
     // check exit_value argument
@@ -57 +53 @@
     }
 
-#if DEBUG_SYS_THREAD_EXIT
-uint64_t     tm_start;
-uint64_t     tm_end;
-tm_start = hal_get_cycles();
-if( DEBUG_SYS_THREAD_EXIT < tm_start )
-printk("\n[DBG] %s : thread %x in process %x enter / cycle %d\n",
-__FUNCTION__ , this->trdid, pid , (uint32_t)tm_start );
-#endif
 
     // If calling thread is the main thread, the process must be deleted. 
-    // This require to delete all process threads and synchronise with parent process
-    if( (local_cxy == owner_cxy) && (LTID_FROM_TRDID(trdid) == 0) )
+    // => delete all process threads and synchronise with parent process.
+    // If calling thread is not the main thread, it must be deleted.
+    // => block the thread and mark it for delete.
+    if( (CXY_FROM_PID( pid ) == local_cxy) && (LTID_FROM_TRDID(trdid) == 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 );
+#if DEBUG_SYS_THREAD_EXIT
+uint64_t     tm_start = hal_get_cycles();
+if( DEBUG_SYS_THREAD_EXIT < tm_start )
+printk("\n[DBG] %s : thread[%x,%x] / main => delete process / cycle %d\n",
+__FUNCTION__ , pid , trdid , (uint32_t)tm_start );
+#endif
+        // delete process
+        sys_exit( 0 );
     }
     else
     {
+
+#if DEBUG_SYS_THREAD_EXIT
+uint64_t     tm_start = hal_get_cycles();
+if( DEBUG_SYS_THREAD_EXIT < tm_start )
+printk("\n[DBG] %s : thread[%x,%x] / not main => delete thread / cycle %d\n",
+__FUNCTION__ , pid , trdid , (uint32_t)tm_start );
+#endif
         // block calling thread and mark it for delete,
         thread_delete( XPTR( local_cxy , this ) , pid , false );
+
+        // deschedule
+        sched_yield( "suicide after thread_exit" );
     }
 
-#if DEBUG_SYS_THREAD_EXIT
-tm_end = hal_get_cycles();
-if( DEBUG_SYS_THREAD_EXIT < tm_end )
-printk("\n[DBG] %s : thread %x in process %x exit / cost %d / cycle %d\n",
-__FUNCTION__, this->trdid, pid, (uint32_t)(tm_end - tm_start), (uint32_t)tm_end );
-#endif
-
-    // deschedule <=> suicide, because blocked by thread_delete()
-    sched_yield( "suicide after thread_exit" );
-    
     return 0;   // never executed but required by compiler