Changeset 574 for trunk/user/ksh

Timestamp:

Oct 5, 2018, 12:26:30 AM (6 years ago)

Author:

alain

Message:

Cosmetic.

File:

• trunk/user/ksh/ksh.c (modified) (10 diffs)

trunk/user/ksh/ksh.c

@@ -8 +8 @@
 // This user KSH process contains two POSIX threads:
 // - the "main" thread contains the infinite loop implementing
-//   the children processes termination monitoring, using the wait syscall.
+//   the children processes termination monitoring, using the wait() syscall.
 // - the "interactive" thread contains the infinite loop implementing the command
 //   interpreter attached to the TXT terminal, and handling one KSH command
@@ -49 +49 @@
 #define LOG_DEPTH      (32)     // max number of registered commands 
 #define MAX_ARGS           (32)     // max number of arguments in a command
-#define FIFO_SIZE      (1024)   // FIFO depth for recursive ls
-
-#define KSH_DEBUG           0
+
+#define MAIN_DEBUG          0
 #define CMD_LOAD_DEBUG      0
 
@@ -821 +820 @@
 }  // end parse()
 
-/////////////////////////
+///////////////////////////////
 static void interactive( void )
 {
@@ -831 +830 @@
         unsigned int   state;                   // escape sequence state
 
-/* This can be used to remove interactive mode
-
-for( i=1 ; 1 ; i += 2)
+/* This can be used to simplify debug, as it avoids interactive mode
+
+for( i=1 ; 1 ; i++ )
 {
     if( sem_wait( &semaphore ) )
@@ -842 +841 @@
     else
     {
-        printf("\n[ksh] %d for sort\n", i );
-    }
-    strcpy( buf , "load /bin/user/sort.elf" );
-    parse( buf );
-
-    if( sem_wait( &semaphore ) )
-    {
-        printf("\n[ksh error] cannot found semafore\n" );
-        exit( 1 );
-    }
-    else
-    {
-        printf("\n[ksh] %d for fft\n", i+1 );
+        printf("\n[ksh] %d for fft\n", i );
     }
     strcpy( buf , "load /bin/user/fft.elf" );
@@ -1047 +1034 @@
 }  // end interactive()
 
-//////////
+////////////////
 int main( void )
 {
@@ -1067 +1054 @@
     get_core( &cxy , &lid );
 
-    // initializes the semaphore used to unblock the interactive thread
+#if MAIN_DEBUG
+printf("\n[ksh] main started on core[%x,%d]\n", cxy , lid ); 
+#endif
+    
+    // initializes the semaphore used to synchronize with interactive thread
     if ( sem_init( &semaphore , 0 , 1 ) )
     {
@@ -1074 +1065 @@
     }
 
+#if MAIN_DEBUG
+printf("\n[ksh] main initialized semaphore\n" ); 
+#endif
+    
     // initialize interactive thread attributes
     attr.attributes = PT_ATTR_DETACH | PT_ATTR_CLUSTER_DEFINED;
@@ -1083 +1078 @@
                     &interactive,   // entry function
                     NULL ); 
+#if MAIN_DEBUG
+printf("\n[ksh] main launched interactive thread => wait children termination\n" ); 
+#endif
     
     // enter infinite loop monitoring children processes termination 
@@ -1090 +1088 @@
         child_pid = wait( &status );
 
-#if KSH_DEBUG
-if( WIFEXITED  (status) ) printf("\n[KSH] child process %x exited\n" , child_pid );
-if( WIFSIGNALED(status) ) printf("\n[KSH] child process %x killed\n" , child_pid );
-if( WIFSTOPPED (status) ) printf("\n[KSH] child process %x stopped\n", child_pid );
+#if MAIN_DEBUG
+if( WIFEXITED  (status) ) printf("\n[ksh] child process %x exit\n"   , child_pid );
+if( WIFSIGNALED(status) ) printf("\n[ksh] child process %x killed\n" , child_pid );
+if( WIFSTOPPED (status) ) printf("\n[ksh] child process %x stopped\n", child_pid );
 #endif