Changeset 651 for trunk/kernel/kern/thread.c

Timestamp:

Nov 14, 2019, 11:50:09 AM (4 years ago)

Author:

alain

Message:

1) Improve the VMM MMAP allocator: implement the "buddy" algorithm
to allocate only aligned blocks.
2) fix a bug in the pthread_join() / pthread_exit() mmechanism.

File:

• trunk/kernel/kern/thread.c (modified) (12 diffs)

trunk/kernel/kern/thread.c

@@ -673 +673 @@
 uint32_t cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_THREAD_USER_EXEC < cycle )
-printk("\n[%s] thread[%x,%x] enter / cycle %d\n",
-__FUNCTION__, process->pid, thread->trdid, cycle );
+printk("\n[%s] thread[%x,%x] enter / entry %x / cycle %d\n",
+__FUNCTION__, process->pid, thread->trdid, entry_func , cycle );
 #endif
 
@@ -1105 +1105 @@
 //////////////////////////////////////
 void thread_delete( xptr_t  target_xp,
-                    pid_t   pid,
                     bool_t  is_forced )
 {
@@ -1115 +1114 @@
     cxy_t       target_cxy;             // target thread cluster     
     thread_t  * target_ptr;             // pointer on target thread
-    process_t * target_process;         // pointer on arget process
+    process_t * target_process;         // pointer on target process
     pid_t       target_pid;             // target process identifier
     xptr_t      target_flags_xp;        // extended pointer on target thread <flags>
@@ -1122 +1121 @@
     trdid_t     target_trdid;           // target thread identifier
     ltid_t      target_ltid;            // target thread local index
+    uint32_t    target_flags;           // target thread flags
     xptr_t      joining_xp;             // extended pointer on joining thread
+    thread_t  * joining_ptr;            // local pointer on joining thread
+    cxy_t       joining_cxy;            // joining thread cluster
 
     // get target thread cluster and local pointer
@@ -1128 +1130 @@
     target_ptr      = GET_PTR( target_xp );
 
-    // get target thread identifier, attached flag, and process PID
+    // get target thread trdid, ltid, flags, and process PID
     target_trdid    = hal_remote_l32( XPTR( target_cxy , &target_ptr->trdid ) );
     target_ltid     = LTID_FROM_TRDID( target_trdid );
-    target_flags_xp = XPTR( target_cxy , &target_ptr->flags ); 
-    target_attached = ( (hal_remote_l32( target_flags_xp ) & THREAD_FLAG_DETACHED) == 0 );
+    target_flags_xp = XPTR( target_cxy , &target_ptr->flags );
+    target_flags    = hal_remote_l32( target_flags_xp );
     target_process  = hal_remote_lpt( XPTR( target_cxy , &target_ptr->process ) );
     target_pid      = hal_remote_l32( XPTR( target_cxy , &target_process->pid ) );
-
-// check target PID
-assert( (pid == target_pid),
-"unconsistent pid and target_xp arguments" );
+    target_attached = ((target_flags & THREAD_FLAG_DETACHED) == 0); 
 
     // get killer thread pointers
@@ -1147 +1146 @@
 uint32_t cycle  = (uint32_t)hal_get_cycles();
 if( DEBUG_THREAD_DELETE < cycle )
-printk("\n[%s] killer[%x,%x] enters / target[%x,%x] / cycle %d\n",
+printk("\n[%s] killer[%x,%x] enters / target[%x,%x] / forced %d / flags %x / cycle %d\n",
 __FUNCTION__, killer_ptr->process->pid, killer_ptr->trdid,  
-target_ptr->process->pid, target_ptr->trdid, cycle );
+target_pid, target_trdid, is_forced, target_flags, cycle );
 #endif
 
 // check target thread is not the main thread, because the main thread
 // must be deleted by the parent process sys_wait() function
-assert( ((CXY_FROM_PID( pid ) != target_cxy) || (target_ltid != 0)),
+assert( ((CXY_FROM_PID( target_pid ) != target_cxy) || (target_ltid != 0)),
 "target thread cannot be the main thread" );
 
@@ -1182 +1181 @@
             // get extended pointer on joining thread
             joining_xp  = (xptr_t)hal_remote_l64( target_join_xp_xp );
+
+            // get cluster and local pointer on joining thread
+            joining_ptr = GET_PTR( joining_xp );
+            joining_cxy = GET_CXY( joining_xp );
+
+            // copy exit_status from target thread to joining thread, because
+            // target thread may be deleted before joining thread resume
+            void * status = hal_remote_lpt( XPTR( target_cxy , &target_ptr->exit_status ) );
+            hal_remote_spt( XPTR( joining_cxy , &joining_ptr->exit_status ) , status );
             
             // reset the join_done flag in target thread
@@ -1202 +1210 @@
 
 #if DEBUG_THREAD_DELETE
-cycle  = (uint32_t)hal_get_cycles;
+cycle  = (uint32_t)hal_get_cycles();
 if( DEBUG_THREAD_DELETE < cycle )
 printk("\n[%s] killer[%x,%x] exit / target[%x,%x] marked after join / cycle %d\n",
 __FUNCTION__, killer_ptr->process->pid, killer_ptr->trdid,
-target_ptr->process->pid, target_ptr->trdid, cycle );
+target_pid, target_trdid, cycle );
 #endif
 
@@ -1215 +1223 @@
             hal_remote_atomic_or( target_flags_xp , THREAD_FLAG_KILL_DONE );
 
-            // block this thread on BLOCKED_JOIN
+            // block target thread on BLOCKED_JOIN
             thread_block( killer_xp , THREAD_BLOCKED_JOIN );
 
@@ -1225 +1233 @@
 
 #if DEBUG_THREAD_DELETE
-cycle  = (uint32_t)hal_get_cycles;
+cycle  = (uint32_t)hal_get_cycles();
 if( DEBUG_THREAD_DELETE < cycle )
 printk("\n[%s] killer[%x,%x] deschedules / target[%x,%x] not completed / cycle %d\n",
 __FUNCTION__, killer_ptr->process->pid, killer_ptr->trdid,
-target_ptr->process->pid, target_ptr->trdid, cycle );
+target_pid, target_trdid, cycle );
 #endif
             // deschedule
@@ -1244 +1252 @@
 
 #if DEBUG_THREAD_DELETE
-cycle  = (uint32_t)hal_get_cycles;
+cycle  = (uint32_t)hal_get_cycles();
 if( DEBUG_THREAD_DELETE < cycle )
 printk("\n[%s] killer[%x,%x] exit / target[%x,%x] marked after join / cycle %d\n",
 __FUNCTION__, killer_ptr->process->pid, killer_ptr->trdid,
-target_ptr->process->pid, target_ptr->trdid, cycle );
+target_pid, target_trdid, cycle );
 #endif
 
@@ -1262 +1270 @@
 
 #if DEBUG_THREAD_DELETE
-cycle  = (uint32_t)hal_get_cycles;
+cycle  = (uint32_t)hal_get_cycles();
 if( DEBUG_THREAD_DELETE < cycle )
 printk("\n[%s] killer[%x,%x] exit / target [%x,%x] marked / no join / cycle %d\n",
 __FUNCTION__, killer_ptr->process->pid, killer_ptr->trdid,
-target_ptr->process->pid, target_ptr->trdid, cycle );
+target_pid, target_trdid, cycle );
 #endif