Changeset 446 for trunk/user

Timestamp:

Jun 19, 2018, 5:12:57 PM (6 years ago)

Author:

alain

Message:

miscelaneous...

Location:

trunk/user

Files:

• idbg/idbg.c (modified) (1 diff)
• ksh/ksh.c (modified) (9 diffs)
• pgcd/pgcd.c (modified) (1 diff)

trunk/user/idbg/idbg.c

@@ -20 +20 @@
     printf( "\n[IDBG] starts at cycle %d\n", (unsigned int)cycle ); 
 
-    while (1) 
-    {
-
-        ///////
-        idbg();
-        ///////
-    }
+    ///////
+    idbg();
+    ///////
 
     get_cycle( &cycle );

trunk/user/ksh/ksh.c

@@ -4 +4 @@
 // Author :  Alain Greiner
 ///////////////////////////////////////////////////////////////////////////////
-// This single thread application implement a simple shell for ALMOS-MKH.
+// This applications implement a minimal shell for ALMOS-MKH.
+// This user process contains two POSIX threads:
+// - the "main" thread contains the infinite loop implementing
+//   the children processes termination monitoring (children processes
+//   are created by the <load> command and attached to the KSH TXT terminal).
+// - the "interactive" thread contains the infinite loop implementing
+//   the command interpreter attached to the TXT terminal.
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -53 +59 @@
 unsigned int    ptr;                      // read pointer in log_entries[]
 
+pthread_attr_t  attr;                     // monitor thread attributes
+
 ////////////////////////////////////////////////////////////////////////////////
 //         Shell  Commands
@@ -100 +108 @@
         }
 
-        // set terminating '0' XXX
+        // set terminating '0'
         buf[size-1] = 0;
 
@@ -449 +457 @@
     else                        // it is the parent KSH : ret_fork is the new process PID
     {
-        // give back terminal ownership to KSH if new process created in background /
-        // wait new process completion before returning to command interpreter otherwise
+        // give back terminal ownership to KSH 
+        // when new process created in background 
         if( background )   fg( ksh_pid );
-        else               wait( &status );
 
         // return to command interpreter
@@ -715 +722 @@
                 }
         }
-}
-
-///////////////////////////////////
-int main( int argc , char *argv[] )
+}  // end parse()
+
+/////////////////////////
+static void interactive()
 {
         char         c;                                           // read character
         char         buf[CMD_MAX_SIZE];           // buffer for one command
-        unsigned int count = 0;                           // pointer in buf
+        unsigned int count;                               // pointer in buf
         unsigned int i;                                           // index for loops
 
@@ -732 +739 @@
         };
 
-    // log buffer initialisation
-        memset( &log_entries , 0, sizeof(log_entries));
-        ptw   = 0;
-        ptr   = 0;
-
-        printf( "\n\n~~~ shell ~~~\n\n" );
-
-        // command buffer initialisation
+        // initialize command buffer
         memset( buf, 0x20 , sizeof(buf) );
         count = 0;
@@ -760 +760 @@
 
 // @@@
-// parse("load /bin/user/hello.elf");
+parse("load /bin/user/idbg.elf");
 // @@@
 
@@ -814 +814 @@
                                         state = ESCAPE;
                                 }
-                                else if (c == 0x03)     // ^C  => cancel current command
-                                {
-                                        for (i = 0; i < count; i++) printf("\b \b");
-                                        for (i = 0; i < sizeof(buf); i++) buf[i] = 0x20;
-                                        count = 0;
-                                }
                                 else                                     // register character in command buffer
                                 {
@@ -910 +904 @@
                 }
         }
+}  // end interactive()
+
+///////////////////////////////////
+int main( int argc , char *argv[] )
+{
+    unsigned int cxy;             // owner cluster identifier for this KSH process
+    unsigned int lid;             // core identifier for this KSH main thread
+    int          status;          // child process termination status
+    int          pid;             // chils process identifier
+    pthread_t    trdid;           // kernel allocated index for interactive thread
+
+    // initialize log buffer
+        memset( &log_entries , 0, sizeof(log_entries));
+        ptw   = 0;
+        ptr   = 0;
+
+    get_core( &cxy , & lid );
+        printf( "\n\n~~~ KSH on core[%x,%d] ~~~\n\n", cxy , lid );
+
+    // initialize interactive thread attributes
+    attr.attributes = PT_ATTR_DETACH | PT_ATTR_CLUSTER_DEFINED;
+    attr.cxy        = cxy;
+
+    // lauch the interactive thread 
+    pthread_create( &trdid,
+                    &attr,
+                    &interactive,   // entry function
+                    NULL ); 
+    
+    // enter infinite loop monitoring children processes termination 
+    while( 1 )
+    {
+        pid = wait( &status );
+
+#if 0
+        if     ( WIFEXITED  (status) ) printf("\n[KSH] process %x exited\n" , pid );
+        else if( WIFSIGNALED(status) ) printf("\n[KSH] process %x killed\n" , pid );
+        else if( WIFSTOPPED (status) ) printf("\n[KSH] process %x stopped\n", pid );
+        else                           printf("\n[KSH] process %x strange\n", pid );  
+#endif
+
+    }
 }  // end main()
 
+

trunk/user/pgcd/pgcd.c

@@ -33 +33 @@
         if( (opx == 0) || (opy == 0) ) 
         {
-           printf("operands must be positive and larger than 0\n");
+           printf("operands must be positive and larger than 0 => exit\n");
+           exit( 0 );
         } 
         else