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

Timestamp:

May 3, 2018, 5:51:22 PM (6 years ago)

Author:

alain

Message:

1/ Fix a bug in the Multithreaded "sort" applicationr:
The pthread_create() arguments must be declared as global variables.
2/ The exit syscall can be called by any thread of a process..

File:

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

trunk/kernel/syscalls/sys_thread_exit.c

@@ -2 +2 @@
  * sys_thread_exit.c - terminates the execution of calling thread
  * 
- * Authors   Alain Greiner (2016,2017)
+ * Authors   Alain Greiner (2016,2017,2018)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -23 +23 @@
 
 #include <hal_types.h>
+#include <hal_irqmask.h>
 #include <thread.h>
+#include <process.h>
 #include <core.h>
 #include <vmm.h>
@@ -32 +34 @@
 int sys_thread_exit( void * exit_value )
 {
-        thread_t  * this    = CURRENT_THREAD;
-    process_t * process = this->process;
+    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
@@ -40 +48 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : exit_value argument must be NULL for thread %x in process %x\n",
-__FUNCTION__ , exit_value, this->trdid , process->pid );
+printk("\n[ERROR] in %s : exit_value argument must be NULL / thread %x in process %x\n",
+__FUNCTION__ , this , pid );
 #endif
         this->errno = EINVAL;
@@ -53 +61 @@
 if( DEBUG_SYS_THREAD_EXIT < tm_start )
 printk("\n[DBG] %s : thread %x enter / process %x / cycle %d\n",
-__FUNCTION__ , this, process->pid , (uint32_t)tm_start );
+__FUNCTION__ , this, pid , (uint32_t)tm_start );
 #endif
 
-    // cal the relevant kernel function
-    thread_kill( XPTR( local_cxy , this ),
-                 1,           // is_exit
-                 0 );         // is forced
+    // 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) )
+    {
+        // 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 );
+    }
+    else
+    {
+        // block calling thread and mark it for delete,
+        thread_delete( XPTR( local_cxy , this ) , pid , false );
+    }
 
 #if DEBUG_SYS_THREAD_EXIT
@@ -65 +97 @@
 if( DEBUG_SYS_THREAD_EXIT < tm_end )
 printk("\n[DBG] %s : thread %x exit / process %x / cost %d / cycle %d\n",
-__FUNCTION__, this, this->process->pid, (uint32_t)(tm_end - tm_start), (uint32_t)tm_end );
+__FUNCTION__, this, pid, (uint32_t)(tm_end - tm_start), (uint32_t)tm_end );
 #endif
 
-    // deschedule <=> suicide, because blocked by thread_kill()
+    // deschedule <=> suicide, because blocked by thread_delete()
     sched_yield( "suicide after thread_exit" );