Changeset 596 for trunk/user/sort

Timestamp:

Nov 10, 2018, 2:53:23 PM (6 years ago)

Author:

alain

Message:

Fix a big bug in ksh: wrong handling of illegal command, blocking ksh.

File:

• trunk/user/sort/sort.c (modified) (6 diffs)

trunk/user/sort/sort.c

@@ -24 +24 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <pthread.h>
 #include <almosmkh.h>
@@ -157 +158 @@
     /////////////////////////////////
     pthread_barrier_wait( &barrier ); 
-    printf("\n[SORT] thread[%d] exit barrier\n", thread_uid );
+    printf("\n[SORT] thread[%d] exit barrier 0\n", thread_uid );
 
     // the number of threads contributing to sort
@@ -192 +193 @@
         /////////////////////////////////
         pthread_barrier_wait( &barrier );
-        printf("\n[SORT] thread[%d] exit barrier\n", thread_uid );
+        printf("\n[SORT] thread[%d] exit barrier %d\n", thread_uid , i );
 
     }
@@ -223 +224 @@
     pthread_barrierattr_t  barrier_attr;       // barrier attributes
 
-    // compute number of threads (one thread per proc)
+    // compute number of threads (one thread per core)
     get_config( &x_size , &y_size , &ncores );
     threads = x_size * y_size * ncores;
@@ -268 +269 @@
     for ( n = 0 ; n < ARRAY_LENGTH ; n++ )
     {
-        array0[n] = rand();
+        array0[n] = ARRAY_LENGTH - n - 1;
     }
 
@@ -315 +316 @@
                     }
                 }
-
-#if INTERACTIVE_MODE
-idbg();
-#endif
             }
         }