Changeset 659 for trunk/user/init/init.c

Timestamp:

Oct 10, 2020, 3:58:01 PM (4 years ago)

Author:

alain

Message:

euh...

File:

• trunk/user/init/init.c (modified) (7 diffs)

trunk/user/init/init.c

@@ -6 +6 @@
 // This single thread application implement the "init" process for ALMOS-MKH. 
 // It uses the fork/exec syscalls to create N KSH child processes 
-// (one child process per user terminal).
-// Then calls the wait() function to block, and reactivate any child KSH process
+// (one child process per user TXT terminal).
+// Then calls the wait() function to block, and recreate any child KSH process
 // that has been deleted, using a new fork/exec.
-// It includes the hard_config.h file to get th NB_TXT_CHANNELS parameter.
 ///////////////////////////////////////////////////////////////////////////////////////
 
-#include <hard_config.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -20 +18 @@
 #include <hal_macros.h>
 #include <sys/wait.h>
+#include <shared_syscalls.h>
 
-#define DEBUG_PROCESS_INIT    0
-
-// TODO improve the get_config() syscall to return nb_txt_channels
-// and avoid the hard_config include [AG]
+#define DEBUG_PROCESS_INIT    1
 
 ////////////////
 int main( void )
 {
-    int           i;
+    unsigned int  i;
     int           ret_fork;      // fork return value  
     int           ret_exec;      // exec return value  
@@ -40 +36 @@
 #endif
 
+    // get Number of TXT channels from hard configuration
+    hard_config_t config;      
+    get_config( &config );
+
+    unsigned int  txt_channels = config.txt_channels;
+    unsigned int  x_size       = config.x_size;
+    unsigned int  y_size       = config.y_size;
+    unsigned int  ncores       = config.ncores;
+
     // check number of TXT channels
-    if( NB_TXT_CHANNELS < 2 )
+    if( txt_channels < 2 )
     {
-        printf("\n[ERROR] in init process : number of TXT channels must be larger than 1\n");
+        snprintf( string , 64 ,
+        "\n[init ERROR] number of TXT channels must be larger than 1\n");
+        display_string( string );
         exit( EXIT_FAILURE );
     }
 
     // create the KSH processes (one per user terminal)
-    for( i = 1 ; i <  NB_TXT_CHANNELS ; i++ )
+    for( i = 1 ; i <  txt_channels ; i++ )
     {
         // INIT process fork process CHILD[i]
@@ -56 +63 @@
         {
             // INIT display error message  
-            snprintf( string , 64 , "[init ERROR] cannot fork child[%d] => suicide" , i );
+            snprintf( string , 64 , 
+            "[init ERROR] cannot fork child[%d] => suicide" , i );
             display_string( string );
 
             // INIT suicide
-            exit( 0 );
+            exit( EXIT_FAILURE );
         }
         else if( ret_fork == 0 )                    // we are in CHILD[i] process
@@ -73 +81 @@
                 "[init ERROR] CHILD[%d] cannot exec KSH / ret_exec = %d" , i , ret_exec );
                 display_string( string );
+
+                // CHILD[i] suicide
+                exit( EXIT_FAILURE );
             }
         }
@@ -78 +89 @@
         {
             // INIT display CHILD[i] process PID
-            snprintf( string , 64 , "[init] (pid 0x1) created ksh[%d] (pid %x)", i , ret_fork ); 
+            snprintf( string , 64 ,
+            "[init] (pid 0x1) created ksh[%d] (pid %x)", i , ret_fork ); 
             display_string( string );
 
-            // wait signal from KSH[i]
+            // wait signal from KSH[i] before creating KSH[i+1]
             pause();
         }
@@ -88 +100 @@
 #if DEBUG_PROCESS_INIT
 {
-    unsigned int  x_size;        // number of clusters in a row
-    unsigned int  y_size;        // number of clusters in a column
-    unsigned int  ncores;        // number of cores per cluster
     unsigned int  x;             // cluster x coordinate
     unsigned int  y;             // cluster y coordinate
     unsigned int  cxy;           // cluster identifier
     unsigned int  lid;           // core local index
-
-    // get hardware config
-    get_config( &x_size , &y_size , &ncores );
 
     // INIT displays processes and threads in all clusters