Changeset 443 for trunk/kernel/syscalls/sys_display.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_display.c (modified) (4 diffs)

trunk/kernel/syscalls/sys_display.c

@@ -30 +30 @@
 #include <process.h>
 #include <string.h>
-
+#include <shared_syscalls.h>
+
+/////////////////////////////////////////////////////////////////////////////////
+// This static function returns a printable string for the type of display.
+/////////////////////////////////////////////////////////////////////////////////
+
+#if DEBUG_SYS_DISPLAY
+static char* display_type_str( uint32_t type )
+{
+    if     ( type == DISPLAY_STRING            ) return "STRING"; 
+    else if( type == DISPLAY_VMM               ) return "VMM"; 
+    else if( type == DISPLAY_SCHED             ) return "SCHED"; 
+    else if( type == DISPLAY_CLUSTER_PROCESSES ) return "CLUSTER_PROCESSES"; 
+    else if( type == DISPLAY_VFS               ) return "VFS"; 
+    else if( type == DISPLAY_CHDEV             ) return "CHDEV"; 
+    else if( type == DISPLAY_TXT_PROCESSES     ) return "TXT_PROCESSES"; 
+}
+#endif
 
 /////////////////////////////
@@ -49 +66 @@
 tm_start = hal_get_cycles();
 if( DEBUG_SYS_DISPLAY < tm_start )
-printk("\n[DBG] %s : thread %d enter / process %x / type  %d / cycle = %d\n",
-__FUNCTION__, this, this->process->pid, type, (uint32_t)tm_start );
+printk("\n[DBG] %s : thread %d enter / process %x / type  %s / cycle = %d\n",
+__FUNCTION__, this, this->process->pid, display_type_str(type), (uint32_t)tm_start );
 #endif
 
@@ -98 +115 @@
     else if( type == DISPLAY_VMM )
     {
-        pid_t pid = (pid_t)arg0;
-
-        // get extended pointer on reference process
-        xptr_t process_xp = cluster_get_reference_process_from_pid( pid );
+        cxy_t cxy = (cxy_t)arg0;
+        pid_t pid = (pid_t)arg1;
+
+        // check cxy argument
+            if( cluster_is_undefined( cxy ) ) 
+        {
+
+#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;
+        }
+
+        // get extended pointer on process PID in cluster CXY
+        xptr_t process_xp = cluster_get_process_from_pid_in_cxy( cxy , pid );
 
             if( process_xp == XPTR_NULL )
@@ -107 +137 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : undefined pid argument %d / thread %x / process %x\n",
-__FUNCTION__ , pid , this->trdid , process->pid );
-#endif
-            this->errno = EINVAL;
-            return -1;
-        }
-
-        // get cluster and local pointer on process
-        cxy_t       process_cxy = GET_CXY( process_xp );
-        process_t * process_ptr = (process_t *)GET_PTR( process_xp );
+printk("\n[ERROR] in %s : process %x in cluster %x not found / thread %x / process %x\n",
+__FUNCTION__ , pid , cxy , this->trdid , process->pid );
+#endif
+            this->errno = EINVAL;
+            return -1;
+        }
+
+        // get local pointer on process
+        process_t * process = (process_t *)GET_PTR( process_xp );
 
         // call kernel function
-        if( process_cxy == local_cxy )
-        {
-                vmm_display( process_ptr , true );
+        if( cxy == local_cxy )
+        {
+                vmm_display( process , true );
         }
         else
         {
-            rpc_vmm_display_client( process_cxy , process_ptr , true );
+            rpc_vmm_display_client( cxy , process , true );
         }
     }