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

Timestamp:

Mar 7, 2018, 9:02:03 AM (6 years ago)

Author:

alain

Message:

1) improve the threads and process destruction mechanism.
2) introduce FIFOs in the soclib_tty driver.

File:

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

trunk/kernel/syscalls/sys_exit.c

@@ -41 +41 @@
     process_t * process = this->process;
     pid_t       pid     = process->pid;
+    trdid_t     trdid   = this->trdid;
 
 #if CONFIG_DEBUG_SYS_EXIT
@@ -55 +56 @@
 
     // exit must be called by the main thread
-    if( (owner_cxy != local_cxy) || (LTID_FROM_TRDID( this->trdid ) != 0) )
+    if( (owner_cxy != local_cxy) || (LTID_FROM_TRDID( 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 );
+printk("\n[ERROR] in %s : calling thread %x is not thread 0 in owner cluster %x\n",
+__FUNCTION__, trdid, owner_cxy );
 #endif
          this->errno = EINVAL;
@@ -73 +73 @@
     process->term_state = status;
 
-    // remove TXT ownership from owner process descriptor
-    process_txt_reset_ownership( XPTR( local_cxy , process ) );
+#if( CONFIG_DEBUG_SYS_EXIT & 1)
+printk("\n[DBG] %s : set exit status in process term_state\n", __FUNCTION__);
+#endif
 
-    // block all process threads in all clusters
-    process_sigaction( pid , BLOCK_ALL_THREADS );
+    // remove process from TXT list
+    process_txt_detach( XPTR( local_cxy , process ) );
 
-    // mark all process threads in all clusters for delete 
+#if( CONFIG_DEBUG_SYS_EXIT & 1)
+printk("\n[DBG] %s : removed from TXT list\n", __FUNCTION__);
+#endif
+
+    // mark for delete all process threads in all clusters (but the main) 
     process_sigaction( pid , DELETE_ALL_THREADS );
+
+#if( CONFIG_DEBUG_SYS_EXIT & 1)
+printk("\n[DBG] %s : deleted all other threads than main\n", __FUNCTION__);
+#endif
 
     // restore IRQs
     hal_restore_irq( save_sr );
 
-    // atomically update owner process descriptor term_state
+    // block the main thread itself 
+    thread_block( XPTR( local_cxy , this ) , THREAD_BLOCKED_GLOBAL );
+
+#if( CONFIG_DEBUG_SYS_EXIT & 1)
+printk("\n[DBG] %s : blocked the main thread\n", __FUNCTION__);
+#endif
+
+    // atomically update owner process descriptor term_state to ask
+    // the parent process sys_wait() function to delete this main thread 
     hal_remote_atomic_or( XPTR( local_cxy , &process->term_state ) ,
                           PROCESS_TERM_EXIT );
+
+#if( CONFIG_DEBUG_SYS_EXIT & 1)
+printk("\n[DBG] %s : set EXIT flag in process term_state\n", __FUNCTION__);
+#endif
+
     hal_fence();
 
@@ -97 +119 @@
 #endif
 
+    // main thread deschedule
+    sched_yield( "process exit" );
+
+    // this code should never be executed
+    assert( false , __FUNCTION__ , "this code should not be executed...\n" );
         return 0;