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

Timestamp:

May 3, 2017, 1:23:24 PM (7 years ago)

Author:

alain

Message:

Bugs fix.

File:

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

trunk/kernel/kern/scheduler.c

@@ -22 +22 @@
  */
 
-#include <almos_config.h>
+#include <kernel_config.h>
 #include <hal_types.h>
 #include <hal_irqmask.h>
@@ -112 +112 @@
     if( thread_can_yield() == false )
     {
-        printk("\n[ERROR] in %s : thread %x in process %x on core %d in cluster %x"
+        printk("\n[PANIC] in %s : thread %x in process %x on core[%x][%d]"
                " did not released all locks\n",
                __FUNCTION__ , thread->trdid , thread->process->pid, 
-               thread->core->lid , local_cxy ); 
+               local_cxy , thread->core->lid ); 
         hal_core_sleep();
     }
@@ -237 +237 @@
     if( thread_can_yield() == false )
     {
-        printk("\n[PANIC] in %s : thread %x for process %x on core %d in cluster %x"
-               " has not released all locks\n",
-               __FUNCTION__, current->trdid, current->process->pid, core->lid, local_cxy );
+        printk("\n[PANIC] in %s : thread %x for process %x on core_gid %x"
+               " has not released all locks at cycle %d\n",
+               __FUNCTION__, current->trdid, current->process->pid, 
+               local_cxy , core->lid , hal_time_stamp() );
         hal_core_sleep();
     }
@@ -256 +257 @@
     {
         printk("\n[PANIC] in %s : detected stack overflow for thread %x of process %x"
-               " on core %d in cluster %x\n",
-               __FUNCTION__, next->trdid, next->process->pid, core->lid, local_cxy);
+               " on core [%x][%d]\n",
+               __FUNCTION__, next->trdid, next->process->pid, local_cxy , core->lid );
         hal_core_sleep();
         }
         
         sched_dmsg("\n[INFO] %s on core %d in cluster %x / old thread = %x / new thread = %x\n",
-               __FUNCTION__, core->lid, cluster->cxy, current->trdid, next->trdid );
+               __FUNCTION__, core->lid, local_cxy, current->trdid, next->trdid );
 
     // switch contexts if new thread
@@ -342 +343 @@
         
         sched_dmsg("INFO : %s on core %d in cluster %x / old thread = %x / new thread = %x\n",
-               __FUNCTION__, core->lid, cluster->cxy, current->trdid, new->trdid );
+               __FUNCTION__, core->lid, local_cxy, current->trdid, new->trdid );
 
     // switch contexts if new thread