Changeset 409 for trunk/kernel/syscalls/sys_read.c

Timestamp:

Dec 20, 2017, 4:51:09 PM (6 years ago)

Author:

alain

Message:

Fix bugs in exec

File:

• trunk/kernel/syscalls/sys_read.c (modified) (5 diffs)

trunk/kernel/syscalls/sys_read.c

@@ -25 +25 @@
 #include <hal_types.h>
 #include <hal_uspace.h>
+#include <hal_irqmask.h>
 #include <hal_special.h>
 #include <errno.h>
@@ -35 +36 @@
 // TODO: concurrent user page(s) munmap need to be handled [AG] 
 
-// instrumentation
+// TODO : remove these debug variables
 extern uint32_t enter_sys_read;
 extern uint32_t enter_devfs_move;
@@ -62 +63 @@
     uint32_t     nbytes;      // number of bytes actually read
     reg_t        save_sr;     // required to enable IRQs during syscall
-        uint32_t     tm_start;
-        uint32_t     tm_end;
-
-        tm_start = hal_get_cycles();
-
-#if CONFIG_READ_START
+
+#if CONFIG_SYSCALL_DEBUG
+uint32_t     tm_start;
+uint32_t     tm_end;
+tm_start = hal_get_cycles();
+#endif
+
+#if CONFIG_READ_DEBUG
 enter_sys_read = tm_start;
 #endif
@@ -159 +162 @@
     hal_fence();
 
-    tm_end = hal_get_cycles();
+#if CONFIG_SYSCALL_DEBUG
+tm_end = hal_get_cycles();
+syscall_dmsg("\n[DBG] %s exit : core[%x,%d] / thread %x in process %x / cycle %d\n"
+"nbytes = %d / first byte = %c / file_id = %d / cost = %d\n",
+__FUNCTION__ , local_cxy , this->core->lid , this->trdid , this->process->pid ,
+tm_start , nbytes , *((char *)(intptr_t)paddr) , file_id , tm_end - tm_start );
+#endif
 
 #if CONFIG_READ_DEBUG
 exit_sys_read = tm_end;
 
-printk("\n@@@@@@@@@@@@ timing ro read character %c\n"
+printk("\n@@@@@@@@@@@@ timing to read character %c\n"
 " - enter_sys_read     = %d / delta %d\n"
 " - enter_devfs_move   = %d / delta %d\n"
@@ -195 +204 @@
 exit_sys_read      , exit_sys_read      - exit_devfs_move    );
 #endif
-
-syscall_dmsg("\n[DBG] %s : core[%x,%d] / thread %x in process %x / cycle %d\n"
-"nbytes = %d / first byte = %c / file_id = %d / cost = %d\n",
-__FUNCTION__ , local_cxy , this->core->lid , this->trdid , this->process->pid ,
-tm_start , nbytes , *((char *)(intptr_t)paddr) , file_id , tm_end - tm_start );
  
         return nbytes;