Changeset 442 for trunk/user

Timestamp:

May 16, 2018, 4:13:12 PM (7 years ago)

Author:

alain

Message:

Introduce idbg application.

Location:

trunk/user

Files:

• idbg (added)
• idbg/Makefile (added)
• idbg/idbg.c (added)
• idbg/idbg.ld (added)
• init/init.c (modified) (4 diffs)
• ksh/ksh.c (modified) (5 diffs)
• pgcd/pgcd.c (modified) (1 diff)
• sort/sort.c (modified) (6 diffs)

trunk/user/init/init.c

@@ -18 +18 @@
 #include <pthread.h>
 
-#define DEBUG_INIT_PROCESS 1
+#define DEBUG_PROCESS_INIT    0
 
 // TODO make the cxy computation portable [AG]
@@ -27 +27 @@
 {
     int           i;
-    int           delay;
     int           ret_fork;      // fork return value  
     int           ret_exec;      // exec return value  
@@ -70 +69 @@
              snprintf( string , 64 , "[INIT] created KSH[%d] / pid = %x", i , ret_fork ); 
              display_string( string );
-
-             // INIT wait a fixed delay between two forks
-             for( delay = 0 ; delay < 50000 ; delay++ ) asm volatile( "nop" );
         }
     } 
   
-#if DEBUG_INIT_PROCESS
+#if DEBUG_PROCESS_INIT
 
     unsigned int  x_size;        // number of clusters in a row
@@ -154 +150 @@
             else                                       // we are in INIT process
             {
-                // INIT display new CHILD process PID
-                snprintf( string , 64 , "[INIT] forked CHILD / pid = %x", ret_fork ); 
+                // INIT display new KSH process PID
+                snprintf( string , 64 , "[INIT] re-created KSH / pid = %x", ret_fork ); 
                 display_string( string );
             }
         } // end KSH kill handling
 
-#if DEBUG_INIT_PROCESS
+#if DEBUG_PROCESS_INIT
 
         // INIT displays processes and threads in all clusters 

trunk/user/ksh/ksh.c

@@ -238 +238 @@
     if( strcmp( argv[1] , "vmm" ) == 0 )
     {
-        if( argc != 3 )
-        {
-                    printf("  usage: display vmm pid\n");
+        if( argc != 4 )
+        {
+                    printf("  usage: display vmm cxy pid\n");
                     return;
             }
 
-            pid = atoi(argv[2]);
-
-        if( display_vmm( pid ) )
-        {
-            printf("  error: illegal arguments pid = %x\n", pid );
+            cxy = atoi(argv[2]);
+            pid = atoi(argv[3]);
+
+        if( display_vmm( cxy , pid ) )
+        {
+            printf("  error: no process %x in cluster %x\n", pid , cxy );
         }
     }
@@ -338 +339 @@
     if( pid == 0 )
     {
-                printf("  error: ilegal pid format\n" );
+                printf("  error: PID cannot be 0\n" );
         }
 
@@ -582 +583 @@
 {
         cmd_rm(argc, argv);
+}
+
+///////////////////////////////////////////////
+static void cmd_trace( int argc , char **argv )
+{
+    unsigned int cxy;
+    unsigned int lid;
+
+        if (argc != 3)
+    {
+                printf("  usage: trace cxy lid \n");
+                return;
+        }
+
+    cxy = atoi(argv[1]);
+    lid = atoi(argv[2]);
+
+    if( trace( 1 , cxy , lid ) )
+    {
+        printf("  error: core[%x,%d] not found\n", cxy, lid );
+    }
+}
+
+///////////////////////////////////////////////
+static void cmd_untrace( int argc , char **argv )
+{
+    unsigned int cxy;
+    unsigned int lid;
+
+        if (argc != 3)
+    {
+                printf("  usage: untrace cxy lid \n");
+                return;
+        }
+
+    cxy = atoi(argv[1]);
+    lid = atoi(argv[2]);
+
+    if( trace( 0 , cxy , lid ) )
+    {
+        printf("  error: core[%x,%d] not found\n", cxy, lid );
+    }
 }
 
@@ -605 +648 @@
         { "rm",      "remove a file from file system",                  cmd_rm      },
         { "rmdir",   "remove a directory from file system",             cmd_rmdir   },
+        { "trace",   "activate trace for a given core",                 cmd_trace   },
+        { "untrace", "desactivate trace for a given core",              cmd_untrace },
         { NULL,      NULL,                                                                              NULL        }
 };
@@ -702 +747 @@
 
 // @@@
-// parse("load /bin/user/sort.elf");
+// parse("load /bin/user/hello.elf");
 // @@@
 

trunk/user/pgcd/pgcd.c

@@ -43 +43 @@
                 else            opy = opy - opx;
             }
-            printf("pgcd      = %d\n", opx);
+            printf("pgcd      = %d", opx);
         }
     }

trunk/user/sort/sort.c

@@ -27 +27 @@
 #include <pthread.h>
 
-#define ARRAY_LENGTH        0x100    // 256 values
+#define ARRAY_LENGTH        0x400    // 1024 values
 
 #define MAX_THREADS         1024     // 16 * 16 * 4
 
 #define DISPLAY_ARRAY       0
-#define DISPLAY_THREADS     1
+#define INTERACTIVE_MODE    1
 
 ///////////////////////////////////////////////////////
@@ -159 +159 @@
     unsigned int  stages     = __builtin_ctz( threads ) + 1;
 
+    printf("\n[SORT] thread[%d] : start\n", thread_uid );
+
     bubbleSort( array0, items, items * thread_uid );
 
@@ -165 +167 @@
     /////////////////////////////////
     pthread_barrier_wait( &barrier ); 
-
     printf("\n[SORT] thread[%d] exit barrier\n", thread_uid );
 
@@ -201 +202 @@
         /////////////////////////////////
         pthread_barrier_wait( &barrier );
+        printf("\n[SORT] thread[%d] exit barrier\n", thread_uid );
 
     }
@@ -316 +318 @@
                                          &arg[thread_uid] ) ) // sort arguments
                     {
-                        printf("\n[SORT ERROR] main created thread %x \n", thread_uid );
+                        printf("\n[SORT ERROR] main cannot create thread %x \n", thread_uid );
                         exit( 0 );
                     }
+                    else
+                    {
+                        printf("\n[SORT] main created thread %x \n", thread_uid );
+                    }
                 }
-         
-#if DISPLAY_THREADS
-display_sched( CXY_FROM_XY(x,y) , lid );
+
+#if INTERACTIVE_MODE
+idbg();
 #endif
             }
         }
     }
-
+    
     get_cycle( &cycle );
     printf("\n[SORT] main completes threads create at cycle %d\n", (unsigned int)cycle );
@@ -334 +340 @@
     sort( &arg[main_uid] );
 
-while( 1 ) asm volatile( "nop" );
+#if INTERACTIVE_MODE
+idbg();
+#endif
     
     // Check result