[svn:parrot] r44207 - branches/sys_mem_reduce/src/string

bacek at svn.parrot.org bacek at svn.parrot.org
Fri Feb 19 22:44:35 UTC 2010


Author: bacek
Date: Fri Feb 19 22:44:35 2010
New Revision: 44207
URL: https://trac.parrot.org/parrot/changeset/44207

Log:
Switch string API to use internal allocations. Unfortunately Parrot_str_free_cstring doesn't accept PARROT_INTERP...

Modified:
   branches/sys_mem_reduce/src/string/api.c

Modified: branches/sys_mem_reduce/src/string/api.c
==============================================================================
--- branches/sys_mem_reduce/src/string/api.c	Fri Feb 19 22:44:13 2010	(r44206)
+++ branches/sys_mem_reduce/src/string/api.c	Fri Feb 19 22:44:35 2010	(r44207)
@@ -335,7 +335,7 @@
     ASSERT_ARGS(Parrot_str_finish)
     /* all are shared between interpreters */
     if (!interp->parent_interpreter) {
-        mem_sys_free(interp->const_cstring_table);
+        mem_internal_free(interp->const_cstring_table);
         interp->const_cstring_table = NULL;
         Parrot_charsets_encodings_deinit(interp);
         parrot_hash_destroy(interp, interp->const_cstring_hash);
@@ -2495,7 +2495,7 @@
     if (!s)
         return NULL;
     else {
-        char * const p = (char *)mem_sys_allocate(s->bufused + 1);
+        char * const p = (char*)mem_internal_allocate(s->bufused + 1);
         memcpy(p, s->strstart, s->bufused);
         p[s->bufused] = '\0';
         return p;
@@ -2521,7 +2521,7 @@
 Parrot_str_free_cstring(ARGIN_NULLOK(char *p))
 {
     ASSERT_ARGS(Parrot_str_free_cstring)
-    mem_sys_free((void *)p);
+    mem_internal_free((void *)p);
 }
 
 
@@ -2550,7 +2550,7 @@
     Parrot_str_write_COW(interp, s);
 
     size   = Buffer_buflen(s);
-    memory = (char *)mem_sys_allocate(size);
+    memory = (char *)mem_internal_allocate(size);
 
     mem_sys_memcopy(memory, Buffer_bufstart(s), size);
     Buffer_bufstart(s) = memory;
@@ -2606,7 +2606,7 @@
     PObj_sysmem_CLEAR(s);
 
     /* Free up the memory */
-    mem_sys_free(memory);
+    mem_internal_free(memory);
 }
 
 


More information about the parrot-commits mailing list