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

Timestamp:

Sep 2, 2020, 7:25:31 PM (5 years ago)

Author:

bird

Message:

kash: refactoring forkshell(); simple stuff.

File:

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

trunk/src/kash/eval.c

@@ -413 +413 @@
 
 
+#ifdef KASH_USE_FORKSHELL2
+/*
+ * Child of evalsubshell.
+ */
+struct evalsubshellchild
+{
+    int flags;
+    int backgnd;
+};
+
+static int evalsubshell_child(shinstance *psh, union node *n, void *argp)
+{
+    struct evalsubshellchild args = *(struct evalsubshellchild *)argp;
+
+    INTON;
+    if (args.backgnd)
+            args.flags &=~ EV_TESTED;
+    redirect(psh, n->nredir.redirect, 0);
+    /* never returns */
+    evaltree(psh, n->nredir.n, args.flags | EV_EXIT);
+    /** @todo make us return here. */
+    return 0;
+}
+#endif /* KASH_USE_FORKSHELL2 */
+
 
 /*
@@ -427 +452 @@
         INTOFF;
         jp = makejob(psh, n, 1);
+#ifdef KASH_USE_FORKSHELL2
+        {
+                struct evalsubshellchild args;
+                args.flags = flags;
+                args.backgnd = backgnd;
+                forkshell2(psh, jp, n, backgnd ? FORK_BG : FORK_FG,
+                           evalsubshell_child, n, &args, sizeof(args));
+        }
+#else
         if (forkshell(psh, jp, n, backgnd ? FORK_BG : FORK_FG) == 0) {
                 INTON;
@@ -435 +469 @@
                 evaltree(psh, n->nredir.n, flags | EV_EXIT);
         }
+#endif
         if (! backgnd)
                 psh->exitstatus = waitforjob(psh, jp);
@@ -475 +510 @@
 
 
+#ifdef KASH_USE_FORKSHELL2
+/*
+ * Child of evalpipe.
+ */
+struct evalpipechild
+{
+        int prevfd;
+        int pip[2];
+};
+
+static int evalpipe_child(shinstance *psh, union node *n, void *argp)
+{
+        struct evalpipechild args = *(struct evalpipechild *)argp;
+
+        if (args.prevfd > 0) {
+                movefd(psh, args.prevfd, 0);
+        }
+        if (args.pip[1] >= 0) {
+                shfile_close(&psh->fdtab, args.pip[0]);
+                if (args.pip[1] != 1) {
+                        movefd(psh, args.pip[1], 1);
+                }
+        }
+        evaltree(psh, n, EV_EXIT);
+        /** @todo make it return thru here. */
+        return 0;
+}
+#endif /* KASH_USE_FORKSHELL2 */
 
 /*
@@ -508 +571 @@
                         }
                 }
+#ifdef KASH_USE_FORKSHELL2
+                {
+                        struct evalpipechild args;
+                        args.prevfd = prevfd;
+                        args.pip[0] = pip[0];
+                        args.pip[1] = pip[1];
+                        forkshell2(psh, jp, lp->n, n->npipe.backgnd ? FORK_BG : FORK_FG,
+                                   evalpipe_child, lp->n, &args, sizeof(args));
+                }
+#else
                 if (forkshell(psh, jp, lp->n, n->npipe.backgnd ? FORK_BG : FORK_FG) == 0) {
                         INTON;
@@ -521 +594 @@
                         evaltree(psh, lp->n, EV_EXIT);
                 }
+#endif
                 if (prevfd >= 0)
                         shfile_close(&psh->fdtab, prevfd);
@@ -533 +607 @@
 }
 
-
+#ifdef KASH_USE_FORKSHELL2
+/*
+ * evalbackcmd child.
+ */
+struct evalbackcmdchild
+{
+        int pip[2];
+};
+
+static int evalbackcmd_child(shinstance *psh, union node *n, void *argp)
+{
+        struct evalbackcmdchild args = *(struct evalbackcmdchild *)argp;
+
+        FORCEINTON;
+        shfile_close(&psh->fdtab, args.pip[0]);
+        if (args.pip[1] != 1) {
+                movefd(psh, args.pip[1], 1);
+        }
+        eflag(psh) = 0;
+        evaltree(psh, n, EV_EXIT);
+        /* NOTREACHED */ /** @todo make it return here to simplify thread handling (no need for setjmp). */
+        return 0;
+}
+#endif /* KASH_USE_FORKSHELL2 */
 
 /*
@@ -574 +671 @@
                         error(psh, "Pipe call failed");
                 jp = makejob(psh, n, 1);
+#ifdef KASH_USE_FORKSHELL2
+                {
+                        struct evalbackcmdchild args;
+                        args.pip[0] = pip[0];
+                        args.pip[1] = pip[1];
+                        forkshell2(psh, jp, n, FORK_NOJOB,
+                                   evalbackcmd_child, n, &args, sizeof(args));
+                }
+#else
                 if (forkshell(psh, jp, n, FORK_NOJOB) == 0) {
                         FORCEINTON;
@@ -584 +690 @@
                         /* NOTREACHED */
                 }
+#endif
                 shfile_close(&psh->fdtab, pip[1]);
                 result->fd = pip[0];