Changeset 594 for trunk/kernel/syscalls/sys_close.c

Timestamp:

Nov 10, 2018, 2:33:26 PM (5 years ago)

Author:

alain

Message:

Fix various bugs in sys_stat() and sys_mmap() functions.
Improve debug in other functions.

File:

• trunk/kernel/syscalls/sys_close.c (modified) (4 diffs)

trunk/kernel/syscalls/sys_close.c

@@ -41 +41 @@
         process_t * process = this->process;
 
+#if (DEBUG_SYS_CLOSE || CONFIG_INSTRUMENTATION_SYSCALLS)
+uint64_t     tm_start = hal_get_cycles();
+#endif
+
 #if DEBUG_SYS_CLOSE
-uint32_t     tm_start;
-uint32_t     tm_end;
-tm_start = hal_get_cycles();
 if( DEBUG_SYS_CLOSE < tm_start )
-printk("\n[DBG] %s : thread %x in process %x enter / fdid %d / cycle %d\n",
-__FUNCTION__, this->trdid, process->pid, file_id, (uint32_t)tm_start );
+printk("\n[%s] thread[%x,%x] enter / fdid %d / cycle %d\n",
+__FUNCTION__, process->pid, this->trdid, file_id, (uint32_t)tm_start );
 #endif
  
@@ -64 +65 @@
     if( file_xp == XPTR_NULL )
     {
-        printk("\n[ERROR] in %s : undefined file descriptor = %d\n",
-               __FUNCTION__ , file_id );
-                this->errno = EBADFD;
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : undefined file descriptor %d\n",
+__FUNCTION__ , file_id );
+#endif
+        this->errno = EBADFD;
                 return -1;
     }
@@ -75 +79 @@
         if( error )
         {
-        printk("\n[ERROR] in %s : cannot close file descriptor = %d\n",
-               __FUNCTION__ , file_id );
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : cannot close file descriptor %d\n",
+__FUNCTION__ , file_id );
+#endif
                 this->errno = error;
                 return -1;
@@ -83 +90 @@
         hal_fence();
 
+#if (DEBUG_SYS_CLOSE || CONFIG_INSTRUMENTATION_SYSCALLS)
+uint64_t     tm_end = hal_get_cycles();
+#endif
+
 #if DEBUG_SYS_CLOSE
 tm_end = hal_get_cycles();
 if( DEBUG_SYS_CLOSE < tm_start )
-printk("\n[DBG] %s : thread %x in process %x exit / cost %d / cycle %d\n",
-__FUNCTION__, this->trdid, process->pid, (uint32_t)(tm_end - tm_start), (uint32_t)tm_start );
+printk("\n[%s] thread[%x,%x] exit / cycle %d\n",
+__FUNCTION__, process->pid, this->trdid, (uint32_t)tm_end );
 #endif
  
+#if CONFIG_INSTRUMENTATION_SYSCALLS
+hal_atomic_add( &syscalls_cumul_cost[SYS_CLOSE] , tm_end - tm_start );
+hal_atomic_add( &syscalls_occurences[SYS_CLOSE] , 1 );
+#endif
+
         return 0;
 }