Changeset 566 for trunk/kernel/syscalls/sys_wait.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_wait.c (modified) (7 diffs)

trunk/kernel/syscalls/sys_wait.c

@@ -25 +25 @@
 #include <hal_uspace.h>
 #include <hal_irqmask.h>
+#include <remote_queuelock.h>
 #include <core.h>
 #include <thread.h>
@@ -95 +96 @@
     xptr_t children_lock_xp = XPTR( owner_cxy , &process->children_lock );
 
-    // exit this blocking loop only when a child processes change state
+    // exit this loop only when a child processes change state
     while( 1 )
     {
@@ -102 +103 @@
  
         // get lock protecting children list
-        remote_spinlock_lock( children_lock_xp );
+        remote_queuelock_acquire( children_lock_xp );
 
         // scan the list of child process
@@ -113 +114 @@
 
             // 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_pid    = hal_remote_l32 (XPTR( child_cxy , &child_ptr->pid ));
+            child_state  = hal_remote_l32 ( 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)
+#if (DEBUG_SYS_WAIT & 1)
 cycle = hal_get_cycles();
 if( DEBUG_SYS_WAIT < cycle )
@@ -130 +131 @@
                  ((child_state & PROCESS_TERM_WAIT) == 0) )
             {
-                // set the PROCESS_FLAG_WAIT in child process descriptor
+                // set the PROCESS_TERM_WAIT in child process descriptor
                 hal_remote_atomic_or( XPTR( child_cxy , &child_ptr->term_state ),
                                       PROCESS_TERM_WAIT );
@@ -140 +141 @@
 
                 // release lock protecting children list
-                remote_spinlock_unlock( children_lock_xp );
+                remote_queuelock_release( children_lock_xp );
 
 #if DEBUG_SYS_WAIT 
@@ -163 +164 @@
         }  // end loop on children
         
+        // we execute this code when no child terminated:
+        // - release the lock protecting children list,
+        // - block on the WAIT condition
+        // - deschedule to keep waiting in the while loop
+
+        // release lock protecting children list 
+        remote_queuelock_release( children_lock_xp );
+
         // block on WAIT condition
         thread_block( XPTR( local_cxy , this ) , THREAD_BLOCKED_WAIT );
-
-        // release lock protecting children list 
-        remote_spinlock_unlock( children_lock_xp );
 
 #if (DEBUG_SYS_WAIT & 1)