Changeset 443 for trunk/kernel/syscalls/sys_trace.c

Timestamp:

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

Author:

alain

Message:

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

File:

• trunk/kernel/syscalls/sys_trace.c (modified) (2 diffs)

trunk/kernel/syscalls/sys_trace.c

@@ -1 +1 @@
 /*
- * sys_trace.c - show kernel active processes and threads
+ * sys_trace.c - activate / desactivate the context switches trace for a given core
  * 
- * Author    Alain Greiner (c) (2016,2017)
+ * Author    Alain Greiner (c) (2016,2017,2018)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -27 +27 @@
 #include <thread.h>
 #include <errno.h>
+#include <shared_syscalls.h>
 #include <syscalls.h>
 
-//////////////////////////////////
-int sys_trace( uint32_t operation,
-               pid_t    pid, 
-               uint32_t trdid )
+///////////////////////////////
+int sys_trace( bool_t   active,
+               cxy_t    cxy,
+               lid_t    lid )
 {
-    // get extended pointer on target thread
-    xptr_t thread_xp = thread_get_xptr( pid , trdid );
+    uint32_t    ncores;
 
-    if( thread_xp == XPTR_NULL )
+    thread_t  * this    = CURRENT_THREAD;
+    process_t * process = this->process;
+
+#if DEBUG_SYS_TRACE
+uint64_t    tm_start;
+uint64_t    tm_end;
+tm_start = hal_get_cycles();
+if( DEBUG_SYS_TRACE < tm_start )
+printk("\n[DBG] %s : thread %d enter / process %x / cycle = %d\n",
+__FUNCTION__, this, this->process->pid, (uint32_t)tm_start );
+#endif
+
+    // check cluster identifier
+    if( cluster_is_undefined( cxy ) )
     {
-        printk("\n[ERROR] in %s : undefined thread for PID = %x / TRDID = %x\n",
-               __FUNCTION__ , pid , trdid );
-        CURRENT_THREAD->errno = EINVAL;
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : illegal cxy argument %x / thread %x / process %x\n",
+__FUNCTION__ , cxy , this->trdid , process->pid );
+#endif
+        this->errno = EINVAL;
         return -1;
     }
 
-    if( operation == TRACE_OFF )
+    // check core local index
+    ncores = hal_remote_lw( XPTR( cxy , &LOCAL_CLUSTER->cores_nr ) );
+    if( lid >= ncores )
     {
-        // desactivate thread trace TODO
 
-            printk("\n[DBG] %s : trace OFF  for thread %x in process %x\n",
-               __FUNCTION__ , trdid , pid );
-    }
-    else if( operation == TRACE_ON )
-    {
-        // activate thread trace TODO
-                    
-            printk("\n[DBG] %s : trace ON for thread %x in process %x\n",
-               __FUNCTION__ , trdid , pid );
-    }
-    else
-    {
-        printk("\n[ERROR] in %s : undefined operation\n", __FUNCTION__ );
-        CURRENT_THREAD->errno = EINVAL;
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : illegal lid argument %x / thread %x / process %x\n",
+__FUNCTION__ , lid , this->trdid , process->pid );
+#endif
+        this->errno = EINVAL;
         return -1;
     }
 
+    // get local pointer on target core
+    core_t * core = &LOCAL_CLUSTER->core_tbl[lid];
+
+    // get extended pointer on target scheduler trace field
+    xptr_t trace_xp = XPTR( cxy , &core->scheduler.trace );
+
+    if ( active ) hal_remote_sw( trace_xp , 1 );
+    else          hal_remote_sw( trace_xp , 0 );
+    
     hal_fence();
+
+#if DEBUG_SYS_TRACE
+tm_end = hal_get_cycles();
+if( DEBUG_SYS_TRACE < tm_end )
+printk("\n[DBG] %s : thread %x exit / process %x / cost = %d / cycle %d\n",
+__FUNCTION__, this, this->process->pid, (uint32_t)(tm_end - tm_start) , (uint32_t)tm_end );
+#endif
 
     return 0;