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

Timestamp:

Jun 29, 2018, 10:44:14 AM (6 years ago)

Author:

alain

Message:

Fix a bug in function sched_handle_signal():
When the deleted user thread is the last executed thread,
the sched->u_last field must be updated to point on another user thread.

File:

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

trunk/kernel/kern/thread.c

@@ -654 +654 @@
 if( DEBUG_THREAD_DESTROY < cycle )
 printk("\n[DBG] %s : thread %x enter to destroy thread %x in process %x / cycle %d\n",
-__FUNCTION__, CURRENT_THREAD, thread, process->pid, cycle );
+__FUNCTION__, CURRENT_THREAD, thread->trdid, process->pid, cycle );
 #endif
 
@@ -694 +694 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_THREAD_DESTROY < cycle )
-printk("\n[DBG] %s : thread %x exit / destroyed thread %x in process %x / cycle %d\n",
-__FUNCTION__, CURRENT_THREAD, thread, process->pid, cycle );
+printk("\n[DBG] %s : thread %x exit / destroyed thread %x in process %x / last %d / cycle %d\n",
+__FUNCTION__, CURRENT_THREAD, thread->trdid, process->pid, last_thread / cycle );
 #endif
 
@@ -800 +800 @@
 uint32_t cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_THREAD_BLOCK < cycle )
-printk("\n[@@@] %s : thread %x  in cxy %x blocked thread %x in cxy %x / cause %x / cycle %d\n",
+printk("\n[DBG] %s : thread %x  in cxy %x blocked thread %x in cxy %x / cause %x / cycle %d\n",
 __FUNCTION__ , CURRENT_THREAD , local_cxy , ptr , cxy , cause , cycle );
-#endif
-
-#if (DEBUG_THREAD_BLOCK & 1)
-if( DEBUG_THREAD_BLOCK < cycle )
-{
-    if( cxy == local_cxy) 
-    {
-        sched_display( ptr->core->lid );
-    }
-    else
-    {
-        core_t * core = hal_remote_lpt( XPTR( cxy , &ptr->core ) );
-        lid_t    lid  = hal_remote_lw ( XPTR( cxy , &core->lid ) );
-        rpc_sched_display_client( cxy , lid );
-    }
-}
 #endif
 
@@ -837 +821 @@
 uint32_t cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_THREAD_BLOCK < cycle )
-printk("\n[@@@] %s : thread %x  in cxy %x unblocked thread %x in cxy %x / cause %x / cycle %d\n",
+printk("\n[DBG] %s : thread %x  in cxy %x unblocked thread %x in cxy %x / cause %x / cycle %d\n",
 __FUNCTION__ , CURRENT_THREAD , local_cxy , ptr , cxy , cause , cycle );
-#endif
-
-#if (DEBUG_THREAD_BLOCK & 1)
-if( DEBUG_THREAD_BLOCK < cycle )
-{
-    if( cxy == local_cxy) 
-    {
-        sched_display( ptr->core->lid );
-    }
-    else
-    {
-        core_t * core = hal_remote_lpt( XPTR( cxy , &ptr->core ) );
-        lid_t    lid  = hal_remote_lw ( XPTR( cxy , &core->lid ) );
-        rpc_sched_display_client( cxy , lid );
-    }
-}
 #endif