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

Timestamp:

Mar 7, 2018, 9:02:03 AM (6 years ago)

Author:

alain

Message:

1) improve the threads and process destruction mechanism.
2) introduce FIFOs in the soclib_tty driver.

File:

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

trunk/kernel/syscalls/sys_wait.c

@@ -68 +68 @@
 __FUNCTION__ , this->trdid , process->pid );
 #endif
-        this->errno = EFAULT;
+        this->errno = EINVAL;
                 return -1;
         }
 
-    // get process owner cluster 
-    cxy_t owner_cxy = CXY_FROM_PID( pid );
+    // get process owner cluster and calling thread trdid
+    cxy_t   owner_cxy = CXY_FROM_PID( pid );
+    trdid_t trdid     = this->trdid;
 
-    // This function must be executed in owner cluster
-    assert( (owner_cxy == local_cxy) , __FUNCTION__ , 
-    "calling thread must execute in owner cluster" );
+    // wait must be executed by the main thread
+    if( (owner_cxy != local_cxy) || (LTID_FROM_TRDID(trdid) != 0) )
+    {
 
-    // This function must be executed by the main thread
-    assert( (process->th_tbl[0] == this) , __FUNCTION__ ,
-    "this function must be executed by the main thread" );
-   
+#if CONFIG_DEBUG_SYSCALL_ERROR
+printk("\n[ERROR] in %s : calling thread %x is not thread 0 in owner cluster %x\n",
+__FUNCTION__ , trdid , owner_cxy );
+#endif
+        this->errno = EINVAL;
+                return -1;
+        }
+
     // get extended pointer on children list root and lock
     xptr_t children_root_xp = XPTR( owner_cxy , &process->children_root );
@@ -96 +101 @@
         remote_spinlock_lock( children_lock_xp );
 
-        // scan the list of owner child process
+        // scan the list of child process
         XLIST_FOREACH( children_root_xp , iter_xp )
         {
@@ -115 +120 @@
             {
                 // get pointer on 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]));
+                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 descriptor
@@ -135 +141 @@
 __FUNCTION__, this, process->pid, child_pid, (uint32_t)tm_end );
 #endif
-                 // return relevant info to calling parent process 
+                 // return child termination state  to parent process 
                  hal_copy_to_uspace( status , &child_state , sizeof(int) );
                  return child_pid;
             }
-        }
+        }  // end loop on children
         
         // release lock protecting children list