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

trunk/kernel/kern/process.c

@@ -132 +132 @@
     // initialize vmm as empty 
     error = vmm_init( process );
-    assert( (error == 0) , __FUNCTION__ , "cannot initialize VMM\n" );
+    assert( (error == 0) , "cannot initialize VMM\n" );
  
 #if (DEBUG_PROCESS_REFERENCE_INIT & 1)
@@ -175 +175 @@
                            &stdin_id );
 
-        assert( (error == 0) , __FUNCTION__ , "cannot open stdin pseudo file" );
-        assert( (stdin_id == 0) , __FUNCTION__ , "stdin index must be 0" );
+        assert( (error == 0) , "cannot open stdin pseudo file" );
+        assert( (stdin_id == 0) , "stdin index must be 0" );
 
 #if (DEBUG_PROCESS_REFERENCE_INIT & 1)
@@ -193 +193 @@
                            &stdout_id );
 
-        assert( (error == 0) , __FUNCTION__ , "cannot open stdout pseudo file" );
-        assert( (stdout_id == 1) , __FUNCTION__ , "stdout index must be 1" );
+        assert( (error == 0) , "cannot open stdout pseudo file" );
+        assert( (stdout_id == 1) , "stdout index must be 1" );
 
 #if (DEBUG_PROCESS_REFERENCE_INIT & 1)
@@ -211 +211 @@
                            &stderr_id );
 
-        assert( (error == 0) , __FUNCTION__ , "cannot open stderr pseudo file" );
-        assert( (stderr_id == 2) , __FUNCTION__ , "stderr index must be 2" );
+        assert( (error == 0) , "cannot open stderr pseudo file" );
+        assert( (stderr_id == 2) , "stderr index must be 2" );
 
 #if (DEBUG_PROCESS_REFERENCE_INIT & 1)
@@ -330 +330 @@
     // reset local process vmm
     error = vmm_init( local_process );
-    assert( (error == 0) , __FUNCTION__ , "cannot initialize VMM\n");
+    assert( (error == 0) , "cannot initialize VMM\n");
 
     // reset process file descriptors array
@@ -393 +393 @@
     pid_t       pid = process->pid;
 
-        assert( (process->th_nr == 0) , __FUNCTION__ ,
+        assert( (process->th_nr == 0) ,
     "process %x in cluster %x has still active threads", pid , local_cxy );
 
@@ -511 +511 @@
     assert( ((type == DELETE_ALL_THREADS ) ||
              (type == BLOCK_ALL_THREADS )  ||
-             (type == UNBLOCK_ALL_THREADS )), __FUNCTION__ , "illegal action type" );
+             (type == UNBLOCK_ALL_THREADS )), "illegal action type" );
              
 
@@ -843 +843 @@
         xptr_t ref_xp = cluster_get_reference_process_from_pid( pid );
 
-        assert( (ref_xp != XPTR_NULL) , __FUNCTION__ , "illegal pid\n" );
+        assert( (ref_xp != XPTR_NULL) , "illegal pid\n" );
 
         // allocate memory for local process descriptor
@@ -1046 +1046 @@
  
 
-    assert( (process != NULL) , __FUNCTION__ , "process argument is NULL" );
-
-    assert( (thread != NULL) , __FUNCTION__ , "thread argument is NULL" );
+    assert( (process != NULL) , "process argument is NULL" );
+
+    assert( (thread != NULL) , "thread argument is NULL" );
 
     // take lock protecting th_tbl, depending on thread type:
@@ -1089 +1089 @@
     uint32_t count;  // number of threads in local process descriptor
 
-    assert( (thread != NULL) , __FUNCTION__ , "thread argument is NULL" );
+    assert( (thread != NULL) , "thread argument is NULL" );
 
     process_t * process = thread->process;
@@ -1101 +1101 @@
     count = process->th_nr;
 
-    assert( (count > 0) , __FUNCTION__ , "process th_nr cannot be 0\n" );
+    assert( (count > 0) , "process th_nr cannot be 0\n" );
 
     // remove thread from th_tbl[]
@@ -1140 +1140 @@
     ref_xp = hal_remote_lwd( XPTR( parent_process_cxy , &parent_process_ptr->ref_xp ) );
 
-    assert( (parent_process_xp == ref_xp ) , __FUNCTION__ ,
+    assert( (parent_process_xp == ref_xp ) ,
     "parent process must be the reference process\n" );
 
@@ -1243 +1243 @@
 
     // check main thread LTID
-    assert( (LTID_FROM_TRDID(thread->trdid) == 0) , __FUNCTION__ ,
+    assert( (LTID_FROM_TRDID(thread->trdid) == 0) ,
     "main thread must have LTID == 0\n" );
 
@@ -1421 +1421 @@
     }
 
-    assert( false, __FUNCTION__, "we should not execute this code");
+    assert( false, "we should not execute this code");
  
         return 0;
@@ -1491 +1491 @@
         process = process_alloc(); 
         
-    assert( (process != NULL), __FUNCTION__,
+    assert( (process != NULL),
     "no memory for process descriptor in cluster %x\n", local_cxy  );
 
@@ -1497 +1497 @@
     error = cluster_pid_alloc( process , &pid );
 
-    assert( (error == 0), __FUNCTION__,
+    assert( (error == 0),
     "cannot allocate PID in cluster %x\n", local_cxy );
 
-    assert( (pid == 1) , __FUNCTION__,
+    assert( (pid == 1) ,
     "process INIT must be first process in cluster 0\n" );
 
@@ -1518 +1518 @@
                             &file_id );
 
-        assert( (error == 0), __FUNCTION__,
+        assert( (error == 0),
     "failed to open file <%s>\n", CONFIG_PROCESS_INIT_PATH );
 
@@ -1525 +1525 @@
         error = elf_load_process( file_xp , process );
 
-        assert( (error == 0), __FUNCTION__,
+        assert( (error == 0),
     "cannot access .elf file <%s>\n", CONFIG_PROCESS_INIT_PATH );
 
@@ -1553 +1553 @@
                                 &thread );
 
-        assert( (error == 0), __FUNCTION__,
+        assert( (error == 0),
     "cannot create main thread for <%s>\n", CONFIG_PROCESS_INIT_PATH );
 
-    assert( (thread->trdid == 0), __FUNCTION__,
+    assert( (thread->trdid == 0),
     "main thread must have index 0 for <%s>\n", CONFIG_PROCESS_INIT_PATH );
 
@@ -1631 +1631 @@
     txt_file_xp = hal_remote_lwd( XPTR( owner_cxy , &owner_ptr->fd_array.array[0] ) );
 
-    assert( (txt_file_xp != XPTR_NULL) , __FUNCTION__ , 
+    assert( (txt_file_xp != XPTR_NULL) ,
     "process must be attached to one TXT terminal\n" ); 
 
@@ -1695 +1695 @@
     }
 
-    assert( false , __FUNCTION__ , "no free TXT terminal found" );
+    assert( false , "no free TXT terminal found" );
 
     return -1;
@@ -1712 +1712 @@
 
     // check process is in owner cluster
-    assert( (CXY_FROM_PID( process->pid ) == local_cxy) , __FUNCTION__ ,
+    assert( (CXY_FROM_PID( process->pid ) == local_cxy) ,
     "process descriptor not in owner cluster" );
 
     // check terminal index
     assert( (txt_id < LOCAL_CLUSTER->nb_txt_channels) ,
-    __FUNCTION__ , "illegal TXT terminal index" );
+    "illegal TXT terminal index" );
 
     // get pointers on TXT_RX[txt_id] chdev
@@ -1761 +1761 @@
     // check process descriptor in owner cluster
     process_pid = hal_remote_lw( XPTR( process_cxy , &process_ptr->pid ) );
-    assert( (CXY_FROM_PID( process_pid ) == process_cxy ) , __FUNCTION__ ,
+    assert( (CXY_FROM_PID( process_pid ) == process_cxy ) ,
     "process descriptor not in owner cluster" );
 
@@ -1811 +1811 @@
 
     // check owner cluster
-    assert( (process_cxy == CXY_FROM_PID( process_pid )) , __FUNCTION__,
+    assert( (process_cxy == CXY_FROM_PID( process_pid )) ,
     "process descriptor not in owner cluster\n" );
 
@@ -1864 +1864 @@
 
     // check owner cluster
-    assert( (process_cxy == CXY_FROM_PID( process_pid )) , __FUNCTION__,
+    assert( (process_cxy == CXY_FROM_PID( process_pid )) ,
     "process descriptor not in owner cluster\n" );
 
@@ -1922 +1922 @@
 
             // PANIC if KSH not found
-            assert( false , __FUNCTION__ , "KSH process not found for TXT %d" ); 
+            assert( false , "KSH process not found for TXT %d" );
 
             return;
@@ -1995 +1995 @@
     // check owner cluster
     pid_t process_pid = hal_remote_lw( XPTR( process_cxy , &process_ptr->pid ) );
-    assert( (process_cxy == CXY_FROM_PID( process_pid )) , __FUNCTION__,
+    assert( (process_cxy == CXY_FROM_PID( process_pid )) ,
     "process descriptor not in owner cluster\n" );
 
@@ -2041 +2041 @@
     
     assert( (txt_id < LOCAL_CLUSTER->nb_txt_channels) ,
-    __FUNCTION__ , "illegal TXT terminal index" );
+    "illegal TXT terminal index" );
 
     // get pointers on TXT0 chdev