Changeset 3457 for trunk/src/kash/memalloc.h

Timestamp:

Sep 14, 2020, 7:34:28 PM (5 years ago)

Author:

bird

Message:

kash: New parser allocator for non-forked-mode.

File:

• trunk/src/kash/memalloc.h (modified) (3 diffs)

trunk/src/kash/memalloc.h

@@ -39 +39 @@
         char *stacknxt;
         int stacknleft;
+#ifdef KASH_SEPARATE_PARSER_ALLOCATOR
+        unsigned pstacksize;
+#endif
         struct stackmark *marknext;
 };
@@ -84 +87 @@
  * subshells by simple reference counting.
  * @{ */
+#ifdef KASH_SEPARATE_PARSER_ALLOCATOR
+struct pstack_block;
+unsigned pstackretain(struct pstack_block *);
+unsigned pstackrelease(struct shinstance *, struct pstack_block *);
+struct pstack_block *pstackpush(struct shinstance *);
+#endif
 void *pstalloc(struct shinstance *, size_t);
 union node;
@@ -90 +99 @@
 struct nodelist *pstalloclist(struct shinstance *);
 char *pstsavestr(struct shinstance *, const char *); /* was: stsavestr */
-#define PSTARTSTACKSTR(psh, p)      do { (p) = (psh)->stacknxt; (psh)->sstrnleft = (psh)->stacknleft; } while (0)
 char *pstmakestrspace(struct shinstance *, size_t, char *); /* was: makestrspace / growstackstr */
-#define PSTCHECKSTRSPACE(psh, n, p) do { if ((psh)->sstrnleft >= (n)) {/*likely*/} \
+char *pstputcgrow(struct shinstance *, char *, char);
+char *pstgrabstr(struct shinstance *, char *); /* was: grabstackstr / grabstackblock*/
+#ifdef KASH_SEPARATE_PARSER_ALLOCATOR
+# define PSTBLOCK(psh)               ((psh)->curpstack->nextbyte)
+# define PSTARTSTACKSTR(psh, p) do { \
+        pstack_block *pstmacro = (psh)->curpstack; \
+        pstmacro->strleft = pstmacro->avail; \
+        (p) = pstmacro->nextbyte; \
+    } while (0)
+# define PSTCHECKSTRSPACE(psh, n, p) do { \
+        if ((psh)->curpstack->strleft >= (n)) {/*likely*/} \
+        else { (p) = pstmakestrspace(psh, (n), (p)); assert((psh)->curpstack->strleft >= (n)); } \
+    } while (0)
+# define PSTUPUTC(psh, c, p) do { \
+        assert((psh)->curpstack->strleft > 0); \
+        (psh)->curpstack->strleft -= 1; \
+        *(p)++ = (c); \
+    } while (0)
+# define PSTPUTC(psh, c, p) do { \
+        if ((ssize_t)--(psh)->curpstack->strleft >= 0) *(p)++ = (c); \
+        else (p) = pstputcgrow(psh, (p), (c)); \
+    } while (0)
+# define PSTPUTSTRN(psh, str, n, p) do { \
+        pstack_block *pstmacro = (psh)->curpstack; \
+        if (pstmacro->strleft >= (n)) {/*likely?*/} \
+        else (p) = pstmakestrspace(psh, (n), (p)); \
+        pstmacro->strleft -= (n); \
+        memcpy((p), (str), (n)); \
+        (p) += (n); \
+    } while (0)
+#else
+# define PSTBLOCK(psh)               ((psh)->stacknxt)
+# define PSTARTSTACKSTR(psh, p)      do { (p) = (psh)->stacknxt; (psh)->sstrnleft = (psh)->stacknleft; } while (0)
+# define PSTCHECKSTRSPACE(psh, n, p) do { if ((psh)->sstrnleft >= (n)) {/*likely*/} \
                                          else { (p) = pstmakestrspace(psh, (n), (p)); assert((psh)->sstrnleft >= (n)); } } while (0)
-#define PSTUPUTC(psh, c, p)         do { assert((psh)->sstrnleft > 0); --(psh)->sstrnleft; *(p)++ = (c); } while (0)
-char *pstputcgrow(struct shinstance *, char *, char);
-#define PSTPUTC(psh, c, p)          do { if (--(psh)->sstrnleft >= 0) *(p)++ = (c); else (p) = pstputcgrow(psh, (p), (c)); } while (0)
-#define PSTPUTSTRN(psh, str, n, p)  do { if ((psh)->sstrnleft >= (n)) {/*likely?*/} else (p) = pstmakestrspace(psh, (n), (p)); \
+# define PSTUPUTC(psh, c, p)         do { assert((psh)->sstrnleft > 0); --(psh)->sstrnleft; *(p)++ = (c); } while (0)
+# define PSTPUTC(psh, c, p)          do { if (--(psh)->sstrnleft >= 0) *(p)++ = (c); else (p) = pstputcgrow(psh, (p), (c)); } while (0)
+# define PSTPUTSTRN(psh, str, n, p)  do { if ((psh)->sstrnleft >= (n)) {/*likely?*/} else (p) = pstmakestrspace(psh, (n), (p)); \
                                          memcpy((p), (str), (n)); (psh)->sstrnleft -= (n); (p) += (n); } while (0)
-#define PSTBLOCK(psh)               ((psh)->stacknxt)
-char *pstgrabstr(struct shinstance *, char *); /* was: grabstackstr / grabstackblock*/
+#endif
 /** @} */