Changeset 446 for trunk/kernel/syscalls/sys_wait.c

Timestamp:

Jun 19, 2018, 5:12:57 PM (6 years ago)

Author:

alain

Message:

miscelaneous...

File:

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

trunk/kernel/syscalls/sys_wait.c

@@ -41 +41 @@
     cxy_t       child_cxy;
     pid_t       child_pid;
-    int         child_state;
+    uint32_t    child_state;
     thread_t  * child_thread;
     reg_t       save_sr;
@@ -50 +50 @@
 
 #if DEBUG_SYS_WAIT
-uint64_t    tm_start;
-uint64_t    tm_end;
-tm_start = hal_get_cycles();
-if( DEBUG_SYS_WAIT < tm_start )
-printk("\n[DBG] %s : thread %x enter / process %x / cycle %d\n",
-__FUNCTION__, this, process->pid, (uint32_t)tm_start );
+uint64_t    cycle = hal_get_cycles();
+if( DEBUG_SYS_WAIT < cycle )
+printk("\n[DBG] %s : thread %x in process %x enter / cycle %d\n",
+__FUNCTION__, this, process->pid, (uint32_t)cycle );
 #endif
 
@@ -83 +81 @@
     {
 
-#if DEBUG_SYSCALL_ERROR
+#if DEBUG_SYSCALLS_ERROR
 printk("\n[ERROR] in %s : calling thread %x is not thread 0 in owner cluster %x\n",
 __FUNCTION__ , trdid , owner_cxy );
@@ -112 +110 @@
             child_cxy = GET_CXY( child_xp );
 
-            // get term_state from child owner process
-            child_state = (int)hal_remote_lw ( XPTR(child_cxy,&child_ptr->term_state));
+            // get PID, term_state, and main thread from child process
+            child_pid    = hal_remote_lw (XPTR( child_cxy , &child_ptr->pid ));
+            child_state  = hal_remote_lw ( XPTR(child_cxy , &child_ptr->term_state ) );
+            child_thread = hal_remote_lpt(XPTR( child_cxy , &child_ptr->th_tbl[0] ));
 
+#if (DEBUG_SYS_WAIT &1)
+cycle = hal_get_cycles();
+if( DEBUG_SYS_WAIT < cycle )
+printk("\n[DBG] %s : thread %x in process %x check child %x / state %x\n",
+__FUNCTION__, this, process->pid, child_pid, child_state );
+#endif
             // test if this child process is terminated,
             // but termination not yet reported to parent process
@@ -122 +128 @@
                  ((child_state & PROCESS_TERM_WAIT) == 0) )
             {
-                // get pointer on child main thread and PID from child owner process
-                child_pid    = (pid_t)     hal_remote_lw (XPTR( child_cxy , &child_ptr->pid ));
-                child_thread = (thread_t *)hal_remote_lpt(XPTR( child_cxy ,
-                                                                &child_ptr->th_tbl[0] ));
-
-                // set the PROCESS_FLAG_WAIT in owner child process descriptor
+                // set the PROCESS_FLAG_WAIT in child process descriptor
                 hal_remote_atomic_or( XPTR( child_cxy , &child_ptr->term_state ),
                                       PROCESS_TERM_WAIT );
 
-                // set the THREAD_FLAG_REQ_DELETE in child main thread
+                // set the THREAD_FLAG_REQ_DELETE in main thread if kill or exit
+                if((child_state & PROCESS_TERM_EXIT) || (child_state & PROCESS_TERM_KILL))
                 hal_remote_atomic_or( XPTR( child_cxy , &child_thread->flags ) ,
                                             THREAD_FLAG_REQ_DELETE );
@@ -139 +141 @@
 
 #if DEBUG_SYS_WAIT 
-tm_end = hal_get_cycles();
-if( DEBUG_SYS_WAIT < tm_end )
-printk("\n[DBG] %s : thread %x exit / parent %x / child %x / cycle %d\n",
-__FUNCTION__, this, process->pid, child_pid, (uint32_t)tm_end );
+cycle = hal_get_cycles();
+if( DEBUG_SYS_WAIT < cycle )
+{
+    if     ( child_state & PROCESS_TERM_EXIT )
+        printk("\n[DBG] %s : thread %x in process %x exit / child %x exit / cycle %d\n",
+        __FUNCTION__, this, process->pid, child_pid, (uint32_t)cycle );
+    if( child_state & PROCESS_TERM_KILL )
+        printk("\n[DBG] %s : thread %x in process %x exit / child %x killed / cycle %d\n",
+        __FUNCTION__, this, process->pid, child_pid, (uint32_t)cycle );
+    if( child_state & PROCESS_TERM_STOP )
+        printk("\n[DBG] %s : thread %x in process %x exit / child %x stopped / cycle %d\n",
+        __FUNCTION__, this, process->pid, child_pid, (uint32_t)cycle );
+}
 #endif
                  // return child termination state  to parent process 
@@ -150 +161 @@
         }  // end loop on children
         
+        // block on WAIT condition
+        thread_block( XPTR( local_cxy , this ) , THREAD_BLOCKED_WAIT );
+
         // release lock protecting children list 
         remote_spinlock_unlock( children_lock_xp );
 
-        // deschedule without blocking
-        sched_yield( "parent wait children termination" );
+#if (DEBUG_SYS_WAIT & 1)
+cycle = hal_get_cycles();
+if( DEBUG_SYS_WAIT < cycle )
+printk("\n[DBG] %s : thread %x in process %x block & deschedule / cycle %d\n",
+__FUNCTION__, this, process->pid, (uint32_t)cycle );
+#endif
+
+        // deschedule
+        sched_yield( "parent process wait children processes termination" );
+
+#if (DEBUG_SYS_WAIT & 1) 
+cycle = hal_get_cycles();
+if( DEBUG_SYS_WAIT < cycle )
+printk("\n[DBG] %s : thread %x in process %x unblock & resume / cycle %d\n",
+__FUNCTION__, this, process->pid, (uint32_t)cycle );
+#endif
 
     }  // end while