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

Timestamp:

Feb 20, 2018, 5:32:17 PM (6 years ago)

Author:

alain

Message:

Fix a bad bug in scheduler...

File:

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

trunk/kernel/syscalls/sys_wait.c

@@ -24 +24 @@
 #include <hal_types.h>
 #include <hal_uspace.h>
+#include <hal_irqmask.h>
 #include <core.h>
 #include <thread.h>
@@ -42 +43 @@
     int         child_state;
     thread_t  * child_thread;
+    reg_t       save_sr;
 
     thread_t  * this    = CURRENT_THREAD;
@@ -61 +63 @@
         if( error )
         {
-        printk("\n[ERROR] in %s : status buffer unmapped for thread %x in process %x\n",
-        __FUNCTION__ , this->trdid , process->pid );
+
+#if CONFIG_DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : status buffer unmapped for thread %x in process %x\n",
+__FUNCTION__ , this->trdid , process->pid );
+#endif
         this->errno = EFAULT;
                 return -1;
@@ -85 +90 @@
     while( 1 )
     {
+        // enable IRQS
+        hal_enable_irq( &save_sr );
+ 
         // get lock protecting children list
         remote_spinlock_lock( children_lock_xp );
@@ -101 +109 @@
             // test if child process is terminated,
             // but termination not yet reported to parent process
-            if( ((child_state & PROCESS_FLAG_EXIT)   || 
-                 (child_state & PROCESS_FLAG_KILL)   ||
-                 (child_state & PROCESS_FLAG_BLOCK)) &&
-                 ((child_state & PROCESS_FLAG_WAIT) == 0) )
+            if( ((child_state & PROCESS_TERM_EXIT)  || 
+                 (child_state & PROCESS_TERM_KILL)  ||
+                 (child_state & PROCESS_TERM_STOP)) &&
+                 ((child_state & PROCESS_TERM_WAIT) == 0) )
             {
                 // get pointer on main thread and PID from child owner process
@@ -112 +120 @@
                 // set the PROCESS_FLAG_WAIT in owner child descriptor
                 hal_remote_atomic_or( XPTR( child_cxy , &child_ptr->term_state ),
-                                      PROCESS_FLAG_WAIT );
+                                      PROCESS_TERM_WAIT );
 
                 // set the THREAD_FLAG_REQ_DELETE in child main thread
@@ -118 +126 @@
                                             THREAD_FLAG_REQ_DELETE );
 
+                // release lock protecting children list
+                remote_spinlock_unlock( children_lock_xp );
+
 #if CONFIG_DEBUG_SYS_WAIT 
 tm_end = hal_get_cycles();
 if( CONFIG_DEBUG_SYS_WAIT < tm_end )
-printk("\n[DBG] %s : thread %x exit / process %x / cycle %d\n",
-__FUNCTION__, this, process->pid, (uint32_t)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 );
 #endif
-
                  // return relevant info to calling parent process 
                  hal_copy_to_uspace( status , &child_state , sizeof(int) );
@@ -131 +141 @@
         }
         
-        // release lock
+        // release lock protecting children list 
         remote_spinlock_unlock( children_lock_xp );
 
         // deschedule without blocking
         sched_yield( "parent wait children termination" );
-    }
+
+    }  // end while
 
     // never executed