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

Timestamp:

Apr 4, 2018, 2:49:02 PM (6 years ago)

Author:

alain

Message:

Fix a bug in scheduler related to RPC blocking.

File:

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

trunk/kernel/kern/scheduler.c

@@ -125 +125 @@
             thread = LIST_ELEMENT( current , thread_t , sched_list );
 
-            // analyse kernel thread type
-            switch( thread->type )
+            // execute RPC thread if non blocked
+            if( (thread->blocked == 0)  && 
+                (thread->type == THREAD_RPC) )
             {
-                case THREAD_RPC:  // if non blocked and RPC FIFO non-empty
-                if( (thread->blocked == 0) && 
-                    (local_fifo_is_empty( &LOCAL_CLUSTER->rpc_fifo ) == 0) )
-                {
-                    spinlock_unlock( &sched->lock );
-                    return thread;
-                }
-                break;
-
-                case THREAD_DEV:  // if non blocked and waiting queue non empty
-                if( (thread->blocked == 0) &&
-                    (xlist_is_empty( XPTR( local_cxy , &thread->chdev->wait_root)) == 0) ) 
-                {
-                    spinlock_unlock( &sched->lock );
-                    return thread;
-                }
-                break;
-
-                default:
-                break;
+                spinlock_unlock( &sched->lock );
+                return thread;
+            }
+
+            // execute DEV thread if non blocked and waiting queue non empty
+            if( (thread->blocked == 0)  &&
+                (thread->type == THREAD_DEV) &&
+                (xlist_is_empty( XPTR( local_cxy , &thread->chdev->wait_root)) == 0) ) 
+            {
+                spinlock_unlock( &sched->lock );
+                return thread;
             }
         } // end loop on kernel threads
@@ -174 +166 @@
             thread = LIST_ELEMENT( current , thread_t , sched_list );
 
-            // return thread if runnable
+            // return thread if non blocked
             if( thread->blocked == 0 )
             {
@@ -227 +219 @@
             process = thread->process;
 
-#if CONFIG_DEBUG_SCHED_HANDLE_SIGNALS
+#if DEBUG_SCHED_HANDLE_SIGNALS
 uint32_t cycle = (uint32_t)hal_get_cycles();
-if( CONFIG_DEBUG_SCHED_HANDLE_SIGNALS < cycle )
+if( DEBUG_SCHED_HANDLE_SIGNALS < cycle )
 printk("\n[DBG] %s : thread %x in proces %x must be deleted / cycle %d\n",
 __FUNCTION__ , thread , process->pid , cycle );
@@ -250 +242 @@
             thread_destroy( thread );
 
-#if CONFIG_DEBUG_SCHED_HANDLE_SIGNALS
+#if DEBUG_SCHED_HANDLE_SIGNALS
 cycle = (uint32_t)hal_get_cycles();
-if( CONFIG_DEBUG_SCHED_HANDLE_SIGNALS < cycle )
+if( DEBUG_SCHED_HANDLE_SIGNALS < cycle )
 printk("\n[DBG] %s : thread %x in process %x has been deleted / cycle %d\n",
 __FUNCTION__ , thread , process->pid , cycle );
@@ -262 +254 @@
                 process_destroy( process );
 
-#if CONFIG_DEBUG_SCHED_HANDLE_SIGNALS
+#if DEBUG_SCHED_HANDLE_SIGNALS
 cycle = (uint32_t)hal_get_cycles();
-if( CONFIG_DEBUG_SCHED_HANDLE_SIGNALS < cycle )
+if( DEBUG_SCHED_HANDLE_SIGNALS < cycle )
 printk("\n[DBG] %s : process %x has been deleted / cycle %d\n",
 __FUNCTION__ , process->pid , cycle );
@@ -287 +279 @@
     scheduler_t * sched   = &core->scheduler;
  
-#if (CONFIG_DEBUG_SCHED_YIELD & 0x1)
-if( CONFIG_DEBUG_SCHED_YIELD < (uint32_t)hal_get_cycles() )
+#if (DEBUG_SCHED_YIELD & 0x1)
+if( DEBUG_SCHED_YIELD < (uint32_t)hal_get_cycles() )
 sched_display( core->lid );
 #endif
@@ -322 +314 @@
     {
 
-#if CONFIG_DEBUG_SCHED_YIELD
+#if DEBUG_SCHED_YIELD
 uint32_t cycle = (uint32_t)hal_get_cycles();
-if( CONFIG_DEBUG_SCHED_YIELD < cycle )
+if( DEBUG_SCHED_YIELD < cycle )
 printk("\n[DBG] %s : core[%x,%d] / cause = %s\n"
 "      thread %x (%s) (%x,%x) => thread %x (%s) (%x,%x) / cycle %d\n",
@@ -350 +342 @@
     {
 
-#if (CONFIG_DEBUG_SCHED_YIELD & 1)
+#if (DEBUG_SCHED_YIELD & 1)
 uint32_t cycle = (uint32_t)hal_get_cycles();
-if( CONFIG_DEBUG_SCHED_YIELD < cycle )
+if( DEBUG_SCHED_YIELD < cycle )
 printk("\n[DBG] %s : core[%x,%d] / cause = %s\n"
 "      thread %x (%s) (%x,%x) continue / cycle %d\n",