Changeset 625 for trunk/user/sort

Timestamp:

Apr 10, 2019, 10:09:39 AM (6 years ago)

Author:

alain

Message:

Fix a bug in the vmm_remove_vseg() function: the physical pages
associated to an user DATA vseg were released to the kernel when
the target process descriptor was in the reference cluster.
This physical pages release should be done only when the page
forks counter value is zero.
All other modifications are cosmetic.

File:

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

trunk/user/sort/sort.c

@@ -29 +29 @@
 #include <hal_macros.h>
 
-#define ARRAY_LENGTH        1024       // number of items
+#define ARRAY_LENGTH        256        // number of items
 #define MAX_THREADS         1024       // 16 * 16 * 4
 
@@ -412 +412 @@
 #endif
 
-#if CHECK_RESULT   
-int    success = 1;
-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++ )
-{
-    if ( res_array[n] > res_array[n+1] )
-    {
-        printf("\n[sort] array[%d] = %d > array[%d] = %d\n",
-        n , res_array[n] , n+1 , res_array[n+1] );
-        success = 0;
-        break;
-    }
-}
-
-if ( success ) printf("\n[sort] success\n");
-else           printf("\n[sort] failure\n");
+#if CHECK_RESULT
+   
+    int    success = 1;
+    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++ )
+    {
+        if ( res_array[n] > res_array[n+1] )
+        {
+            printf("\n[sort] array[%d] = %d > array[%d] = %d\n",
+            n , res_array[n] , n+1 , res_array[n+1] );
+            success = 0;
+            break;
+        }
+    }
+
+    if ( success ) printf("\n[sort] success\n");
+    else           printf("\n[sort] failure\n");
+
 #endif
 
 #if INSTRUMENTATION
-char   name[64];
-char   path[128];
-
-// build a file name from n_items / n_clusters / n_cores
-if( USE_DQT_BARRIER ) snprintf( name , 64 , "sort_dqt_%d_%d_%d", 
-                      ARRAY_LENGTH, x_size * y_size, ncores );
-else                  snprintf( name , 64 , "sort_smp_%d_%d_%d", 
-                      ARRAY_LENGTH, x_size * y_size, ncores );
-
-// build file pathname
-snprintf( path , 128 , "home/%s" , name );
-
-// compute results
-unsigned int sequencial = (unsigned int)(seq_end_cycle - start_cycle);
-unsigned int parallel   = (unsigned int)(para_end_cycle - seq_end_cycle);
-
-// display results on process terminal
-printf("\n----- %s -----\n"
-       " - sequencial : %d cycles\n"
-       " - parallel   : %d cycles\n", 
-       name, sequencial, parallel );
-
-// open file
-FILE * stream = fopen( path , NULL );
-if( stream == NULL )
-{
-    printf("\n[sort error] cannot open instrumentation file <%s>\n", name );
-    exit(0);
-}
-
-// register results to file
-int ret = fprintf( stream , "\n----- %s -----\n"
-                            " - sequencial : %d cycles\n"
-                            " - parallel   : %d cycles\n", name, sequencial, parallel );
-if( ret < 0 )
-{
-    printf("\n[sort error] cannot write to instrumentation file <%s>\n", name );
-    exit(0);
-}
-
-// close instrumentation file
-if( fclose( stream ) )
-{
-    printf("\n[sort error] cannot close instrumentation file <%s>\n", name );
-    exit(0);
-}
+
+    char   name[64];
+    char   path[128];
+
+    // build a file name from n_items / n_clusters / n_cores
+    if( USE_DQT_BARRIER ) snprintf( name , 64 , "sort_dqt_%d_%d_%d", 
+                          ARRAY_LENGTH, x_size * y_size, ncores );
+    else                  snprintf( name , 64 , "sort_smp_%d_%d_%d", 
+                          ARRAY_LENGTH, x_size * y_size, ncores );
+
+    // build file pathname
+    snprintf( path , 128 , "home/%s" , name );
+
+    // compute results
+    unsigned int sequencial = (unsigned int)(seq_end_cycle - start_cycle);
+    unsigned int parallel   = (unsigned int)(para_end_cycle - seq_end_cycle);
+
+    // display results on process terminal
+    printf("\n----- %s -----\n"
+           " - sequencial : %d cycles\n"
+           " - parallel   : %d cycles\n", 
+           name, sequencial, parallel );
+
+    // open file
+    FILE * stream = fopen( path , NULL );
+    if( stream == NULL )
+    {
+        printf("\n[sort error] cannot open instrumentation file <%s>\n", name );
+        exit(0);
+    }
+
+    printf("\n[sort] file %s successfully open\n", path);
+
+    // register results to file
+    int ret = fprintf( stream , "\n----- %s -----\n"
+                                " - sequencial : %d cycles\n"
+                                " - parallel   : %d cycles\n", name, sequencial, parallel );
+    if( ret < 0 )
+    {
+        printf("\n[sort error] cannot write to instrumentation file <%s>\n", name );
+        exit(0);
+    }
+
+    printf("\n[sort] file %s successfully written\n", path);
+
+    // close instrumentation file
+
+    if( fclose( stream ) )
+    {
+        printf("\n[sort error] cannot close the file <%s>\n", name );
+        exit(0);
+    }
+
+    printf("\n[sort] file %s successfully closed\n", path);
+
 #endif