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

Timestamp:

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

Author:

alain

Message:

Complete restructuration of kernel locks.

File:

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

trunk/kernel/syscalls/sys_fork.c

@@ -40 +40 @@
 #include <syscalls.h>
 
-//////////////
+////////////////////
 int sys_fork( void )
 {
@@ -67 +67 @@
     parent_cxy         = local_cxy;
 
+#if (DEBUG_SYS_FORK || CONFIG_INSTRUMENTATION_SYSCALLS)
+uint64_t     tm_start = hal_get_cycles();
+#endif
+
 #if DEBUG_SYS_FORK
-uint64_t          tm_start;
-uint64_t          tm_end;
-tm_start = hal_get_cycles();
 if( DEBUG_SYS_FORK < tm_start )
 printk("\n[DBG] %s : thread %x in process %x enter / cycle =  %d\n",
@@ -87 +88 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : too much children processes\n", __FUNCTION__);
+printk("\n[ERROR] in %s : thread %x in process %x cannot fork : too much children\n",
+__FUNCTION__, parent_thread_ptr->trdid, parent_pid );
 #endif
             hal_remote_atomic_add ( children_xp , -1 );
@@ -134 +136 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : cannot fork process %x in cluster %x\n",
-__FUNCTION__, parent_pid, local_cxy );
+printk("\n[ERROR] in %s : thread %x in process %x cannot fork to cluster %x\n",
+__FUNCTION__, parent_thread_ptr->trdid, parent_pid, local_cxy );
 #endif
         parent_thread_ptr->errno = EAGAIN;
@@ -159 +161 @@
     thread_t * current = CURRENT_THREAD;
 
+#if (DEBUG_SYS_FORK || CONFIG_INSTRUMENTATION_SYSCALLS)
+uint64_t     tm_end = hal_get_cycles();
+#endif
+
+#if DEBUG_SYS_FORK
+if( DEBUG_SYS_FORK < tm_end )
+printk("\n[DBG] %s : thread %x in process %x exit / cycle %d\n",
+__FUNCTION__, current->trdid, current->process->pid, (uint32_t)tm_end );
+#endif
+
     if( (current == parent_thread_ptr) && (local_cxy == parent_cxy) )   // parent thread
     {
@@ -164 +176 @@
         thread_unblock( XPTR( child_cxy , child_thread_ptr ) , THREAD_BLOCKED_GLOBAL );
 
-#if DEBUG_SYS_FORK
-tm_end = hal_get_cycles();
-if( DEBUG_SYS_FORK < tm_end )
-printk("\n[DBG] %s : process %x exit / cost = %d / cycle %d\n",
-__FUNCTION__, parent_pid, (uint32_t)(tm_end - tm_start), (uint32_t)tm_end );
+        // only parent contribute to instrumentation
+
+#if CONFIG_INSTRUMENTATION_SYSCALLS
+hal_atomic_add( &syscalls_cumul_cost[SYS_FORK] , tm_end - tm_start );
+hal_atomic_add( &syscalls_occurences[SYS_FORK] , 1 );
 #endif
         return child_pid;
@@ -174 +186 @@
         else                                                               // child_thread
     {
-
-#if DEBUG_SYS_FORK
-tm_end = hal_get_cycles();
-if( DEBUG_SYS_FORK < tm_end )
-printk("\n[DBG] %s : process %x exit / cost = %d / cycle %d\n",
-__FUNCTION__, child_pid, (uint32_t)(tm_end - tm_start), (uint32_t)tm_end );
-#endif
         return 0;
     }