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

Timestamp:

Feb 20, 2018, 5:32:17 PM (7 years ago)

Author:

alain

Message:

Fix a bad bug in scheduler...

File:

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

trunk/kernel/kern/scheduler.c

@@ -280 +280 @@
     }
 
-    // enter critical section / save SR in current thread context
-    hal_disable_irq( &current->save_sr );
+    // enter critical section / save SR in current thread descriptor
+    hal_disable_irq( &CURRENT_THREAD->save_sr );
 
     // loop on threads to select next thread 
@@ -321 +321 @@
         }
 
-        // switch CPU from calling thread context to new thread context
+        // switch CPU from current thread context to new thread context
         hal_do_cpu_switch( current->cpu_context, next->cpu_context );
     }
@@ -330 +330 @@
 uint32_t cycle = (uint32_t)hal_get_cycles();
 if( CONFIG_DEBUG_SCHED_YIELD < cycle )
-printk("\n[DBG] %s : core[%x,%d] / cause = %s / thread %x (%s) (%x,%x) continue / cycle %d\n",
+printk("\n[DBG] %s : core[%x,%d] / cause = %s\n"
+"      thread %x (%s) (%x,%x) continue / cycle %d\n",
 __FUNCTION__, local_cxy, core->lid, cause,
 current, thread_type_str(current->type), current->process->pid, current->trdid, cycle );
@@ -340 +341 @@
     sched_handle_signals( core );
 
-    // exit critical section / restore SR from next thread context
-    hal_restore_irq( next->save_sr );
+    // exit critical section / restore SR from current thread descriptor
+    hal_restore_irq( CURRENT_THREAD->save_sr );
 
 }  // end sched_yield()