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

Timestamp:

Aug 22, 2018, 11:55:48 PM (6 years ago)

Author:

viala@…

Message:

Refactoring assert calling to conform with new assert macro.

Made with this command for the general case.
find ./kernel/ hal/ -name "*.c" | xargs sed -i -e '/assert(/ s/,[ ]*FUNCTION[ ]*,/,/'

And some done by hand.

File:

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

trunk/kernel/kern/scheduler.c

@@ -124 +124 @@
         while( done == false )
         {
-            assert( (count < sched->k_threads_nr), __FUNCTION__, "bad kernel threads list" );
+            assert( (count < sched->k_threads_nr), "bad kernel threads list" );
 
             // get next entry in kernel list
@@ -159 +159 @@
         while( done == false )
         {
-            assert( (count < sched->u_threads_nr), __FUNCTION__, "bad user threads list" );
+            assert( (count < sched->u_threads_nr), "bad user threads list" );
 
             // get next entry in user list
@@ -228 +228 @@
             // check thread blocked
             assert( (thread->blocked & THREAD_BLOCKED_GLOBAL) , 
-            __FUNCTION__ , "thread not blocked" );
+            "thread not blocked" );
  
             // decrement response counter
@@ -249 +249 @@
             uint32_t threads_nr = sched->u_threads_nr;
 
-            assert( (threads_nr != 0) , __FUNCTION__ , "u_threads_nr cannot be 0\n" );
+            assert( (threads_nr != 0) , "u_threads_nr cannot be 0\n" );
 
             sched->u_threads_nr = threads_nr - 1;
@@ -327 +327 @@
 
     // check next thread kernel_stack overflow
-    assert( (next->signature == THREAD_SIGNATURE), __FUNCTION__ , 
+    assert( (next->signature == THREAD_SIGNATURE),
     "kernel stack overflow for thread %x on core[%x,%d] \n", next, local_cxy, core->lid );
 
     // check next thread attached to same core as the calling thread
-    assert( (next->core == current->core), __FUNCTION__ , 
+    assert( (next->core == current->core),
     "next core %x != current core %x\n", next->core, current->core );
 
     // check next thread not blocked when type != IDLE
-    assert( ((next->blocked == 0) || (next->type == THREAD_IDLE)) , __FUNCTION__ ,
+    assert( ((next->blocked == 0) || (next->type == THREAD_IDLE)) ,
     "next thread %x (%s) is blocked on core[%x,%d]\n", 
     next->trdid , thread_type_str(next->type) , local_cxy , core->lid );
@@ -396 +396 @@
     uint32_t       save_sr;
 
-    assert( (lid < LOCAL_CLUSTER->cores_nr), __FUNCTION__, "illegal core index %d\n", lid);
+    assert( (lid < LOCAL_CLUSTER->cores_nr), "illegal core index %d\n", lid);
 
     core_t       * core    = &LOCAL_CLUSTER->core_tbl[lid];
@@ -456 +456 @@
     // check cxy
     bool_t undefined = cluster_is_undefined( cxy );
-    assert( (undefined == false), __FUNCTION__, "illegal cluster %x\n", cxy );
+    assert( (undefined == false), "illegal cluster %x\n", cxy );
 
     // check lid
     uint32_t cores = hal_remote_lw( XPTR( cxy , &LOCAL_CLUSTER->cores_nr ) );
-    assert( (lid < cores), __FUNCTION__, "illegal core index %d\n", lid);
+    assert( (lid < cores), "illegal core index %d\n", lid);
 
     // get local pointer on target scheduler