Changeset 441 for trunk/user

Timestamp:

May 9, 2018, 3:13:56 PM (6 years ago)

Author:

alain

Message:

Fix a bug in rpc_vmm_get_pte_client() function (bad RPC index).

Location:

trunk/user

Files:

• init/init.c (modified) (3 diffs)
• ksh/ksh.c (modified) (3 diffs)
• sort/sort.c (modified) (4 diffs)

trunk/user/init/init.c

@@ -18 +18 @@
 #include <pthread.h>
 
-#define DEBUG_INIT 1
+#define DEBUG_INIT_PROCESS 1
 
 // TODO make the cxy computation portable [AG]
@@ -76 +76 @@
     } 
   
-#if DEBUG_INIT
+#if DEBUG_INIT_PROCESS
 
     unsigned int  x_size;        // number of clusters in a row
@@ -160 +160 @@
         } // end KSH kill handling
 
-#if( DEBUG_INIT )
+#if DEBUG_INIT_PROCESS
 
         // INIT displays processes and threads in all clusters 

trunk/user/ksh/ksh.c

@@ -395 +395 @@
         int                  ret_exec;           // return value from exec
     unsigned int         ksh_pid;            // KSH process PID
-    unsigned int         new_pid;            // new process PID
-    unsigned int         rcv_pid;            // terminating process PID
         char               * pathname;           // path to .elf file
     unsigned int         background;         // background execution if non zero
@@ -425 +423 @@
     else if (ret_fork == 0)      // it is the CHILD process 
     {
-        // give back to KSH terminal ownership if required
-        if( background ) fg( ksh_pid );
-
         // CHILD process exec NEW process
         ret_exec = exec( pathname , NULL , NULL );
 
+        // this is only executed in case of exec failure
         if( ret_exec )
         {
-            printf("  error: new process unable to exec <%s>\n", pathname );
-            return;
+            printf("  error: child process unable to exec <%s>\n", pathname );
+            exit( 0 );
         }   
         } 
     else                        // it is the parent KSH : ret_fork is the new process PID
     {
-        new_pid = ret_fork;
-
-        // wait new process completion 
-        rcv_pid = wait( &status );
-
-        if( rcv_pid == new_pid )
-        {
-            printf("\n\n   %s normal termination / status = %x\n\n",
-            pathname , (status &0xFF) );
-            return;
-        }
-        else
-        {
-            printf("\n\n   %s abnormal termination / status = %x\n\n",
-            pathname , (status &0xFF) );
-            return;
-        }
+        // give back terminal ownership to KSH if new process created in background /
+        // wait new process completion before returning to command interpreter otherwise
+        if( background )   fg( ksh_pid );
+        else               wait( &status );
+
+        // return to command interpreter
+        return;
     }
 }   // end cmd_load
@@ -758 +744 @@
                                                 printf("# ");
                                         }
+                    else
+                    {
+                        printf("\n# ");
+                    }
                                 }
                                 else if (c == '\t')     // tabulation => do nothing

trunk/user/sort/sort.c

@@ -156 +156 @@
     unsigned int  main_uid   = ptr->main_uid;
 
-printf("\n### core[%x,%d] enter sort : threads %d / thread_uid %x / main_uid %x / cycle %d\n",
-cxy, lid, threads, thread_uid, main_uid, (int)cycle );
-
-    while( 1 ) { asm volatile("nop"); }
-
     unsigned int  items      = ARRAY_LENGTH / threads;
     unsigned int  stages     = __builtin_ctz( threads ) + 1;
@@ -316 +311 @@
                 if( thread_uid != main_uid )
                 {
-
-get_cycle( &cycle );
-printf("\n### main creates thread_uid %d / &sort_arg %x / cycle %d\n",
-thread_uid, &arg[thread_uid], (unsigned int)cycle );
-
                     if ( pthread_create( &trdid,              // not used because no join
                                          &attr[thread_uid],   // thread attributes 
@@ -344 +334 @@
     sort( &arg[main_uid] );
 
+while( 1 ) asm volatile( "nop" );
+    
     // Check result
     int    success = 1;
@@ -352 +344 @@
                          (threads==512) ) ? array1 : array0;
     
-    for( n=0 ; n<(ARRAY_LENGTH-1) ; n++ )
+    for( n=0 ; n<(ARRAY_LENGTH-2) ; n++ )
     {
         if ( res_array[n] > res_array[n+1] )