Changeset 492 for trunk/kernel/kern

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.

Location:

trunk/kernel/kern

Files:

• chdev.c (modified) (4 diffs)
• cluster.c (modified) (2 diffs)
• do_syscall.c (modified) (3 diffs)
• dqdt.c (modified) (1 diff)
• kernel_init.c (modified) (19 diffs)
• process.c (modified) (28 diffs)
• rpc.c (modified) (28 diffs)
• scheduler.c (modified) (7 diffs)
• thread.c (modified) (9 diffs)

trunk/kernel/kern/chdev.c

@@ -264 +264 @@
 
     // deschedule
-    assert( thread_can_yield( this ) , __FUNCTION__ , "illegal sched_yield\n" );
+    assert( thread_can_yield( this ) , "illegal sched_yield\n" );
     sched_yield("blocked on I/O");
 
@@ -327 +327 @@
 
             // deschedule
-            assert( thread_can_yield( server ) , __FUNCTION__ , "illegal sched_yield\n" );
+            assert( thread_can_yield( server ) , "illegal sched_yield\n" );
             sched_yield("I/O queue empty");
         } 
@@ -408 +408 @@
     chdev_t     * chdev_ptr;
 
-    assert( (file_xp != XPTR_NULL) , __FUNCTION__,
+    assert( (file_xp != XPTR_NULL) ,
     "file_xp == XPTR_NULL\n" );
 
@@ -420 +420 @@
     inode_ptr  = (vfs_inode_t *)hal_remote_lpt( XPTR( file_cxy , &file_ptr->inode ) );
 
-    assert( (inode_type == INODE_TYPE_DEV) , __FUNCTION__ ,
+    assert( (inode_type == INODE_TYPE_DEV) ,
     "inode type %d is not INODE_TYPE_DEV\n", inode_type );
 

trunk/kernel/kern/cluster.c

@@ -450 +450 @@
 
     // check lpid 
-    assert( (lpid < CONFIG_MAX_PROCESS_PER_CLUSTER), __FUNCTION__ ,
+    assert( (lpid < CONFIG_MAX_PROCESS_PER_CLUSTER),
     "illegal LPID = %d" , lpid );
 
     // check owner cluster
-    assert( (owner_cxy == local_cxy) , __FUNCTION__ ,
+    assert( (owner_cxy == local_cxy) ,
     "local_cluster %x !=  owner_cluster %x" , local_cxy , owner_cxy );
 
@@ -650 +650 @@
 
     assert( (cluster_is_undefined( cxy ) == false),
-    __FUNCTION__, "illegal cluster index" );
+    "illegal cluster index" );
 
     // get extended pointer on root and lock for local process list in cluster

trunk/kernel/kern/do_syscall.c

@@ -36 +36 @@
 static int sys_undefined()
 {
-    assert( false , __FUNCTION__ , "undefined system call" );
+    assert( false , "undefined system call" );
     return 0;
 }
@@ -176 +176 @@
         int  error = 0;
         
-    assert( (this == CURRENT_THREAD), __FUNCTION__,
+    assert( (this == CURRENT_THREAD),
     "wrong <this> argument\n" );
 
@@ -200 +200 @@
 
     // check kernel stack overflow
-    assert( (CURRENT_THREAD->signature == THREAD_SIGNATURE), __FUNCTION__, 
+    assert( (CURRENT_THREAD->signature == THREAD_SIGNATURE),
     "kernel stack overflow after for thread %x in cluster %x\n", CURRENT_THREAD, local_cxy );
 

trunk/kernel/kern/dqdt.c

@@ -102 +102 @@
                     uint32_t y_width )
 {
-    assert( ((x_size <= 32) && (y_size <= 32)) , __FUNCTION__ , "illegal mesh size\n");
+    assert( ((x_size <= 32) && (y_size <= 32)) , "illegal mesh size\n");
 
         dqdt_node_t * node;

trunk/kernel/kern/kernel_init.c

@@ -231 +231 @@
         if (func == DEV_FUNC_TXT )
         {
-            assert( (channels > 0) , __FUNCTION__ , "number of TXT channels cannot be 0\n");
+            assert( (channels > 0) , "number of TXT channels cannot be 0\n");
 
             // initializes TXT_TX[0] chdev
@@ -298 +298 @@
         if( func == DEV_FUNC_MMC )  
         {
-            assert( (channels == 1) , __FUNCTION__ , 
-                    "MMC device must be single channel\n" );
+            assert( (channels == 1) , "MMC device must be single channel\n" );
 
             // create chdev in local cluster
@@ -308 +307 @@
                                       base );
 
-            assert( (chdev_ptr != NULL) , __FUNCTION__ ,
+            assert( (chdev_ptr != NULL) ,
                     "cannot allocate memory for MMC chdev\n" );
             
@@ -344 +343 @@
                                           base );
 
-                assert( (chdev_ptr != NULL) , __FUNCTION__ , 
-                        "cannot allocate memory for DMA chdev" );
+                assert( (chdev_ptr != NULL) , "cannot allocate memory for DMA chdev" );
             
                 // make DMA specific initialisation
@@ -420 +418 @@
 
         // check PIC device initialized
-        assert( (chdev_dir.pic != XPTR_NULL ) , __FUNCTION__ ,
+        assert( (chdev_dir.pic != XPTR_NULL ) ,
               "PIC device must be initialized before other devices\n" );
 
@@ -428 +426 @@
                   (func == DEV_FUNC_TXT) ||
                   (func == DEV_FUNC_NIC) ||
-                  (func == DEV_FUNC_FBF) ) , __FUNCTION__ ,
+                  (func == DEV_FUNC_FBF) ) ,
                   "undefined external peripheral type\n" );
 
@@ -456 +454 @@
                                           base );
 
-                    assert( (chdev != NULL), __FUNCTION__ ,
+                    assert( (chdev != NULL),
                             "cannot allocate external device" );
 
@@ -544 +542 @@
     }
 
-    assert( found , __FUNCTION__ , "PIC device not found\n" );
+    assert( found , "PIC device not found\n" );
 
     // allocate and initialize the PIC chdev in cluster 0
@@ -553 +551 @@
                           base );
 
-    assert( (chdev != NULL), __FUNCTION__ , "no memory for PIC chdev\n" );
+    assert( (chdev != NULL), "no memory for PIC chdev\n" );
 
     // make PIC device type specific initialisation
@@ -607 +605 @@
             else if((func == DEV_FUNC_TXT) && (is_rx == 0)) ptr = &iopic_input.txt_tx[channel];
             else if((func == DEV_FUNC_TXT) && (is_rx != 0)) ptr = &iopic_input.txt_rx[channel];
-            else if((func == DEV_FUNC_NIC) && (is_rx == 0)) ptr = &iopic_input.nic_tx[channel]; 
-            else if((func == DEV_FUNC_NIC) && (is_rx != 0)) ptr = &iopic_input.nic_rx[channel]; 
-            else if( func == DEV_FUNC_IOB )                 ptr = &iopic_input.iob; 
-            else     assert( false , __FUNCTION__ , "illegal source device for IOPIC input" );
+            else if((func == DEV_FUNC_NIC) && (is_rx == 0)) ptr = &iopic_input.nic_tx[channel];
+            else if((func == DEV_FUNC_NIC) && (is_rx != 0)) ptr = &iopic_input.nic_rx[channel];
+            else if( func == DEV_FUNC_IOB )                 ptr = &iopic_input.iob;
+            else     assert( false , "illegal source device for IOPIC input" );
 
             // set one entry in all "iopic_input" structures
@@ -697 +695 @@
                 if     ( func == DEV_FUNC_MMC ) lapic_input.mmc = id;
                 else if( func == DEV_FUNC_DMA ) lapic_input.dma[channel] = id;
-                else assert( false , __FUNCTION__ , "illegal source device for LAPIC input" );
+                else assert( false , "illegal source device for LAPIC input" );
             }
         }
@@ -818 +816 @@
     if( error )
     {
-        assert( false , __FUNCTION__ ,
+        assert( false ,
         "illegal core identifiers gid = %x / cxy = %x / lid = %d",
         core_lid , core_cxy , core_lid );
@@ -830 +828 @@
         if( error )
         {
-            assert( false , __FUNCTION__ ,
+            assert( false ,
             "cannot initialise cluster %x", local_cxy );
         }
@@ -950 +948 @@
             fatfs_ctx_t * fatfs_ctx = fatfs_ctx_alloc();
 
-            assert( (fatfs_ctx != NULL) , __FUNCTION__ ,
+            assert( (fatfs_ctx != NULL) ,
                     "cannot create FATFS context in cluster 0\n" );
 
@@ -973 +971 @@
                                       &vfs_root_inode_xp );                // return
 
-            assert( (error == 0) , __FUNCTION__ , 
+            assert( (error == 0) ,
                     "cannot create VFS root inode\n" );
 
@@ -987 +985 @@
             vfs_ctx_t   * vfs_ctx = &fs_context[FS_TYPE_FATFS];
             assert( (((fatfs_ctx_t *)vfs_ctx->extend)->sectors_per_cluster == 8),
-            __FUNCTION__ , "illegal value for FATFS context in cluster %x\n", local_cxy );
+             "illegal value for FATFS context in cluster %x\n", local_cxy );
         }
         else
         {
-            assert( false , __FUNCTION__ ,
+            assert( false ,
             "root FS must be FATFS" );
         }
@@ -1028 +1026 @@
             fatfs_ctx_t * local_fatfs_ctx = fatfs_ctx_alloc();
 
-            assert( (local_fatfs_ctx != NULL) , __FUNCTION__ ,
+            assert( (local_fatfs_ctx != NULL) ,
             "cannot create FATFS context in cluster %x\n", local_cxy );
 
@@ -1050 +1048 @@
             // 7. check initialisation
             assert( (((fatfs_ctx_t *)vfs_ctx->extend)->sectors_per_cluster == 8),
-            __FUNCTION__ , "illegal value for FATFS context in cluster %x\n", local_cxy );
+            "illegal value for FATFS context in cluster %x\n", local_cxy );
         }
 
@@ -1089 +1087 @@
         devfs_ctx_t * devfs_ctx = devfs_ctx_alloc();
 
-        assert( (devfs_ctx != NULL) , __FUNCTION__ ,
+        assert( (devfs_ctx != NULL) ,
                 "cannot create DEVFS context in cluster IO\n");
 

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

trunk/kernel/kern/rpc.c

@@ -85 +85 @@
 void __attribute__((noinline)) rpc_undefined()
 {
-        assert( false , __FUNCTION__ , "called in cluster %x", local_cxy );
+        assert( false , "called in cluster %x", local_cxy );
 }
 
@@ -204 +204 @@
 
         // check response available
-        assert( (rpc->responses == 0) , __FUNCTION__, "illegal RPC response\n" );
+        assert( (rpc->responses == 0) , "illegal RPC response\n" );
     }
     else  // non blocking RPC
@@ -280 +280 @@
                                                       core->lid );
                  
-            assert( (error == 0), __FUNCTION__ ,
+            assert( (error == 0),
             "no memory to allocate a new RPC thread in cluster %x", local_cxy );
 
@@ -459 +459 @@
 
             // RPC thread deschedules
-            assert( thread_can_yield( server_ptr ) , __FUNCTION__, "illegal sched_yield\n" );
+            assert( thread_can_yield( server_ptr ) , "illegal sched_yield\n" );
             sched_yield("RPC fifo empty");
         }
@@ -484 +484 @@
 #endif
 
-    assert( (cxy != local_cxy) , __FUNCTION__ , "target cluster is not remote\n");
+    assert( (cxy != local_cxy) , "target cluster is not remote\n");
 
     // initialise RPC descriptor header 
@@ -555 +555 @@
 #endif
 
-    assert( (cxy != local_cxy) , __FUNCTION__ , "target cluster is not remote\n");
+    assert( (cxy != local_cxy) , "target cluster is not remote\n");
 
     // initialise RPC descriptor header 
@@ -631 +631 @@
 #endif
 
-    assert( (cxy != local_cxy) , __FUNCTION__ , "target cluster is not remote\n");
+    assert( (cxy != local_cxy) , "target cluster is not remote\n");
 
     // initialise RPC descriptor header 
@@ -723 +723 @@
                                     error_t        * error )      // out 
 {
-    assert( (cxy != local_cxy) , __FUNCTION__ , "target cluster is not remote\n");
+    assert( (cxy != local_cxy) , "target cluster is not remote\n");
 
     // initialise RPC descriptor header 
@@ -803 +803 @@
                                       error_t * error )      // out
 {
-    assert( (cxy != local_cxy) , __FUNCTION__ , "target cluster is not remote\n");
+    assert( (cxy != local_cxy) , "target cluster is not remote\n");
 
     // initialise RPC descriptor header 
@@ -879 +879 @@
 
     // check some RPC arguments
-    assert( (rpc->blocking == false) , __FUNCTION__ , "must be non-blocking\n");
-    assert( (rpc->index == RPC_PROCESS_SIGACTION ) , __FUNCTION__ , "bad RPC index\n" );
+    assert( (rpc->blocking == false) , "must be non-blocking\n");
+    assert( (rpc->index == RPC_PROCESS_SIGACTION ) , "bad RPC index\n" );
 
     // register RPC request in remote RPC fifo and return
@@ -987 +987 @@
 #endif
 
-    assert( (cxy != local_cxy) , __FUNCTION__ , "target cluster is not remote\n");
+    assert( (cxy != local_cxy) , "target cluster is not remote\n");
 
     // initialise RPC descriptor header 
@@ -1094 +1094 @@
 #endif
 
-    assert( (cxy != local_cxy) , __FUNCTION__ , "target cluster is not remote\n");
+    assert( (cxy != local_cxy) , "target cluster is not remote\n");
 
     // initialise RPC descriptor header 
@@ -1172 +1172 @@
 #endif
 
-    assert( (cxy != local_cxy) , __FUNCTION__ , "target cluster is not remote\n");
+    assert( (cxy != local_cxy) , "target cluster is not remote\n");
 
     // initialise RPC descriptor header 
@@ -1263 +1263 @@
 #endif
 
-    assert( (cxy != local_cxy) , __FUNCTION__ , "target cluster is not remote\n");
+    assert( (cxy != local_cxy) , "target cluster is not remote\n");
 
     // initialise RPC descriptor header 
@@ -1341 +1341 @@
 #endif
 
-    assert( (cxy != local_cxy) , __FUNCTION__ , "target cluster is not remote\n");
+    assert( (cxy != local_cxy) , "target cluster is not remote\n");
 
     // initialise RPC descriptor header 
@@ -1423 +1423 @@
 #endif
 
-    assert( (cxy != local_cxy) , __FUNCTION__ , "target cluster is not remote\n");
+    assert( (cxy != local_cxy) , "target cluster is not remote\n");
 
     // initialise RPC descriptor header 
@@ -1486 +1486 @@
                                 error_t     * error )          // out
 {
-    assert( (cxy != local_cxy) , __FUNCTION__ , "target cluster is not remote\n");
+    assert( (cxy != local_cxy) , "target cluster is not remote\n");
 
     // initialise RPC descriptor header 
@@ -1547 +1547 @@
                                      error_t     * error )     // out
 {
-    assert( (cxy != local_cxy) , __FUNCTION__ , "target cluster is not remote\n");
+    assert( (cxy != local_cxy) , "target cluster is not remote\n");
 
     // initialise RPC descriptor header 
@@ -1599 +1599 @@
                                    error_t  * error )    // out
 {
-    assert( (cxy != local_cxy) , __FUNCTION__ , "target cluster is not remote\n");
+    assert( (cxy != local_cxy) , "target cluster is not remote\n");
 
     // initialise RPC descriptor header 
@@ -1666 +1666 @@
 #endif
 
-    assert( (cxy != local_cxy) , __FUNCTION__ , "target cluster is not remote\n");
+    assert( (cxy != local_cxy) , "target cluster is not remote\n");
 
     // initialise RPC descriptor header 
@@ -1754 +1754 @@
 #endif
 
-    assert( (cxy != local_cxy) , __FUNCTION__ , "target cluster is not remote\n");
+    assert( (cxy != local_cxy) , "target cluster is not remote\n");
 
     // initialise RPC descriptor header 
@@ -1834 +1834 @@
                            xptr_t *   buf_xp )     // out
 {
-    assert( (cxy != local_cxy) , __FUNCTION__ , "target cluster is not remote\n");
+    assert( (cxy != local_cxy) , "target cluster is not remote\n");
 
     // initialise RPC descriptor header 
@@ -1884 +1884 @@
                           uint32_t   kmem_type )   // in
 {
-    assert( (cxy != local_cxy) , __FUNCTION__ , "target cluster is not remote\n");
+    assert( (cxy != local_cxy) , "target cluster is not remote\n");
 
     // initialise RPC descriptor header 
@@ -1934 +1934 @@
                                     error_t  * error )        // out
 {
-    assert( (cxy != local_cxy) , __FUNCTION__ , "target cluster is not remote\n");
+    assert( (cxy != local_cxy) , "target cluster is not remote\n");
 
     // initialise RPC descriptor header 
@@ -2018 +2018 @@
                                  page_t         ** page )      // out
 {
-    assert( (cxy != local_cxy) , __FUNCTION__ , "target cluster is not remote\n");
+    assert( (cxy != local_cxy) , "target cluster is not remote\n");
 
     // initialise RPC descriptor header 
@@ -2073 +2073 @@
                                  struct vseg_s   ** vseg )
 {
-    assert( (cxy != local_cxy) , __FUNCTION__ , "target cluster is not remote\n");
+    assert( (cxy != local_cxy) , "target cluster is not remote\n");
 
     // initialise RPC descriptor header 
@@ -2143 +2143 @@
                              process_t * process )
 {
-    assert( (cxy != local_cxy) , __FUNCTION__ , "target cluster is not remote\n");
+    assert( (cxy != local_cxy) , "target cluster is not remote\n");
 
     // initialise RPC descriptor header 
@@ -2185 +2185 @@
                              bool_t      detailed )
 {
-    assert( (cxy != local_cxy) , __FUNCTION__ , "target cluster is not remote\n");
+    assert( (cxy != local_cxy) , "target cluster is not remote\n");
 
     // initialise RPC descriptor header 

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

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" );