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

Timestamp:

Oct 4, 2018, 11:50:21 PM (5 years ago)

Author:

alain

Message:

Complete restructuration of kernel locks.

File:

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

trunk/kernel/syscalls/sys_read.c

@@ -34 +34 @@
 #include <process.h>
 
-#include <syscalls.h>
-
-// TODO: concurrent user page(s) munmap need to be handled [AG] 
 
 extern uint32_t enter_sys_read;
@@ -69 +66 @@
     xptr_t       process_owner_xp = process->owner_xp;
  
+#if (DEBUG_SYS_READ || CONFIG_INSTRUMENTATION_SYSCALLS)
+uint64_t     tm_start = hal_get_cycles();
+#endif
+
 #if DEBUG_SYS_READ
-uint64_t     tm_start;
-uint64_t     tm_end;
-tm_start = hal_get_cycles();
 if( DEBUG_SYS_READ < tm_start )
 printk("\n[DBG] %s : thread %x in process %x enter / vaddr %x / count %d / cycle %d\n",
@@ -130 +128 @@
 
     // check file readable
-    uint32_t attr = hal_remote_lw( XPTR( file_cxy , &file_ptr->attr ) );
+    uint32_t attr = hal_remote_l32( XPTR( file_cxy , &file_ptr->attr ) );
     if( (attr & FD_ATTR_READ_ENABLE) == 0 )
         {
@@ -143 +141 @@
     
     // get file type
-    vfs_inode_type_t type = hal_remote_lw( XPTR( file_cxy , &file_ptr->type ) );
+    vfs_inode_type_t type = hal_remote_l32( XPTR( file_cxy , &file_ptr->type ) );
 
     // action depend on file type
@@ -149 +147 @@
     {
         // check file readable
-        uint32_t attr = hal_remote_lw( XPTR( file_cxy , &file_ptr->attr ) );
+        uint32_t attr = hal_remote_l32( XPTR( file_cxy , &file_ptr->attr ) );
 
         if( (attr & FD_ATTR_READ_ENABLE) == 0 )
@@ -181 +179 @@
         {
             // extended pointer on TXT owner process
-            txt_owner_xp  = hal_remote_lwd( XPTR( chdev_cxy , &chdev_ptr->ext.txt.owner_xp ) );
+            txt_owner_xp  = hal_remote_l64( XPTR( chdev_cxy , &chdev_ptr->ext.txt.owner_xp ) );
 
             // check TXT_RX ownership
@@ -230 +228 @@
     hal_fence();
 
+#if (DEBUG_SYS_READ || CONFIG_INSTRUMENTATION_SYSCALLS)
+uint64_t     tm_end = hal_get_cycles();
+#endif
+
 #if DEBUG_SYS_READ
-tm_end = hal_get_cycles();
 if( DEBUG_SYS_READ < tm_end )
-printk("\n[DBG] %s : thread %x in process %x exit / cycle %d / cost %d\n",
-__FUNCTION__ , this->trdid, process->pid, (uint32_t)tm_start, (uint32_t)(tm_end - tm_start) );
+printk("\n[DBG] %s : thread %x in process %x exit / cycle %d\n",
+__FUNCTION__ , this->trdid, process->pid, (uint32_t)tm_end );
+#endif
+
+#if CONFIG_INSTRUMENTATION_SYSCALLS
+hal_atomic_add( &syscalls_cumul_cost[SYS_READ] , tm_end - tm_start );
+hal_atomic_add( &syscalls_occurences[SYS_READ] , 1 );
 #endif