Changeset 3458 for trunk/src/kash/nodes.c.pat

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/nodes.c.pat (modified) (6 diffs)

trunk/src/kash/nodes.c.pat

@@ -47 +47 @@
 #include "shinstance.h"
 
+#ifndef KASH_SEPARATE_PARSER_ALLOCATOR
 
 size_t  funcblocksize;          /* size of structures in function */
@@ -62 +63 @@
 STATIC char *nodesavestr(char *);
 
+#endif /* !KASH_SEPARATE_PARSER_ALLOCATOR */
 
 
@@ -73 +75 @@
         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;
@@ -81 +90 @@
         funcstring = (char *) funcblock + funcblocksize;
         return copynode(n);
+#endif
 }
 
-
+#ifndef KASH_SEPARATE_PARSER_ALLOCATOR
 
 STATIC void
@@ -154 +164 @@
 }
 
+#endif /* !KASH_SEPARATE_PARSER_ALLOCATOR */
 
 
@@ -165 +176 @@
         union node *n;
 {
+#ifdef KASH_SEPARATE_PARSER_ALLOCATOR
+        if (n)
+                pstackrelease(psh, n->pblock, "freefunc");
+#else
         if (n)
                 ckfree(psh, n);
+#endif
 }