Changeset 415 for trunk/kernel/kern/process.c

Timestamp:

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

Author:

alain

Message:

Few bugs.

File:

• trunk/kernel/kern/process.c (modified) (15 diffs)

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",