Changeset 619 for trunk/user/sort/sort.c

Timestamp:

Feb 12, 2019, 1:15:47 PM (6 years ago)

Author:

alain

Message:

1) Fix a bug in KSH : after the "load" command,

the [ksh] prompt is now printed after completion
of the loaded application.

2) Fix a bug in vmm_handle_cow() : the copy-on-write

use now a hal_remote_memcpy() to replicate the page content.

File:

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

trunk/user/sort/sort.c

@@ -29 +29 @@
 #include <hal_macros.h>
 
-#define ARRAY_LENGTH        0x1000    // 4096 values
-
+#define ARRAY_LENGTH        256        // number of values
 #define MAX_THREADS         1024       // 16 * 16 * 4
-
+#define USE_DQT_BARRIER     1
 #define DISPLAY_ARRAY       0
 #define INTERACTIVE_MODE    0
@@ -42 +41 @@
 typedef struct
 {
-    unsigned int threads;      // total number of threads
+    unsigned int threads;       // total number of threads
     unsigned int thread_uid;    // thread user index (0 to threads -1)
     unsigned int main_uid;      // main thread user index
@@ -206 +205 @@
 void main( void )
 {
+    int                    error;
     unsigned int           x_size;             // number of rows
     unsigned int           y_size;             // number of columns
     unsigned int           ncores;             // number of cores per cluster
-    unsigned int           threads;            // total number of threads
+    unsigned int           total_threads;      // total number of threads
     unsigned int           thread_uid;         // user defined thread index
     unsigned int           main_cxy;           // cluster identifier for main
@@ -226 +226 @@
     // compute number of threads (one thread per core)
     get_config( &x_size , &y_size , &ncores );
-    threads = x_size * y_size * ncores;
+    total_threads = x_size * y_size * ncores;
 
     // get core coordinates and user index for the main thread
@@ -235 +235 @@
 
     // checks number of threads
-    if ( (threads != 1)   && (threads != 2)   && (threads != 4)   && 
-         (threads != 8)   && (threads != 16 ) && (threads != 32)  && 
-         (threads != 64)  && (threads != 128) && (threads != 256) && 
-         (threads != 512) && (threads != 1024) )
+    if ( (total_threads != 1)   && (total_threads != 2)   && (total_threads != 4)   && 
+         (total_threads != 8)   && (total_threads != 16 ) && (total_threads != 32)  && 
+         (total_threads != 64)  && (total_threads != 128) && (total_threads != 256) && 
+         (total_threads != 512) && (total_threads != 1024) )
     {
         printf("\n[SORT ERROR] number of cores must be power of 2\n");
@@ -245 +245 @@
 
     // check array size
-    if ( ARRAY_LENGTH % threads) 
+    if ( ARRAY_LENGTH % total_threads) 
     {
         printf("\n[SORT ERROR] array size must be multiple of number of threads\n");
@@ -251 +251 @@
     }
 
-    printf("\n[SORT] main starts on core[%x,%d] / %d thread(s) / %d values / PID %x\n",
-    main_cxy, main_lid, threads, ARRAY_LENGTH, getpid() );
-
-    // Barrier initialization
-    barrier_attr.x_size   = x_size; 
-    barrier_attr.y_size   = y_size;
-    barrier_attr.nthreads = ncores;
-    if( pthread_barrier_init( &barrier, &barrier_attr , threads ) )
+    printf("\n\n[SORT] main starts on core[%x,%d] / %d threads / %d values / PID %x\n",
+    main_cxy, main_lid, total_threads, ARRAY_LENGTH, getpid() );
+
+    // initialize barrier
+    if( USE_DQT_BARRIER )
+    {
+        barrier_attr.x_size   = x_size; 
+        barrier_attr.y_size   = y_size;
+        barrier_attr.nthreads = ncores;
+        error = pthread_barrier_init( &barrier, &barrier_attr , total_threads );
+    }
+    else // use SIMPLE_BARRIER
+    {
+        error = pthread_barrier_init( &barrier, NULL , total_threads );
+    }
+
+    if( error )
     {
         printf("\n[SORT ERROR] cannot initialise barrier\n" );
@@ -290 +299 @@
 
                 // set sort arguments for all threads
-                arg[thread_uid].threads      = threads;
+                arg[thread_uid].threads      = total_threads;
                 arg[thread_uid].thread_uid   = thread_uid;
                 arg[thread_uid].main_uid     = main_uid;
@@ -330 +339 @@
     sort( &arg[main_uid] );
 
+#if INTERACTIVE_MODE
+idbg();
+#endif
+
+    // destroy barrier
+    pthread_barrier_destroy( &barrier );
+
+#if INTERACTIVE_MODE
+idbg();
+#endif
+
     // Check result
     int    success = 1;
-    int*   res_array = ( (threads==  2) ||
-                         (threads==  8) || 
-                         (threads== 32) || 
-                         (threads==128) || 
-                         (threads==512) ) ? array1 : array0;
+    int*   res_array = ( (total_threads ==   2) ||
+                         (total_threads ==   8) || 
+                         (total_threads ==  32) || 
+                         (total_threads == 128) || 
+                         (total_threads == 512) ) ? array1 : array0;
     
     for( n=0 ; n<(ARRAY_LENGTH-2) ; n++ )
@@ -359 +379 @@
     {
         printf("\n[SORT] success at cycle %d\n", (unsigned int)cycle );
-        exit( 0 );
     }
     else
     {
         printf("\n[SORT] failure at cycle %d\n", (unsigned int)cycle );
-        exit( 1 );
-    }
+    }
+
+#if INTERACTIVE_MODE
+idbg();
+#endif
+
+    exit( 0 );
 
 }  // end main()