Changeset 625 for trunk/kernel/syscalls/sys_mutex.c

Timestamp:

Apr 10, 2019, 10:09:39 AM (6 years ago)

Author:

alain

Message:

Fix a bug in the vmm_remove_vseg() function: the physical pages
associated to an user DATA vseg were released to the kernel when
the target process descriptor was in the reference cluster.
This physical pages release should be done only when the page
forks counter value is zero.
All other modifications are cosmetic.

File:

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

trunk/kernel/syscalls/sys_mutex.c

@@ -2 +2 @@
  * sys_mutex.c - Access a POSIX mutex.
  * 
- * Author    Alain Greiner (2016,2017,2018)
+ * Author    Alain Greiner (2016,2017,2018,2019)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -24 +24 @@
 #include <hal_kernel_types.h>
 #include <hal_special.h>
+#include <hal_vmm.h>
 #include <errno.h>
 #include <thread.h>
@@ -56 +57 @@
     process_t * process = this->process;
 
+#if (DEBUG_SYS_MUTEX || CONFIG_INSTRUMENTATION_SYSCALLS)
+uint64_t     tm_start = hal_get_cycles();
+#endif
+
 #if DEBUG_SYS_MUTEX
-uint64_t    tm_start;
-uint64_t    tm_end;
-tm_start = hal_get_cycles();
 if( DEBUG_SYS_MUTEX < tm_start )
-printk("\n[DBG] %s : thread %x in process %x enter for %s / cycle %d\n",
+printk("\n[%s] thread[%x,%x] enter for %s / cycle %d\n",
 __FUNCTION__, this->trdid, process->pid, sys_mutex_op_str( operation ), (uint32_t)tm_start );
 #endif
@@ -221 +223 @@
     hal_fence();
 
+#if (DEBUG_SYS_MUTEX || CONFIG_INSTRUMENTATION_SYSCALLS)
+uint64_t     tm_end = hal_get_cycles();
+#endif
+
 #if DEBUG_SYS_MUTEX
-tm_end = hal_get_cycles();
-if( DEBUG_SYS_MUTEX < tm_start )
-printk("\n[DBG] %s : thread %x in process %x exit for %s / cost %d / cycle %d\n",
-__FUNCTION__, this->trdid, process->pid, sys_mutex_op_str( operation ),
-(uint32_t)(tm_end - tm_start), (uint32_t)tm_end );
+if( DEBUG_SYS_MUTEX < tm_end )
+printk("\n[%s] thread[%x,%x] exit for %s / cycle %d\n",
+__FUNCTION__, this->trdid, process->pid, sys_mutex_op_str( operation ), (uint32_t)tm_end );
+#endif
+
+#if CONFIG_INSTRUMENTATION_SYSCALLS
+hal_atomic_add( &syscalls_cumul_cost[SYS_MUTEX] , tm_end - tm_start );
+hal_atomic_add( &syscalls_occurences[SYS_MUTEX] , 1 );
 #endif