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

Timestamp:

Apr 10, 2019, 10:09:39 AM (5 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_exit.c (modified) (9 diffs)

trunk/kernel/syscalls/sys_exit.c

@@ -2 +2 @@
  * sys_exit.c - Kernel function implementing the "exit" system call.
  * 
- * Author    Alain Greiner (2016,2017,2018)
+ * Author    Alain Greiner (2016,2017,2018,2019)
  *
  * Copyright (c)  UPMC Sorbonne Universites
@@ -53 +53 @@
     pid_t       pid     = process->pid;
 
+#if (DEBUG_SYS_EXIT || CONFIG_INSTRUMENTATION_SYSCALLS)
+uint64_t     tm_start = hal_get_cycles();
+#endif
+
 #if DEBUG_SYS_EXIT
-uint64_t    tm_start;
-uint64_t    tm_end;
-tm_start = hal_get_cycles();
 if( DEBUG_SYS_EXIT < tm_start )
 printk("\n[%s] thread[%x,%x] enter / status %x / cycle %d\n",
-__FUNCTION__, process->pid, this->trdid , status , (uint32_t)tm_start );
+__FUNCTION__, pid, this->trdid , status , (uint32_t)tm_start );
 #endif
 
@@ -66 +67 @@
     owner_cxy = GET_CXY( owner_xp );
     owner_ptr = GET_PTR( owner_xp );
-
-#if (DEBUG_SYS_EXIT & 1)
-if( DEBUG_SYS_EXIT < tm_start )
-printk("\n[%s] thread[%x,%x] get owner process in cluster %x\n",
-__FUNCTION__, process->pid, this->trdid, owner_cxy );
-#endif
 
     // get local pointer on the main thread
@@ -80 +75 @@
     parent_cxy = GET_CXY( parent_xp );
     parent_ptr = GET_PTR( parent_xp );
-
-#if (DEBUG_SYS_EXIT & 1)
-if( DEBUG_SYS_EXIT < tm_start )
-printk("\n[%s] thread[%x,%x] get parent process in cluster %x\n",
-__FUNCTION__, process->pid, this->trdid, parent_cxy );
-#endif
 
     // get pointers on the parent process main thread
@@ -96 +85 @@
 #if( DEBUG_SYS_EXIT & 1)
 if( DEBUG_SYS_EXIT < tm_start )
-printk("\n[%s] thread[%x,%x] detached process from TXT\n",
-__FUNCTION__, process->pid, this->trdid );
+printk("\n[%s] thread[%x,%x] detached process %x from TXT\n",
+__FUNCTION__, pid, this->trdid, pid );
 #endif
 
     // mark for delete all process threads in all clusters, 
     // but the main thread and this calling thread 
-    process_sigaction( process->pid , DELETE_ALL_THREADS );
+    process_sigaction( pid , DELETE_ALL_THREADS );
 
 #if( DEBUG_SYS_EXIT & 1)
 if( DEBUG_SYS_EXIT < tm_start )
-printk("\n[%s] thread[%x,%x] deleted all threads but itself\n",
-__FUNCTION__, process->pid, this->trdid );
+printk("\n[%s] thread[%x,%x] deleted all threads in process %x (but itself)\n",
+__FUNCTION__, pid, this->trdid, pid );
 #endif
 
@@ -116 +105 @@
 #if( DEBUG_SYS_EXIT & 1)
 if( tm_start > DEBUG_SYS_EXIT )
-printk("\n[%u] thread[%x,%x] marked iself for delete\n",
-__FUNCTION__, process->pid, this->trdid );
+printk("\n[%s] thread[%x,%x] marked iself for delete\n",
+__FUNCTION__, pid, this->trdid );
 #endif
         thread_delete( XPTR( local_cxy , this ) , pid , true );
     }
 
-    // block this main thread 
+    // block the main thread 
     thread_block( XPTR( owner_cxy , main_ptr ) , THREAD_BLOCKED_GLOBAL );
 
 #if( DEBUG_SYS_EXIT & 1)
+trdid_t main_trdid = hal_remote_l32( XPTR( owner_cxy , &main_ptr->trdid ) );
 if( tm_start > DEBUG_SYS_EXIT )
-printk("\n[%s] thread[%x,%x] blocked main thread\n",
-__FUNCTION__, process->pid, this->trdid );
+printk("\n[%s] thread[%x,%x] blocked main thread[%x,%x]\n",
+__FUNCTION__, pid, this->trdid, pid, main_trdid );
 #endif
 
-    // atomically update owner process descriptor term_state to ask
-    // the parent process sys_wait() function to delete the main thread 
+    // update term_state in owner process descriptor to ask
+    // the parent process sys_wait() function to delete the process 
     term_state = (status & 0xFF) | PROCESS_TERM_EXIT;
     hal_remote_atomic_or( XPTR( owner_cxy , &owner_ptr->term_state ) , term_state );
@@ -139 +129 @@
 if( tm_start > DEBUG_SYS_EXIT )
 printk("\n[%s] thread[%x,%x] set exit status %x in owner process\n",
-__FUNCTION__, process->pid, this->trdid, term_state );
+__FUNCTION__, pid, this->trdid, term_state );
 #endif
 
@@ -148 +138 @@
 if( tm_start > DEBUG_SYS_EXIT )
 printk("\n[%s] thread[%x,%x] unblocked parent main thread in process %x\n",
-__FUNCTION__ , process->pid, this->trdid,
+__FUNCTION__ , pid, this->trdid,
 hal_remote_l32( XPTR( parent_cxy , &parent_ptr->pid) ) );
 #endif
@@ -154 +144 @@
     hal_fence();
 
+#if (DEBUG_SYS_EXIT || CONFIG_INSTRUMENTATION_SYSCALLS)
+uint64_t     tm_end = hal_get_cycles();
+#endif
+
 #if DEBUG_SYS_EXIT
-tm_end = hal_get_cycles();
 if( DEBUG_SYS_EXIT < tm_end )
-printk("\n[%s] thread[%x,%x] exit / status %x / cost = %d / cycle %d\n",
-__FUNCTION__, process->pid, this->trdid, status,
-(uint32_t)(tm_end - tm_start), (uint32_t)tm_end );
+printk("\n[%s] thread[%x,%x] exit / term_state %x / cycle %d\n",
+__FUNCTION__, pid, this->trdid, term_state,  (uint32_t)tm_end );
+#endif
+
+#if CONFIG_INSTRUMENTATION_SYSCALLS
+hal_atomic_add( &syscalls_cumul_cost[SYS_EXIT] , tm_end - tm_start );
+hal_atomic_add( &syscalls_occurences[SYS_EXIT] , 1 );
 #endif