Changeset 3464 for trunk/src

Timestamp:

Sep 15, 2020, 9:44:11 PM (5 years ago)

Author:

bird

Message:

kash: Try signal subshell completion as early as possible in all cases.

File:

• trunk/src/kash/shinstance.c (modified) (7 diffs)

trunk/src/kash/shinstance.c

@@ -1507 +1507 @@
 }
 
+/**
+ * If we have a subshell status structure, signal and release it.
+ */
+static void shsubshellstatus_signal_and_release(shinstance *psh, int iExit)
+{
+    shsubshellstatus *sts = psh->subshellstatus;
+    if (sts)
+    {
+        BOOL rc;
+        HANDLE hThread;
+
+        sts->status = W_EXITCODE(iExit, 0);
+        sts->done   = K_TRUE;
+        rc = SetEvent((HANDLE)sts->towaiton); assert(rc); K_NOREF(rc);
+
+        hThread = (HANDLE)sts->hThread;
+        sts->hThread = 0;
+        rc = CloseHandle(hThread); assert(rc);
+
+        shsubshellstatus_release(psh, sts);
+        psh->subshellstatus = NULL;
+    }
+}
+
+
 #endif /* !SH_FORKED_MODE */
 
@@ -1593 +1618 @@
     shinstance * volatile volpsh = (shinstance *)user;
     shinstance *psh = (shinstance *)user;
-    shsubshellstatus *sts;
     struct jmploc exitjmp;
     int iExit;
@@ -1625 +1649 @@
 
     /* Signal parent. */
-    sts = psh->subshellstatus;
-    if (sts)
-    {
-        BOOL rc;
-        HANDLE hThread;
-
-        sts->status = W_EXITCODE(iExit, 0);
-        sts->done   = K_TRUE;
-        rc = SetEvent((HANDLE)sts->towaiton); assert(rc); K_NOREF(rc);
-
-        hThread = (HANDLE)sts->hThread;
-        sts->hThread = 0;
-        rc = CloseHandle(hThread); assert(rc);
-
-        shsubshellstatus_release(psh, sts);
-        psh->subshellstatus = NULL;
-    }
+    shsubshellstatus_signal_and_release(psh, iExit);
 
     /* destroy the shell instance and exit the thread. */
@@ -1842 +1850 @@
 }
 
-SH_NORETURN_1 void sh__exit(shinstance *psh, int rc)
-{
-    TRACE2((psh, "sh__exit(%d)\n", rc));
+SH_NORETURN_1 void sh__exit(shinstance *psh, int iExit)
+{
+    TRACE2((psh, "sh__exit(%d)\n", iExit));
 
 #if defined(SH_FORKED_MODE)
-    _exit(rc);
+    _exit(iExit);
     (void)psh;
 
 #else
-    psh->exitstatus = rc;
+    psh->exitstatus = iExit;
 
     /*
@@ -1858 +1866 @@
     if (psh->thread)
     {
+        shsubshellstatus_signal_and_release(psh, iExit);
         if (psh->exitjmp)
-            longjmp(psh->exitjmp->loc, !rc ? SH_EXIT_ZERO : rc);
+            longjmp(psh->exitjmp->loc, !iExit ? SH_EXIT_ZERO : iExit);
         else
         {
             static char const s_msg[] = "fatal error in sh__exit: exitjmp is NULL!\n";
             shfile_write(&psh->fdtab, 2, s_msg, sizeof(s_msg) - 1);
-            _exit(rc);
+            _exit(iExit);
         }
     }
@@ -1882 +1891 @@
     }
 
-    _exit(rc);
+    _exit(iExit);
 #endif
 }
@@ -2113 +2122 @@
                 {
 #ifndef SH_FORKED_MODE
-                    /** @todo signal the end of this subshell now, we can do the cleaning up
-                     *        after the parent shell has resumed. */
+                    shsubshellstatus_signal_and_release(psh, (int)dwExitCode);
 #endif
                     CloseHandle(ProcInfo.hProcess);