Changeset 584 for trunk/kernel/syscalls/sys_thread_join.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_join.c (modified) (6 diffs)

trunk/kernel/syscalls/sys_thread_join.c

@@ -67 +67 @@
 tm_start = hal_get_cycles();
 if( DEBUG_SYS_THREAD_JOIN < tm_start )
-printk("\n[DBG] %s : thread %x in process %x enter / target thread %x / cycle %d\n",
-__FUNCTION__ , joining_ptr->trdid, process->pid, trdid , (uint32_t)tm_start );
+printk("\n[DBG] %s : joining thread[%x,%x] enter / target thread[%x,%x] / cycle %d\n",
+__FUNCTION__ , process->pid, joining_ptr->trdid,
+process->pid, trdid, (uint32_t)tm_start );
 #endif
 
     // check trdid argument
-        if( (target_ltid >= CONFIG_THREADS_MAX_PER_CLUSTER) || cluster_is_undefined( target_cxy ) )  
+        if( (target_ltid >= CONFIG_THREADS_MAX_PER_CLUSTER) || cluster_is_undefined(target_cxy) )
         {
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : illegal trdid argument %x\n", __FUNCTION__, trdid );
+printk("\n[ERROR] in %s : illegal trdid argument %x\n",
+__FUNCTION__, trdid );
 #endif
                 joining_ptr->errno = EINVAL;
@@ -87 +89 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : exit_value argument must be NULL\n", __FUNCTION__ );
+printk("\n[ERROR] in %s : exit_value argument must be NULL\n",
+__FUNCTION__ );
 #endif
                 joining_ptr->errno = EINVAL;
@@ -113 +116 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : target thread %x not found\n", __FUNCTION__, trdid );
+printk("\n[ERROR] in %s : target thread %x not found\n",
+__FUNCTION__, trdid );
 #endif
         joining_ptr->errno = ESRCH;
@@ -145 +149 @@
     if( hal_remote_l32( target_flags_xp ) & THREAD_FLAG_KILL_DONE )  // killer thread is first
     {
-
-#if (DEBUG_SYS_THREAD_JOIN & 1)
-if( DEBUG_SYS_THREAD_JOIN < tm_start )
-printk("\n[DBG] %s : thread %x in process %x / killer thread arrived first\n",
-__FUNCTION__ , joining_ptr->trdid, process->pid );
-#endif
         // get pointers on killer thread
         killer_xp  = (xptr_t)hal_remote_l64( target_join_xp_xp );
@@ -163 +161 @@
         remote_busylock_release( target_join_lock_xp );
 
-        // restore IRQs
-        hal_restore_irq( save_sr );
+#if DEBUG_SYS_THREAD_JOIN
+tm_end = hal_get_cycles();
+if( DEBUG_SYS_THREAD_JOIN < tm_end )
+printk("\n[DBG] %s : joining thread[%x,%x] exit / target thread[%x,%x] completed / cycle %d\n",
+__FUNCTION__, process->pid, joining_ptr->trdid, process->pid, trdid, (uint32_t)tm_end );
+#endif
+
     }
     else                                                          // joining thread is first
     {
-
-#if (DEBUG_SYS_THREAD_JOIN & 1)
-if( DEBUG_SYS_THREAD_JOIN < tm_start )
-printk("\n[DBG] %s : thread %x in process %x / joining thread arrived first\n",
-__FUNCTION__ , joining_ptr->trdid, process->pid );
-#endif
         // set the join_done flag in target thread
         hal_remote_atomic_or( target_flags_xp , THREAD_FLAG_JOIN_DONE );
@@ -186 +183 @@
         remote_busylock_release( target_join_lock_xp );
 
-#if (DEBUG_SYS_THREAD_JOIN & 1)
+#if DEBUG_SYS_THREAD_JOIN 
 if( DEBUG_SYS_THREAD_JOIN < tm_start )
-printk("\n[DBG] %s : thread %x in process %x / joining thread deschedule\n",
-__FUNCTION__ , joining_ptr->trdid, process->pid );
+printk("\n[DBG] %s : joining thread[%x,%x] deschedules / target thread[%x,%x] not completed\n",
+__FUNCTION__ , process->pid, joining_ptr->trdid, process->pid, trdid );
 #endif
         // deschedule
         sched_yield( "joining thread waiting killer thread" );
     
-#if (DEBUG_SYS_THREAD_JOIN & 1)
-if( DEBUG_SYS_THREAD_JOIN < tm_start )
-printk("\n[DBG] %s : thread %x in process %x / joining thread resume\n",
-__FUNCTION__ , joining_ptr->trdid, process->pid );
-#endif
-        // restore IRQs
-        hal_restore_irq( save_sr );
-    }
-
-#if DEBUG_SYS_THREAD_JOIN
+#if DEBUG_SYS_THREAD_JOIN 
 tm_end = hal_get_cycles();
 if( DEBUG_SYS_THREAD_JOIN < tm_end )
-printk("\n[DBG] %s : thread %x in process %x exit / target thread %x / cycle %d\n",
-__FUNCTION__, joining_ptr->trdid, process->pid, (uint32_t)tm_end );
-#endif
+printk("\n[DBG] %s : joining thread[%x,%x] exit / target thread[%x,%x] completed / cycle %d\n",
+__FUNCTION__ , process->pid, joining_ptr->trdid, process->pid, trdid, (uint32_t)tm_end );
+#endif
+
+    }
+
+    // restore IRQs
+    hal_restore_irq( save_sr );
 
     return 0;