Changeset 3458 for trunk/src/kash/generated/nodes.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/generated/nodes.c (modified) (8 diffs)

trunk/src/kash/generated/nodes.c

@@ -51 +51 @@
 #include "shinstance.h"
 
+#ifndef KASH_SEPARATE_PARSER_ALLOCATOR
 
 size_t  funcblocksize;          /* size of structures in function */
@@ -93 +94 @@
 STATIC char *nodesavestr(char *);
 
+#endif /* !KASH_SEPARATE_PARSER_ALLOCATOR */
 
 
@@ -104 +106 @@
         union node *n;
 {
+#ifdef KASH_SEPARATE_PARSER_ALLOCATOR
+        if (n != NULL) {
+                unsigned refs = pstackretain(n->pblock);
+                TRACE2((psh, "copyfunc: %p - %u refs\n", n->pblock, refs)); K_NOREF(refs);
+        }
+        return n;
+#else
         if (n == NULL)
                 return NULL;
@@ -112 +121 @@
         funcstring = (char *) funcblock + funcblocksize;
         return copynode(n);
-}
-
-
+#endif
+}
+
+#ifndef KASH_SEPARATE_PARSER_ALLOCATOR
 
 STATIC void
@@ -274 +284 @@
       case NAPPEND:
             new->nfile.fname = copynode(n->nfile.fname);
+            new->nfile.next = copynode(n->nfile.next);
             new->nfile.fd = n->nfile.fd;
-            new->nfile.next = copynode(n->nfile.next);
             break;
       case NTOFD:
@@ -281 +291 @@
             new->ndup.vname = copynode(n->ndup.vname);
             new->ndup.dupfd = n->ndup.dupfd;
+            new->ndup.next = copynode(n->ndup.next);
             new->ndup.fd = n->ndup.fd;
-            new->ndup.next = copynode(n->ndup.next);
             break;
       case NHERE:
       case NXHERE:
             new->nhere.doc = copynode(n->nhere.doc);
+            new->nhere.next = copynode(n->nhere.next);
             new->nhere.fd = n->nhere.fd;
-            new->nhere.next = copynode(n->nhere.next);
             break;
       case NNOT:
@@ -335 +345 @@
 }
 
+#endif /* !KASH_SEPARATE_PARSER_ALLOCATOR */
 
 
@@ -343 +354 @@
 void
 freefunc(psh, n)
-    shinstance *psh;
+        shinstance *psh;
         union node *n;
 {
+#ifdef KASH_SEPARATE_PARSER_ALLOCATOR
+        if (n)
+                pstackrelease(psh, n->pblock, "freefunc");
+#else
         if (n)
                 ckfree(psh, n);
-}
+#endif
+}