Changeset 415 for trunk/kernel/kern

Timestamp:

Dec 22, 2017, 1:16:59 PM (7 years ago)

Author:

alain

Message:

Few bugs.

Location:

trunk/kernel/kern

Files:

• printk.h (modified) (1 diff)
• process.c (modified) (15 diffs)
• process.h (modified) (1 diff)
• rpc.c (modified) (10 diffs)

trunk/kernel/kern/printk.h

@@ -331 +331 @@
 #endif
 
-#if CONFIG_SIGNAL_DEBUG
-#define signal_dmsg(...)   if(hal_time_stamp() > CONFIG_SIGNAL_DEBUG) printk(__VA_ARGS__)
-#else
-#define signal_dmsg(...)
+#if CONFIG_SIGACTION_DEBUG
+#define sigaction_dmsg(...)   if(hal_time_stamp() > CONFIG_SIGACTION_DEBUG) printk(__VA_ARGS__)
+#else
+#define sigaction_dmsg(...)
 #endif
 

trunk/kernel/kern/process.c

@@ -125 +125 @@
     uint32_t    stdout_id;
     uint32_t    stderr_id;
+    error_t     error;
 
 process_dmsg("\n[DBG] %s : core[%x,%d] enters for process %x / ppid = %x\n",
@@ -139 +140 @@
 
     // initialize vmm as empty 
-    vmm_init( process );
+    error = vmm_init( process );
+    assert( (error == 0) , __FUNCTION__ , "cannot initialize VMM\n" );
+ 
 
 process_dmsg("\n[DBG] %s : core[%x,%d] / vmm empty for process %x\n", 
@@ -259 +262 @@
                            xptr_t      reference_process_xp )
 {
+    error_t error;
+
     // get reference process cluster and local pointer
     cxy_t       ref_cxy = GET_CXY( reference_process_xp );
@@ -272 +277 @@
 
     // reset local process vmm
-    vmm_init( local_process );
+    error = vmm_init( local_process );
+    assert( (error == 0) , __FUNCTION__ , "cannot initialize VMM\n");
 
     // reset process file descriptors array
@@ -309 +315 @@
     // register new process descriptor in owner cluster manager copies_list
     cluster_process_copies_link( local_process );
-
-    // initialize signal manager TODO [AG]
 
         hal_fence();
@@ -397 +401 @@
     process_t        * process_ptr;       // local pointer on process copy
 
-signal_dmsg("\n[DBG] %s : enter for signal %s to process %x in cluster %x\n",
+sigaction_dmsg("\n[DBG] %s : enter for signal %s to process %x in cluster %x\n",
 __FUNCTION__ , process_action_str( action_type ) , process , local_cxy );
 
@@ -432 +436 @@
         process_ptr = (process_t *)GET_PTR( process_xp );
 
-printk("\n    @@@ %s : process = %x / pid = %x / ppid = %x\n",
+sigaction_dmsg("\n[DBG] %s : process = %x / pid = %x / ppid = %x\n",
 __FUNCTION__ , process_ptr , process_ptr->pid , process_ptr->ppid );
 
@@ -449 +453 @@
     sched_yield("BLOCKED on RPC");
 
-signal_dmsg("\n[DBG] %s : exit for signal %s to process %x in cluster %x\n",
+sigaction_dmsg("\n[DBG] %s : exit for signal %s to process %x in cluster %x\n",
 __FUNCTION__ , process_action_str( action_type ) , process , local_cxy );
 
@@ -471 +475 @@
     killer = CURRENT_THREAD;
 
-signal_dmsg("\n[DBG] %s : enter for process %x in cluster %x\n",
+sigaction_dmsg("\n[DBG] %s : enter for process %x in cluster %x\n",
 __FUNCTION__ , process->pid , local_cxy );
 
@@ -532 +536 @@
     }
 
-signal_dmsg("\n[DBG] %s : exit for process %x in cluster %x / %d threads blocked\n",
+sigaction_dmsg("\n[DBG] %s : exit for process %x in cluster %x / %d threads blocked\n",
 __FUNCTION__ , process->pid , local_cxy , count );
 
@@ -553 +557 @@
     killer = CURRENT_THREAD;
 
-signal_dmsg("\n[DBG] %s : enter for process %x in cluster %x\n",
+sigaction_dmsg("\n[DBG] %s : enter for process %x in cluster %x\n",
 __FUNCTION__ , process->pid , local_cxy );
 
@@ -586 +590 @@
     }
 
-signal_dmsg("\n[DBG] %s : exit for process %x in cluster %x / %d threads blocked\n",
+sigaction_dmsg("\n[DBG] %s : exit for process %x in cluster %x / %d threads blocked\n",
 __FUNCTION__ , process->pid , local_cxy , req_count );
 
@@ -607 +611 @@
     pid = process->pid;
 
-signal_dmsg("\n[DBG] %s : enter for process %x in cluster %x at cycle %d\n",
+sigaction_dmsg("\n[DBG] %s : enter for process %x in cluster %x at cycle %d\n",
 __FUNCTION__ , pid , local_cxy , (uint32_t)hal_get_cycles() );
 
@@ -648 +652 @@
     }
 
-signal_dmsg("\n[DBG] %s : exit for process %x in cluster %x at cycle %d\n",
+sigaction_dmsg("\n[DBG] %s : exit for process %x in cluster %x at cycle %d\n",
 __FUNCTION__ , pid , local_cxy , (uint32_t)hal_get_cycles() );
 
@@ -1181 +1185 @@
 __FUNCTION__, local_cxy, CURRENT_THREAD->core->lid );
 
-    // re-initialize VMM 
-    vmm_init( process );
+    // initialize VMM 
+    error = vmm_init( process );
+        {
+                printk("\n[ERROR] in %s : cannot initialize VMM for process %x / path = %s\n",
+                __FUNCTION__, pid , path );
+        process_destroy( process );
+        return -1;
+        }
+
+    if( error )
 
     // register "code" and "data" vsegs as well as entry-point and vfs_bin_xp
     // in VMM, using information contained in the elf file.
-        if( elf_load_process( path , process ) )
+        error = elf_load_process( path , process );
+
+    if( error )
         {
                 printk("\n[ERROR] in %s : failed to access .elf file for process %x / path = %s\n",

trunk/kernel/kern/process.h

@@ -59 +59 @@
 enum process_sigactions
 {
-    BLOCK_ALL_THREADS,
-    UNBLOCK_ALL_THREADS,
-    DELETE_ALL_THREADS,
+    BLOCK_ALL_THREADS    = 11,
+    UNBLOCK_ALL_THREADS  = 22,
+    DELETE_ALL_THREADS   = 33, 
 };
 

trunk/kernel/kern/rpc.c

@@ -106 +106 @@
     rpc->lid       = core->lid;
 
+printk("\n   @@@ enter %s : rpc_desc_cxy = %x / rpc_desc_ptr = %x / index = %d / &index = %x\n",
+__FUNCTION__ , local_cxy , rpc , rpc->index , &rpc->index);
+ 
     // build an extended pointer on the RPC descriptor
         xptr_t   desc_xp = XPTR( local_cxy , rpc );
@@ -176 +179 @@
     }
     
+printk("\n   @@@ exit %s : rpc_desc_cxy = %x / rpc_desc_ptr = %x / index = %d / &index = %x\n",
+__FUNCTION__ , local_cxy , rpc , rpc->index , &rpc->index);
+ 
 }  // end rpc_send()
 
@@ -245 +251 @@
     }
 
+//@@@
+sched_display( 0 );
+//@@@
+
 grpc_dmsg("\n[DBG] %s : core[%x,%d] / interrupted thread %s deschedules / cycle %d\n", 
 __FUNCTION__, local_cxy, core->lid, thread_type_str(this->type), hal_time_stamp() );
@@ -300 +310 @@
                 while( 1 )  // internal loop
             {
+
                     empty = local_fifo_get_item( rpc_fifo , (uint64_t *)&desc_xp );
 
@@ -311 +322 @@
                         index = hal_remote_lw( XPTR( desc_cxy , &desc_ptr->index ) );
 
+printk("\n   @@@ in %s : rpc_desc_cxy = %x / rpc_desc_ptr = %x / index = %d / &index = %x\n",
+__FUNCTION__ , desc_cxy , desc_ptr , index , &desc_ptr->index );
+ 
 grpc_dmsg("\n[DBG] %s : core[%x,%d] / RPC thread %x / starts rpc %d / cycle %d\n",
-__FUNCTION__ , local_cxy , this->core->lid , this->trdid , index , hal_time_stamp() );
+__FUNCTION__ , local_cxy , this->core->lid , this->trdid , index , (uint32_t)hal_get_cycles() );
 
                     // call the relevant server function
@@ -980 +994 @@
 
 /////////////////////////////////////////////////////////////////////////////////////////
-// [9]     Marshaling functions attached to RPC_PROCESS_KILL  (multicast / non blocking)
+// [9] Marshaling functions attached to RPC_PROCESS_SIGACTION (multicast / non blocking)
 /////////////////////////////////////////////////////////////////////////////////////////
 
@@ -990 +1004 @@
                                    xptr_t      client_xp )     // in
 {
-signal_dmsg("\n[DBG] %s : enter for %s / thread %x on core[%x,%d] / cycle %d\n",
-__FUNCTION__ , process_action_str( sigaction ) , CURRENT_THREAD ,
+sigaction_dmsg("\n[DBG] %s : enter for %s (%d) / thread %x on core[%x,%d] / cycle %d\n",
+__FUNCTION__ , process_action_str( sigaction ) , sigaction , CURRENT_THREAD ,
 local_cxy , CURRENT_THREAD->core->lid , hal_time_stamp() );
 
@@ -1007 +1021 @@
     rpc_send( cxy , &rpc , false );
 
-signal_dmsg("\n[DBG] %s : exit for %s / thread %x on core[%x,%d] / cycle %d\n",
-__FUNCTION__ , process_action_str( sigaction ) , CURRENT_THREAD ,
+sigaction_dmsg("\n[DBG] %s : exit for %s (%d) / thread %x on core[%x,%d] / cycle %d\n",
+__FUNCTION__ , process_action_str( sigaction ) , sigaction , CURRENT_THREAD ,
 local_cxy , CURRENT_THREAD->core->lid , hal_time_stamp() );
 }  
@@ -1030 +1044 @@
     client_xp = (xptr_t)               hal_remote_lwd( XPTR( client_cxy , &desc->args[3] ) );
     
-signal_dmsg("\n[DBG] %s : enter for %s / thread %x on core[%x,%d] / cycle %d\n",
-__FUNCTION__ , process_action_str( action ) , CURRENT_THREAD ,
+sigaction_dmsg("\n[DBG] %s : enter for %s (%d) / thread %x on core[%x,%d] / cycle %d\n",
+__FUNCTION__ , process_action_str( action ) , action , CURRENT_THREAD ,
 local_cxy , CURRENT_THREAD->core->lid , hal_time_stamp() );
 
@@ -1039 +1053 @@
     else if (action == UNBLOCK_ALL_THREADS ) process_unblock( process , rsp_xp , client_xp );
 
-signal_dmsg("\n[DBG] %s : exit for %s / thread %x on core[%x,%d] / cycle %d\n",
-__FUNCTION__ , process_action_str( action ) , CURRENT_THREAD ,
+sigaction_dmsg("\n[DBG] %s : exit for %s (%d) / thread %x on core[%x,%d] / cycle %d\n",
+__FUNCTION__ , process_action_str( action ) , action , CURRENT_THREAD ,
 local_cxy , CURRENT_THREAD->core->lid , hal_time_stamp() );
 }