Changeset 3460 in kBuild for trunk/src/kash/shinstance.h

Timestamp:

Sep 15, 2020 12:31:01 PM (5 years ago)

Author:

bird

Message:

kash: Use event semaphores to signal parent shell early before the subshell thread has performed cleanups.

File:

• trunk/src/kash/shinstance.h (modified) (4 diffs)

trunk/src/kash/shinstance.h

@@ -64 +64 @@
 #endif
 
+#ifndef SH_FORKED_MODE
+/**
+ * Subshell status.
+ */
+typedef struct shsubshellstatus
+{
+    unsigned volatile   refs;           /**< Reference counter. */
+    int volatile        status;         /**< The exit code. */
+    KBOOL volatile      done;           /**< Set if done (valid exit code). */
+    void               *towaiton;       /**< Event semaphore / whatever to wait on. */
+# if K_OS == K_OS_WINDOWS
+    uintptr_t volatile  hThread;        /**< The thread handle (child closes this). */
+# endif
+    struct shsubshellstatus *next;      /**< Next free one on the free chain. */
+} shsubshellstatus;
+#endif
+
 /**
  * A child process.
@@ -69 +86 @@
 typedef struct shchild
 {
-    shpid       pid;                    /**< The pid. */
+    shpid               pid;            /**< The pid. */
 #if K_OS == K_OS_WINDOWS
-    void       *hChild;                 /**< The process handle. */
+    void               *hChild;         /**< The handle to wait on. */
 #endif
 #ifndef SH_FORKED_MODE
-    KBOOL       fProcess;               /**< Set if process, clear if internal thread. */
+    shsubshellstatus   *subshellstatus; /**< Pointer to the subshell status structure.  NULL if child process. */
 #endif
 } shchild;
@@ -215 +232 @@
     void               *threadarg;      /**< The thread argument. */
     struct jmploc      *exitjmp;        /**< Long jump target in sh_thread_wrapper for use by sh__exit. */
+    shsubshellstatus   *subshellstatus; /**< Pointer to the subshell status structure (NULL if root). */
 #endif
 
@@ -496 +514 @@
 
 /* wait / process */
-int sh_add_child(shinstance *psh, shpid pid, void *hChild, KBOOL fProcess);
+int sh_add_child(shinstance *psh, shpid pid, void *hChild, shsubshellstatus *sts);
 #ifdef _MSC_VER
 #   include <process.h>