Changeset 640 for trunk/user

Timestamp:

Oct 1, 2019, 1:19:00 PM (5 years ago)

Author:

alain

Message:

Remove all RPCs in page-fault handling.

Location:

trunk/user

Files:

• fft/fft.c (modified) (8 diffs)
• ksh/ksh.c (modified) (3 diffs)

trunk/user/fft/fft.c

@@ -96 +96 @@
 #define MODE                    COSIN           // DATA array initialisation mode
 #define CHECK                   0               
-#define DEBUG_MAIN              1               // trace main() function (detailed if odd)
+#define DEBUG_MAIN              0               // trace main() function (detailed if odd)
 #define DEBUG_WORK              0               // trace work() function (detailed if odd)
 #define DEBUG_FFT1D             0               // trace FFT1D() function (detailed if odd)
 #define DEBUG_ROW               0               // trace FFTRow() function (detailed if odd)
 #define PRINT_ARRAY             0
+#define DISPLAY_SCHED_AND_VMM   0               // display final VMM state in all clusters 
 
 // macro to swap two variables
@@ -234 +235 @@
     unsigned int        ncores;            // max number of cores per cluster
 
+
     unsigned int        x;                 // current index for cluster X coordinate
     unsigned int        y;                 // current index for cluster Y coordinate
@@ -258 +260 @@
 #endif
     
+    int                 pid = getpid();
+
     // get FFT application start cycle
     get_cycle( &start_init_cycle );
@@ -311 +315 @@
 
     printf("\n[fft] starts / %d points / %d thread(s) / PID %x / cycle %d\n",
-    N, nthreads, getpid(), (unsigned int)start_init_cycle );
+    N, nthreads, pid, (unsigned int)start_init_cycle );
 
     // build instrumentation file name
@@ -498 +502 @@
     }
 
-    // close instrumentation file
-    ret = fclose( f );
-    if( ret )
-    {
-        printf("\n[fft error] cannot close file <%s>\n", path );
-        exit(0);
-    }
- 
 #if DEBUG_MAIN
 get_cycle( &debug_cycle );
@@ -553 +549 @@
     {
         unsigned int data_size = (N / nclusters) * 2 * sizeof(double);
-        unsigned int coefs_size = (rootN - 1) * 2 * sizeof(double);  
 
         data[cid] = (double *)malloc( data_size ); 
@@ -589 +584 @@
 printf("\n[fft] %s : thread %d exit barrier for buffer allocation / cycle %d\n",
 __FUNCTION__, tid, (unsigned int)barrier_stop );
+#endif
+
+#if DISPLAY_SCHED_AND_VMM
+    unsigned int x_size;
+    unsigned int y_size;
+    unsigned int ncores;
+    get_config( &x_size , &y_size , &ncores );
+    unsigned int x   = cid / y_size;
+    unsigned int y   = cid % y_size;
+    unsigned int cxy = HAL_CXY_FROM_XY( x , y );
+display_sched( cxy , lid );
+if( lid == 0 ) display_vmm( cxy , getpid() , 0 );
 #endif
 
@@ -652 +659 @@
 printf("\n[fft] %s : thread %d exit\n", 
 __FUNCTION__, tid );
+#endif
+
+#if DISPLAY_SCHED_AND_VMM
+printf("\n[fft] %s : thread %d exit\n", __FUNCTION__, tid );
+if( lid == 0 ) display_vmm( cxy , getpid() , 0 );
 #endif
 

trunk/user/ksh/ksh.c

@@ -400 +400 @@
     if( argc < 2 )
     {
-        printf("  usage: display  vmm      cxy      pid\n"
+        printf("  usage: display  vmm      cxy      pid      mapping\n"
                "         display  sched    cxy      lid\n"              
                "         display  process  cxy\n"              
@@ -416 +416 @@
     else if( strcmp( argv[1] , "vmm" ) == 0 )
     {
-        if( argc != 4 )
-        {
-                    printf("  usage: display vmm cxy pid\n");
+        if( argc != 5 )
+        {
+                    printf("  usage: display vmm cxy pid mapping\n");
             }
         else
@@ -424 +424 @@
                 unsigned int cxy = atoi(argv[2]);
                 unsigned int pid = atoi(argv[3]);
-
-            if( display_vmm( cxy , pid ) )
+                unsigned int map = atoi(argv[4]);
+
+            if( display_vmm( cxy , pid , map ) )
             {
                 printf("  error: no process %x in cluster %x\n", pid , cxy );