Changeset 492 for trunk/kernel/kern/thread.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/thread.c (modified) (9 diffs)

trunk/kernel/kern/thread.c

@@ -238 +238 @@
     vseg_t       * vseg;         // stack vseg
 
-    assert( (attr != NULL) , __FUNCTION__, "pthread attributes must be defined" );
+    assert( (attr != NULL) , "pthread attributes must be defined" );
 
 #if DEBUG_THREAD_USER_CREATE
@@ -594 +594 @@
 #endif
 
-        assert( (thread->type == THREAD_USER )          , __FUNCTION__, "bad type" );
-        assert( (thread->signature == THREAD_SIGNATURE) , __FUNCTION__, "bad signature" );
-        assert( (thread->local_locks == 0)              , __FUNCTION__, "bad local locks" );
-        assert( (thread->remote_locks == 0)             , __FUNCTION__, "bad remote locks" );
+        assert( (thread->type == THREAD_USER )          , "bad type" );
+        assert( (thread->signature == THREAD_SIGNATURE) , "bad signature" );
+        assert( (thread->local_locks == 0)              , "bad local locks" );
+        assert( (thread->remote_locks == 0)             , "bad remote locks" );
 
         // re-initialize various thread descriptor fields
@@ -662 +662 @@
         hal_cpu_context_exec( thread );
 
-    assert( false, __FUNCTION__, "we should execute this code");
+    assert( false, "we should execute this code");
  
     return 0;
@@ -679 +679 @@
 
     assert( ( (type == THREAD_IDLE) || (type == THREAD_RPC) || (type == THREAD_DEV) ) ,
-    __FUNCTION__ , "illegal thread type" );
+        "illegal thread type" );
 
     assert( (core_lid < LOCAL_CLUSTER->cores_nr) ,
-            __FUNCTION__ , "illegal core_lid" );
+            "illegal core_lid" );
 
 #if DEBUG_THREAD_KERNEL_CREATE
@@ -740 +740 @@
                            lid_t           core_lid )
 {
-    assert( (type == THREAD_IDLE) , __FUNCTION__ , "illegal thread type" );
-    assert( (core_lid < LOCAL_CLUSTER->cores_nr) , __FUNCTION__ , "illegal core index" );
+    assert( (type == THREAD_IDLE) , "illegal thread type" );
+    assert( (core_lid < LOCAL_CLUSTER->cores_nr) , "illegal core index" );
 
     // initialize thread descriptor
@@ -752 +752 @@
                                   0 , 0 );   // no user stack for a kernel thread
 
-    assert( (error == 0), __FUNCTION__, "cannot create thread idle" );
+    assert( (error == 0), "cannot create thread idle" );
 
     // allocate & initialize CPU context if success
     error = hal_cpu_context_alloc( thread );
 
-    assert( (error == 0), __FUNCTION__, "cannot allocate CPU context" );
+    assert( (error == 0), "cannot allocate CPU context" );
 
     hal_cpu_context_init( thread );
@@ -782 +782 @@
 #endif
 
-    assert( (thread->local_locks == 0) , __FUNCTION__ , 
+    assert( (thread->local_locks == 0) ,
     "local lock not released for thread %x in process %x", thread->trdid, process->pid );
 
-    assert( (thread->remote_locks == 0) , __FUNCTION__ , 
+    assert( (thread->remote_locks == 0) ,
     "remote lock not released for thread %x in process %x", thread->trdid, process->pid );
 
@@ -867 +867 @@
 
     // check signal pending in scheduler
-    assert( sched->req_ack_pending , __FUNCTION__ , "no pending signal" );
+    assert( sched->req_ack_pending , "no pending signal" );
     
     // enter critical section
@@ -1005 +1005 @@
     // must be deleted by the parent process sys_wait() function
     owner_cxy = CXY_FROM_PID( pid );
-    assert( ((owner_cxy != target_cxy) || (target_ltid != 0)), __FUNCTION__,
+    assert( ((owner_cxy != target_cxy) || (target_ltid != 0)),
     "tharget thread cannot be the main thread\n" );