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

Timestamp:

Feb 20, 2018, 5:32:17 PM (7 years ago)

Author:

alain

Message:

Fix a bad bug in scheduler...

File:

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

trunk/user/init/init.c

@@ -38 +38 @@
     for( i = 1 ; i <  NB_TXT_CHANNELS ; i++ )
     {
-
-snprintf( string , 64 , "@@@ before fork / iter = %d\n" , i );
-display_string( string );
-
         // INIT process fork process CHILD[i]
         ret_fork = fork();
-
-snprintf( string , 64 , "@@@ after fork / iter = %d / ret_fork = %d\n" , i , ret_fork );
-display_string( string );
 
         if( ret_fork< 0 )   // error in fork
         {
             // INIT display error message on TXT0 terminal 
-            snprintf( string , 64 , "init cannot fork child[%d]\n" , i );
+            snprintf( string , 64 , 
+            "INIT cannot fork child[%d]\n" , i );
             display_string( string );
 
@@ -65 +59 @@
             {
                 // display error message on TXT0 terminal
-                snprintf( string , 64 , "child[%d] cannot exec ksh[%d]\n" , i , i );
+                snprintf( string , 64 , 
+                "CHILD[%d] cannot exec KSH[%d] / ret_exec = %d\n" , i , i , ret_exec );
                 display_string( string );
-
-                // CHILD[i] exit
-                // exit( 0 );
             }
         }
@@ -75 +67 @@
         {
              // INIT display CHILD[i] process PID
-             snprintf( string , 64 , "INIT forked CHILD[%d] / pid = %x\n", i , ret_fork ); 
+             snprintf( string , 64 ,
+             "INIT forked CHILD[%d] / pid = %x\n", i , ret_fork ); 
              display_string( string );
-
-             // INIT delay
-             int     x;
-             for( x=0 ; x<DELAY_BETWEEN_FORK ; x++) asm volatile ("nop");
-
-/*
-             // INIT wait exec completion by CHILD[i]
-             while( 1 )
-             {
-                 // get terminating process PID
-                 received_pid = wait( &status );
-
-                 if( received_pid == ret_fork ) break;
-                 else
-                 {
-                     snprintf( string , 64 , 
-                     "expected_pid %d / received_pid %d" , ret_fork , received_pid  );
-                     display_string( string );
-                 }
-             }
-
-*/
-             // INIT display string on kernel TXT0
-             snprintf( string , 64 , "INIT created KSH[%d]\n", i );
-             display_string( string );
-// @@@
-display_process( 0 );
-display_sched( 0 , 0 );
-// @@@
         }
 
     } 
 
-    // This blocking loop is only for debug, because KSH[i] processes
-    // should never be killed, and INIT should never return from the wait() function.
+    // This loop detects the termination of the KSH[i] processes,
+    // to recreate these process when required.
     while( 1 )
     {
-        // block on child process termination
-        received_pid = wait( &status ); 
+        // block on child processes termination
+        received_pid = wait( &status );
 
-        // display string to report unexpected KSH process termination
-        snprintf( string , 64 , "KSH process %x unexpectedly terminated" , received_pid );
-        display_string( string ); 
+        if( WIFSTOPPED( status ) )                         // stopped => unblock it
+        {
+            // display string to report unexpected KSH process block
+            snprintf( string , 64 , "KSH process %x unexpectedly stopped" , received_pid );
+            display_string( string ); 
+
+        }
+
+        if( WIFSIGNALED( status ) || WIFEXITED( status ) )  // killed => recreate it
+        {
+            // display string to report unexpected KSH process termination
+            snprintf( string , 64 , "KSH process %x unexpectedly terminated" , received_pid );
+            display_string( string ); 
+        }
     }