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

Timestamp:

Aug 2, 2018, 11:47:13 AM (6 years ago)

Author:

alain

Message:

This version modifies the exec syscall and fixes a large number of small bugs.
The version number has been updated (0.1)

File:

• trunk/kernel/syscalls/sys_exit.c (modified) (11 diffs)

trunk/kernel/syscalls/sys_exit.c

@@ -23 +23 @@
 
 #include <kernel_config.h>
-#include <hal_types.h>
+#include <hal_kernel_types.h>
 #include <hal_irqmask.h>
 #include <errno.h>
@@ -59 +59 @@
 tm_start = hal_get_cycles();
 if( DEBUG_SYS_EXIT < tm_start )
-printk("\n[DBG] %s : thread %x enter / process %x / status %x / cycle %d\n",
-__FUNCTION__ , this, pid , status , (uint32_t)tm_start );
+printk("\n[DBG] %s : thread %x in process %x enter / status %x / cycle %d\n",
+__FUNCTION__, this->trdid, process->pid , status , (uint32_t)tm_start );
 #endif
 
@@ -70 +70 @@
 #if (DEBUG_SYS_EXIT & 1)
 if( DEBUG_SYS_EXIT < tm_start )
-printk("\n[DBG] %s : thread %x get owner process %x in cluster %x\n",
-__FUNCTION__ , this, owner_ptr, owner_cxy );
+printk("\n[DBG] %s : thread %x in process %x get owner process %x in cluster %x\n",
+__FUNCTION__, this->trdid, process->pid, owner_ptr, owner_cxy );
 #endif
 
-    // get pointer on the process main thread
+    // get local pointer on the process main thread
     main_ptr  = hal_remote_lpt( XPTR( owner_cxy , &owner_ptr->th_tbl[0] ) );
 
@@ -84 +84 @@
 #if (DEBUG_SYS_EXIT & 1)
 if( DEBUG_SYS_EXIT < tm_start )
-printk("\n[DBG] %s : thread %x get parent process %x in cluster %x\n",
-__FUNCTION__ , this, parent_ptr, parent_cxy );
+printk("\n[DBG] %s : thread %x in process %x get parent process %x in cluster %x\n",
+__FUNCTION__, this->trdid, process->pid, parent_ptr, parent_cxy );
 #endif
 
@@ -99 +99 @@
 
 #if( DEBUG_SYS_EXIT & 1)
-if( tm_start > DEBUG_SYS_EXIT )
-printk("\n[DBG] %s : thread %x removed process %x from TXT list\n",
-__FUNCTION__ , this, pid );
+if( DEBUG_SYS_EXIT < tm_start )
+printk("\n[DBG] %s : thread %x in process %x detached process from TXT\n",
+__FUNCTION__, this->trdid, process->pid );
 #endif
 
@@ -107 +107 @@
     // but the main thread and this calling thread 
     hal_enable_irq( &save_sr );
-    process_sigaction( pid , DELETE_ALL_THREADS );
+    process_sigaction( process->pid , DELETE_ALL_THREADS );
     hal_restore_irq( save_sr );
 
 #if( DEBUG_SYS_EXIT & 1)
-if( tm_start > DEBUG_SYS_EXIT )
-printk("\n[DBG] %s : thread %x deleted threads for process %x\n",
-__FUNCTION__ , this, pid );
+if( DEBUG_SYS_EXIT < tm_start )
+printk("\n[DBG] %s : thread %x in process %x deleted all threads but itself\n",
+__FUNCTION__, this->trdid, process->pid );
 #endif
 
@@ -122 +122 @@
 #if( DEBUG_SYS_EXIT & 1)
 if( tm_start > DEBUG_SYS_EXIT )
-printk("\n[DBG] %s : calling thread %x marked iself for delete in process %x\n",
-__FUNCTION__ , this, pid );
+printk("\n[DBG] %s : thread %x in process %x marked iself for delete\n",
+__FUNCTION__, this->trdid, process->pid );
 #endif
         thread_delete( XPTR( local_cxy , this ) , pid , true );
@@ -133 +133 @@
 #if( DEBUG_SYS_EXIT & 1)
 if( tm_start > DEBUG_SYS_EXIT )
-printk("\n[DBG] %s : thread %x blocked main thread for process %x\n",
-__FUNCTION__, this , pid );
+printk("\n[DBG] %s : thread %x in process %x blocked main thread\n",
+__FUNCTION__, this->trdid, process->pid );
 #endif
 
@@ -144 +144 @@
 #if( DEBUG_SYS_EXIT & 1)
 if( tm_start > DEBUG_SYS_EXIT )
-printk("\n[DBG] %s : thread %x set exit status in process %x / term_state %x\n",
-__FUNCTION__ , this, pid, term_state );
+printk("\n[DBG] %s : thread %x in process %x set exit status %x in owner process\n",
+__FUNCTION__, this->trdid, process->pid, term_state );
 #endif
 
-    // take the children lock and unblock the parent process main thread 
+    // unblock the parent process main thread 
     remote_spinlock_lock( children_lock_xp );
     thread_unblock( parent_main_xp , THREAD_BLOCKED_WAIT );
@@ -155 +155 @@
 #if( DEBUG_SYS_EXIT & 1)
 if( tm_start > DEBUG_SYS_EXIT )
-printk("\n[DBG] %s : thread %x in cluster %x unblock parent main thread %x in cluster %x\n",
-__FUNCTION__ , this, local_cxy, parent_main_ptr, parent_cxy );
+printk("\n[DBG] %s : thread %x in process %x unblock parent main thread in process %x\n",
+__FUNCTION__ , this->trdid, process->pid,
+hal_remote_lw( XPTR( parent_cxy , &parent_ptr->pid) ) );
 #endif
 
@@ -164 +165 @@
 tm_end = hal_get_cycles();
 if( DEBUG_SYS_EXIT < tm_end )
-printk("\n[DBG] %s : thread %x exit / process %x / status %x / cost = %d / cycle %d\n",
-__FUNCTION__, this, pid, status, (uint32_t)(tm_end - tm_start), (uint32_t)tm_end );
+printk("\n[DBG] %s : thread %x in process %x exit / status %x / cost = %d / cycle %d\n",
+__FUNCTION__, this->trdid, process->pid, status,
+(uint32_t)(tm_end - tm_start), (uint32_t)tm_end );
 #endif