Changeset 3438 for trunk/src/kash/eval.c

Timestamp:

Sep 9, 2020, 10:01:39 PM (5 years ago)

Author:

bird

Message:

kash: Hammering on threaded mode.

File:

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

trunk/src/kash/eval.c

@@ -225 +225 @@
         psh->displayhist = 1;   /* show history substitutions done with fc */
 #endif
-        TRACE((psh, "pid %d, evaltree(%p: %d, %d) called\n",
+        TRACE((psh, "pid %" SHPID_PRI ", evaltree(%p: %d, %d) called\n",
                sh_getpid(psh), n, n->type, flags));
         switch (n->type) {
@@ -458 +458 @@
                 args.backgnd = backgnd;
                 forkshell2(psh, jp, n, backgnd ? FORK_BG : FORK_FG,
-                           evalsubshell_child, n, &args, sizeof(args), NULL);
+                           evalsubshell_child, n, &args, sizeof(args), NULL);
         }
 #else
@@ -578 +578 @@
                         args.pip[1] = pip[1];
                         forkshell2(psh, jp, lp->n, n->npipe.backgnd ? FORK_BG : FORK_FG,
-                                   evalpipe_child, lp->n, &args, sizeof(args), NULL);
+                                   evalpipe_child, lp->n, &args, sizeof(args), NULL);
                 }
 #else
@@ -677 +677 @@
                         args.pip[1] = pip[1];
                         forkshell2(psh, jp, n, FORK_NOJOB,
-                                   evalbackcmd_child, n, &args, sizeof(args), NULL);
+                                   evalbackcmd_child, n, &args, sizeof(args), NULL);
                 }
 #else
@@ -894 +894 @@
                         volatile int temp_path = 0;
                         char *volatile savecmdname;
+                        int volatile savecmdnamemalloc;
                         volatile int e;
                         int mode;
@@ -909 +910 @@
                         savehandler = psh->handler;
                         savecmdname = psh->commandname;
+                        savecmdnamemalloc = psh->commandnamemalloc;
                         psh->handler = &jmploc;
                         if (!setjmp(jmploc.loc)) {
@@ -930 +932 @@
                                 listsetvar(psh, args->varlist.list,
                                         args->cmdentry.cmdtype == CMDSPLBLTIN ? 0 : VNOSET);
+                                psh->commandnamemalloc = 0;
                                 psh->commandname = args->argv[0];
                                 /* initialize nextopt */
@@ -962 +965 @@
                         if (e != EXSHELLPROC) {
                                 psh->commandname = savecmdname;
+                                psh->commandnamemalloc = savecmdnamemalloc;
                                 if (args->flags & EV_EXIT)
                                         exitshell(psh, psh->exitstatus);
                         }
+                        if (savecmdnamemalloc)
+                                sh_free(psh, savecmdname);
                         if (e != -1) {
                                 if ((e != EXERROR && e != EXEXEC)