Changeset 443 for trunk/libs

Timestamp:

May 16, 2018, 4:15:22 PM (7 years ago)

Author:

alain

Message:

Fix few bugs whike debugging the sort multi-thread application.

Location:

trunk/libs/mini-libc

Files:

• stdio.c (modified) (2 diffs)
• stdio.h (modified) (3 diffs)
• stdlib.c (modified) (1 diff)
• stdlib.h (modified) (1 diff)

trunk/libs/mini-libc/stdio.c

@@ -328 +328 @@
 }
 
-///////////////////////////////////
-int display_vmm( unsigned int pid )
+//////////////////////////////////
+int display_vmm( unsigned int cxy,
+                 unsigned int pid )
 {
     return hal_user_syscall( SYS_DISPLAY,
                              DISPLAY_VMM,
-                             (reg_t)pid, 0, 0 );
-} 
-
-////////////////////////////////
+                             (reg_t)cxy,
+                             (reg_t)pid, 0 );
+} 
+
+////////////////////////////////////
 int display_sched( unsigned int cxy,
                    unsigned int lid )
@@ -383 +385 @@
 }
 
-//////////////////////////////////
-int trace( unsigned int operation,
-           unsigned int pid, 
-           unsigned int trdid )
+///////////////////////////////
+int trace( unsigned int active,
+           unsigned int cxy, 
+           unsigned int lid )
 {
     return hal_user_syscall( SYS_TRACE,
-                             (reg_t)pid,
-                             (reg_t)trdid, 0, 0 );
-}
-
-
+                             (reg_t)active,
+                             (reg_t)cxy,
+                             (reg_t)lid, 0 );
+}
+
+

trunk/libs/mini-libc/stdio.h

@@ -402 +402 @@
 /*************************************************************************************** 
  * This debug function displays on the kernel terminal TXT0 
- * the state of the process VMM identified by the <pid> argument.
+ * the state of the VMM forthe process <pid>, in cluster <cxy>.
  * It can be called by any thread running in any cluster.
  ***************************************************************************************
@@ -408 +408 @@
  * @ return 0 if success / return -1 if illegal argument.
  **************************************************************************************/
-int display_vmm( unsigned int  pid );
+int display_vmm( unsigned int  cxy,
+                 unsigned int  pid );
 
 /*************************************************************************************** 
@@ -460 +461 @@
 
 /***************************************************************************************** 
- * This debug function is used to activate / desactivate the trace for a thread 
- * identified by the <trdid> and <pid> arguments.
- * It can be called by any other thread in the same process.
- ***************************************************************************************** 
- * @ operation  : operation type.
- * @ pid        : process identifier.
- * @ trdid      : thread identifier.
+ * This debug function is used to activate / desactivate the context switches trace
+ * for a core identified by the <cxy> and <lid> arguments.
+ * It can be called by any thread running in any cluster.
+ ***************************************************************************************** 
+ * @ active     : activate trace if non zero / desactivate if zero.
+ * @ cxy        : cluster identifier.
+ * @ lid        : core local index.
  * @ returns O if success / returns -1 if illegal arguments.
  ****************************************************************************************/
-int trace( unsigned int operation,
-           unsigned int pid, 
-           unsigned int trdid );
+int trace( unsigned int active,
+           unsigned int cxy, 
+           unsigned int lid );
 
 

trunk/libs/mini-libc/stdlib.c

@@ -553 +553 @@
     printf("\n[ERROR] in %s : not implemented yet : do nothing\n", __FUNCTION__ );
 }
+
+///////////
+void idbg()
+{
+   char          cmd;
+   unsigned int  cxy;
+   unsigned int  lid;
+   unsigned int  txt;
+   unsigned int  active;
+
+   while( 1 )
+   {
+        printf("\n[idbg] cmd = ");
+        cmd = (char)getchar();
+
+        if( cmd == 'h' )
+        {
+            printf("h\n"
+                   "p : display on TXT0 process descriptors in cluster[cxy]\n"
+                   "s : display on TXT0 scheduler state for core[cxy,lid]\n"
+                   "v : display on TXT0 VMM for calling process in cluster [cxy]\n"
+                   "t : display on TXT0 process decriptors attached to TXT[tid]\n"
+                   "y : activate/desactivate trace for core[cxy,lid]\n"
+                   "x : force calling process to exit\n"
+                   "c : resume calling process execution\n"
+                   "h : list supported commands\n");
+        }
+        else if( cmd == 'p' )
+        {
+            printf("p / cxy = ");
+            cxy = getint();
+            display_cluster_processes( cxy );
+        }
+        else if( cmd == 's' )
+        {
+            printf("s / cxy = ");
+            cxy = getint();
+            printf(" / lid = ");
+            lid = getint();
+            display_sched( cxy , lid );
+        }
+        else if( cmd == 'v' )
+        {
+            printf("v / cxy = ");
+            cxy = getint();
+            display_vmm( cxy , (unsigned int)getpid() );
+        }
+        else if( cmd == 't' )
+        {
+            printf("t / txt_id = ");
+            txt = getint();
+            display_txt_processes( txt );
+        }
+        else if( cmd == 'y' )
+        {
+            printf("y / active = ");
+            active = getint();
+            printf(" / cxy = ");
+            cxy    = getint();
+            printf(" / lid = ");
+            lid    = getint();
+            trace( active , cxy , lid );
+        }
+        else if( cmd == 'x' )
+        {
+            printf("x\n");
+            exit( 0 );
+        }
+        else if( cmd == 'c' )
+        {
+            printf("c\n");
+            break;
+        }
+    }
+}  // end idbg()
+
+
+

trunk/libs/mini-libc/stdlib.h

@@ -130 +130 @@
 int rand();
 
+/*********************************************************************************************
+ * This blocking function implements an user-level interactive debugger that can be
+ * introduced in any user application to display various kernel distributed structures
+ * related to the calling process. The supported commands are:
+ * - p (cxy)     : display all processes descriptors in a given cluster.
+ * - s (cxy,lid) : display all threads attached to a given core in a given cluster.
+ * - v (cxy)     : display the calling process VMM in a given cluster.
+ * - t (tid)     : display all owner process descriptors attached to a given TXT terminal.
+ * - x           : force the calling process to exit.
+ * - c           : continue calling process execution.
+ *********************************************************************************************
+ * @ return an integer value between 0 and RAND_MAX.
+ ********************************************************************************************/
+void idbg();
+
+
 #endif  // _STDLIB_H_