Changeset 433 for trunk/kernel/syscalls/sys_display.c

Timestamp:

Feb 14, 2018, 3:40:19 PM (6 years ago)

Author:

alain

Message:

blip

File:

• trunk/kernel/syscalls/sys_display.c (modified) (9 diffs)

trunk/kernel/syscalls/sys_display.c

@@ -25 +25 @@
 #include <hal_uspace.h>
 #include <errno.h>
+#include <vmm.h>
 #include <cluster.h>
 #include <thread.h>
 #include <process.h>
+#include <string.h>
 
 
@@ -35 +37 @@
                  reg_t  arg1 )
 {
+    // get thread, process and core
+    thread_t  * this    = CURRENT_THREAD;
+    process_t * process = this->process;
+    core_t    * core    = this->core;
+
+#if CONFIG_DEBUG_SYS_DISPLAY
+uint64_t    tm_start;
+uint64_t    tm_end;
+tm_start = hal_get_cycles();
+if( CONFIG_DEBUG_SYS_DISPLAY < tm_start )
+printk("\n[DBG] %s : thread %d enter / process %x / cycle = %d\n",
+__FUNCTION__, this, process->pid, (uint32_t)tm_start );
+#endif
+
     if( type == DISPLAY_STRING )
     {
         paddr_t   paddr;
         char      kbuf[256];
+        uint32_t  length;
 
         char    * string = (char *)arg0;
  
         // check string in user space
-        if( vmm_v2p_translate( false , string , &paddr ) ) return -1;
+        if( vmm_v2p_translate( false , string , &paddr ) )
+        {
+            printk("\n[ERROR] in %s : string buffer %x unmapped\n",
+            __FUNCTION__ , string );
+            return -1;
+        }
 
         // ckeck string length
-        if( hal_strlen_from_uspace( string ) >= 256 ) return -1;
+        length = hal_strlen_from_uspace( string );
+        if( length >= 256 )
+        {
+            printk("\n[ERROR] in %s : string length %d too large\n",
+            __FUNCTION__ , length );
+            return -1;
+        }
 
         // copy string in kernel space
         hal_strcpy_from_uspace( kbuf , string , 256 );
-
-        // get thread, process and core
-        thread_t  * this    = CURRENT_THREAD;
-        process_t * process = this->process;
-        core_t    * core    = this->core;
 
         // print message on TXT0 kernel terminal
@@ -60 +83 @@
         this->trdid , process->pid , local_cxy, core->lid ,
         (uint32_t)hal_get_cycles() , kbuf );
-
-            return 0; 
     }
     else if( type == DISPLAY_VMM )
@@ -70 +91 @@
         xptr_t process_xp = cluster_get_reference_process_from_pid( pid );
 
-            if( process_xp == XPTR_NULL ) return -1;
+            if( process_xp == XPTR_NULL )
+        {
+            printk("\n[ERROR] in %s : undefined PID %x\n",
+            __FUNCTION__ , pid );
+            return -1;
+        }
 
         // get cluster and local pointer on process
@@ -85 +111 @@
             rpc_vmm_display_client( process_cxy , process_ptr , true );
         }
-
-            return 0; 
     }
     else if( type == DISPLAY_SCHED )
@@ -94 +118 @@
 
         // check cluster argument
-            if( cluster_is_undefined( cxy ) ) return -1;
+            if( cluster_is_undefined( cxy ) ) 
+        {
+            printk("\n[ERROR] in %s : undefined cluster identifier %x\n",
+            __FUNCTION__ , cxy );
+            return -1;
+        }
 
         // check core argument
-        if( lid >= LOCAL_CLUSTER->cores_nr ) return -1;
+        if( lid >= LOCAL_CLUSTER->cores_nr )
+        {
+            printk("\n[ERROR] in %s : undefined local index %d\n",
+            __FUNCTION__ , lid );
+            return -1;
+        }
 
-        // call kernel function
         if( cxy == local_cxy )
         {
@@ -108 +141 @@
             rpc_sched_display_client( cxy , lid );
         }
-
-            return 0; 
     }
     else if( type == DISPLAY_PROCESS )
@@ -116 +147 @@
 
         // check cluster argument
-            if( cluster_is_undefined( cxy ) ) return -1;
+            if( cluster_is_undefined( cxy ) )
+        {
+            printk("\n[ERROR] in %s : undefined cluster identifier %x\n",
+            __FUNCTION__ , cxy );
+            return -1;
+        }
 
-        // call kernel function
         cluster_processes_display( cxy );
-
-        return 0;
     }
     else if( type == DISPLAY_VFS )
@@ -128 +161 @@
         process_t * process = CURRENT_THREAD->process;
         vfs_display( process->vfs_root_xp );
-
-        return 0;
     }
     else if( type == DISPLAY_CHDEV )
     {
-        // call kernel function
         chdev_dir_display();
+    }
+    else 
+    {
+        printk("\n[ERROR] in %s : undefined display type %x\n",
+        __FUNCTION__ , type );
+        return -1;
+    }
 
-        return 0;
-    }
-    else return -1;
+#if CONFIG_DEBUG_SYS_DISPLAY
+tm_end = hal_get_cycles();
+if( CONFIG_DEBUG_SYS_DISPLAY < tm_end )
+printk("\n[DBG] %s : thread %x exit / process %x / cost = %d / cycle %d\n",
+__FUNCTION__, this, process->pid, (uint32_t)(tm_end - tm_start) , (uint32_t)tm_end );
+#endif
 
-}  // end sys_get_sched()
+    return 0;
+
+}  // end sys_display()