Changeset 3458 for trunk/src/kash/shinstance.c

Timestamp:

Sep 14, 2020, 11:46:32 PM (5 years ago)

Author:

bird

Message:

kash: Use reference counting of parser output in threaded-mode.

File:

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

trunk/src/kash/shinstance.c

@@ -44 +44 @@
 #include "error.h"
 #include "memalloc.h"
+#include "nodes.h"
 #include "redir.h"
 #include "shell.h"
@@ -274 +275 @@
     unsigned left, i;
 
+    INTOFF;
+
     sh_int_unlink(psh);
-    shfile_uninit(&psh->fdtab);
+    shfile_uninit(&psh->fdtab, psh->tracefd);
     sh_free_string_vector(psh, &psh->shenviron);
 
@@ -328 +331 @@
     struct arglist      exparg;         /**< holds expanded arg list */
     char               *expdir;         /**< Used by expandmeta. */
-
-    /* exec.h */
-    const char         *pathopt;        /**< set by padvance */
-
-    /* exec.c */
-    struct tblentry    *cmdtable[CMDTABLESIZE];
-    int                 builtinloc/* = -1*/;    /**< index in path of %builtin, or -1 */
-
+#endif
+
+    /* exec.h/exec.c */
+    psh->pathopt = NULL;
+    for (i = 0; i < CMDTABLESIZE; i++)
+    {
+        struct tblentry *cur = psh->cmdtable[i];
+        if (cur)
+        {
+            do
+            {
+                struct tblentry *next = cur->next;
+                if (cur->cmdtype == CMDFUNCTION)
+                {
+                    freefunc(psh, cur->param.func);
+                    cur->param.func = NULL;
+                }
+                sh_free(psh, cur);
+                cur = next;
+            } while (cur);
+            psh->cmdtable[i] = NULL;
+        }
+    }
+
+#if 0
     /* input.h */
     int                 plinno/* = 1 */;/**< input line number */
@@ -382 +402 @@
     int                 sstrnleft;
     int                 herefd/* = -1 */;
-
-    /* memalloc.c */
-    struct stack_block  stackbase;
-    struct stack_block *stackp/* = &stackbase*/;
-    struct stackmark   *markp;
 
     /* myhistedit.h */
@@ -491 +506 @@
 #endif
 
-/** @todo finish this...   */
+    /*
+     * memalloc.c: Make sure we've gotten rid of all the stack memory.
+     */
+    if (psh->stackp != &psh->stackbase && psh->stackp)
+    {
+        struct stack_block *stackp = psh->stackp;
+        do
+        {
+            psh->stackp = stackp->prev;
+            sh_free(psh, stackp);
+        } while ((stackp = psh->stackp) != &psh->stackbase && stackp);
+    }
+#ifdef KASH_SEPARATE_PARSER_ALLOCATOR //bp msvcr100!_wassert
+    if (psh->pstack)
+    {
+        if (psh->pstacksize > 0)
+            pstackpop(psh, 0);
+        sh_free(psh, psh->pstack);
+        psh->pstack = NULL;
+    }
+#endif
+    psh->markp = NULL;
+
+
+    /*
+     * Finally get rid of tracefd and then free the shell:
+     */
+    shfile_uninit(&psh->fdtab, -1);
+
     memset(psh, 0, sizeof(*psh));
     sh_free(NULL, psh);
@@ -673 +716 @@
 {
     /*
+     * Make sure we can use TRACE/TRACE2 for logging here.
+     */
+#ifdef DEBUG
+    /* show.c */
+    psh->tracefd = inherit->tracefd;
+    /* options.c */
+    debug(psh) = debug(inherit);
+#endif
+
+    /*
      * Do the rest of the inheriting.
      */
@@ -743 +796 @@
     /* redir.c */
     subshellinitredir(psh, inherit);
-
-    /* show.c */
-    psh->tracefd = inherit->tracefd;
 
     /* trap.h / trap.c */ /** @todo we don't carry pendingsigs to the subshell, right? */
@@ -1663 +1713 @@
     {
         TRACE2((psh, "sh__exit: %u shells around, must wait...\n", g_num_shells));
-        shfile_uninit(&psh->fdtab);
+        shfile_uninit(&psh->fdtab, psh->tracefd);
         sh_int_unlink(psh);
         /** @todo    */