Changeset 409 for trunk/kernel/kern/scheduler.c

Timestamp:

Dec 20, 2017, 4:51:09 PM (6 years ago)

Author:

alain

Message:

Fix bugs in exec

File:

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

trunk/kernel/kern/scheduler.c

@@ -58 +58 @@
     list_root_init( &sched->k_root );
 
+    sched->sig_pending    = false;            // no pending signal
+
 }  // end sched_init()
 
@@ -72 +74 @@
     if( type == THREAD_USER )
     {
-        // register thread in scheduler user list
         list_add_last( &sched->u_root , &thread->sched_list );
         sched->u_threads_nr++;
-
-        // initialize u_last field if first user thread
         if( sched->u_last == NULL ) sched->u_last = &thread->sched_list;
     }
     else // kernel thread
     {
-        // register thread in scheduler kernel list
         list_add_last( &sched->k_root , &thread->sched_list );
         sched->k_threads_nr++;
-
-        // initialize k_last field if first kernel thread
         if( sched->k_last == NULL ) sched->k_last = &thread->sched_list; 
     }
@@ -92 +88 @@
     spinlock_unlock( &sched->lock );
 
-}  // end sched_register()
+}  // end sched_register_thread()
 
 /////////////////////////////////////////////
 void sched_remove_thread( thread_t * thread )
 {
-    core_t       * core  = thread->core;
-    scheduler_t  * sched = &core->scheduler;
-    thread_type_t  type  = thread->type;
+    scheduler_t * sched = &thread->core->scheduler;
+    thread_type_t type  = thread->type;
 
     // take lock protecting sheduler lists
@@ -106 +101 @@
     if( type == THREAD_USER )
     {
-        // remove thread from user list
         list_unlink( &thread->sched_list );
         sched->u_threads_nr--;
-
-        // reset the u_last field if list empty
         if( sched->u_threads_nr == 0 ) sched->u_last = NULL;
     }
-    else // kernel thread 
-    {
-        // remove thread from kernel list
+    else // kernel thread
+    {
         list_unlink( &thread->sched_list );
         sched->k_threads_nr--;
-
-        // reset the k_last field if list empty
         if( sched->k_threads_nr == 0 ) sched->k_last = NULL;
     }
 
-    // release lock
+    // release lock 
     spinlock_unlock( &sched->lock );
 
-}  // end sched_remove()
+}  // end sched_remove_thread()
 
 //////////////////////////////////////////////
@@ -214 +203 @@
 }  // end sched_select()
 
-///////////////////////////////////////////
-void sched_kill_thread( thread_t * thread )
-{
-    // check locks
-    if( thread_can_yield() == false )
-    {
-        panic("locks not released for thread %x in process %x on core[%x][%d]",
-        thread->trdid , thread->process->pid, local_cxy , thread->core->lid ); 
-    }
-
-    // remove thread from scheduler
-    sched_remove_thread( thread );
-
-    // reset the THREAD_SIG_KILL signal
-    thread_reset_signal( thread , THREAD_SIG_KILL );
-
-    // detached thread can suicide
-    if( thread->signals & THREAD_SIG_SUICIDE ) 
-    {
-        assert( (thread->flags & THREAD_FLAG_DETACHED), __FUNCTION__,
-        "thread must be detached in case of suicide\n" );
-
-        // remove thread from process
-        process_remove_thread( thread );
-
-        // release memory for thread descriptor 
-        thread_destroy( thread );
-    }
-}  // end sched_kill_thread()
-
 //////////////////////////////////////////
 void sched_handle_signals( core_t * core )
@@ -249 +208 @@
     list_entry_t * iter;
     thread_t     * thread;
+
     scheduler_t  * sched = &core->scheduler;
-
-// signal_dmsg("\n@@@ %s enter at cycle %d\n",
-// __FUNCTION__ , hal_time_stamp() );
 
     // take lock protecting threads lists
@@ -261 +218 @@
     {
         thread = LIST_ELEMENT( iter , thread_t , sched_list );
-        if( thread->signals ) // sched_kill_thread( thread );
-        {
-            printk("\n[WARNING] %s : thread %x has signal %x at cycle %d\n",
-            __FUNCTION__, thread, thread->signals, hal_time_stamp() );
-        }
-    }
-
-    // handle kernel threads
-    LIST_FOREACH( &sched->k_root , iter )
-    {
-        thread = LIST_ELEMENT( iter , thread_t , sched_list );
-        if( thread->signals )  // sched_kill_thread( thread );
-        {
-            printk("\n[WARNING] %s : thread %x has signal %x at cycle %d\n",
-            __FUNCTION__, thread, thread->signals, hal_time_stamp() );
-
+
+        if( thread->flags & THREAD_FLAG_SIGNAL )  // thread has signal
+        {
+            // decrement response counter to acknowledge signal
+            hal_atomic_add( thread->sig_rsp_count , -1 );
+
+            // reset signal
+            thread_reset_signal( thread );
         }
     }
@@ -283 +232 @@
     spinlock_unlock( &sched->lock );
 
-// signal_dmsg("\n@@@ %s exit at cycle %d\n",
-// __FUNCTION__ , hal_time_stamp() );
-
 } // end sched_handle_signals()
 
@@ -293 +239 @@
     thread_t    * next;
     thread_t    * current = CURRENT_THREAD;
-    scheduler_t * sched   = &current->core->scheduler;
+    core_t      * core    = current->core;
+    scheduler_t * sched   = &core->scheduler;
  
 #if( CONFIG_SCHED_DEBUG & 0x1 )
-if( hal_time_stamp() > CONFIG_SCHED_DEBUG ) sched_display( current->core->lid );
+if( hal_time_stamp() > CONFIG_SCHED_DEBUG ) sched_display( core->lid );
 #endif
 
@@ -319 +266 @@
     assert( (next->blocked == 0) || (next->type = THREAD_IDLE) , __FUNCTION__ ,
     "next thread %x (%s) is blocked on core[%x,%d]\n", 
-    next->trdid , thread_type_str(next->type) , local_cxy , current->core->lid );
+    next->trdid , thread_type_str(next->type) , local_cxy , core->lid );
 
     // switch contexts and update scheduler state if next != current
@@ -327 +274 @@
 sched_dmsg("\n[DBG] %s : core[%x,%d] / cause = %s\n"
 "      thread %x (%s) (%x,%x) => thread %x (%s) (%x,%x) / cycle %d\n",
-__FUNCTION__, local_cxy, current->core->lid, cause, 
+__FUNCTION__, local_cxy, core->lid, cause, 
 current, thread_type_str(current->type), current->process->pid, current->trdid,
 next   , thread_type_str(next->type)   , next->process->pid   , next->trdid,
@@ -352 +299 @@
 sched_dmsg("\n[DBG] %s : core[%x,%d] / cause = %s\n" 
 "      thread %x (%s) (%x,%x) continue / cycle %d\n",
-__FUNCTION__, local_cxy, current->core->lid, cause,
+__FUNCTION__, local_cxy, core->lid, cause,
 current, thread_type_str(current->type), current->process->pid, current->trdid, 
 (uint32_t)hal_get_cycles() );
 
     }
+
+    // handle signals for all threads executing on this core.
+    sched_handle_signals( core );
 
     // exit critical section / restore SR from next thread context