Changeset 2290 for trunk/src/kash/memalloc.c

Timestamp:

Feb 27, 2009, 5:08:07 AM (16 years ago)

Author:

bird

Message:

kash: malloc/free/friends gets a psh.

File:

• trunk/src/kash/memalloc.c (modified) (6 diffs)

trunk/src/kash/memalloc.c

@@ -56 +56 @@
 
 pointer
-ckmalloc(size_t nbytes)
+ckmalloc(shinstance *psh, size_t nbytes)
 {
         pointer p;
 
-        p = malloc(nbytes);
+        p = sh_malloc(psh, nbytes);
         if (p == NULL)
-                error(NULL, "Out of space");
+                error(psh, "Out of space");
         return p;
 }
@@ -72 +72 @@
 
 pointer
-ckrealloc(pointer p, size_t nbytes)
-{
-        p = realloc(p, nbytes);
+ckrealloc(struct shinstance *psh, pointer p, size_t nbytes)
+{
+        p = sh_realloc(psh, p, nbytes);
         if (p == NULL)
-                error(NULL, "Out of space");
+                error(psh, "Out of space");
         return p;
 }
@@ -86 +86 @@
 
 char *
-savestr(const char *s)
+savestr(struct shinstance *psh, const char *s)
 {
         char *p;
-
-        p = ckmalloc(strlen(s) + 1);
-        scopy(s, p);
+    size_t len = strlen(s);
+
+        p = ckmalloc(psh, len + 1);
+        memcpy(p, s, len + 1);
         return p;
 }
@@ -134 +135 @@
                         blocksize = MINSIZE;
                 INTOFF;
-                sp = ckmalloc(sizeof(struct stack_block) - MINSIZE + blocksize);
+                sp = ckmalloc(psh, sizeof(struct stack_block) - MINSIZE + blocksize);
                 sp->prev = psh->stackp;
                 psh->stacknxt = sp->space;
@@ -182 +183 @@
                 sp = psh->stackp;
                 psh->stackp = sp->prev;
-                ckfree(sp);
+                ckfree(psh, sp);
         }
         psh->stacknxt = mark->stacknxt;
@@ -214 +215 @@
                 sp = psh->stackp;
                 psh->stackp = sp->prev;
-                sp = ckrealloc((pointer)sp,
+                sp = ckrealloc(psh, (pointer)sp,
                     sizeof(struct stack_block) - MINSIZE + newlen);
                 sp->prev = psh->stackp;