[svn:parrot] r44371 - in trunk/src: . interp io pmc

[bacek at svn.parrot.org]

Author: bacek
Date: Tue Feb 23 07:40:47 2010
New Revision: 44371
URL: https://trac.parrot.org/parrot/changeset/44371

Log:
Replace more mem_sys_free with mem_gc_free/mem_internal_free

Modified:
   trunk/src/interp/inter_create.c
   trunk/src/io/filehandle.c
   trunk/src/pmc/filehandle.pmc
   trunk/src/pmc/nci.pmc
   trunk/src/pmc/sockaddr.pmc
   trunk/src/tsq.c

Modified: trunk/src/interp/inter_create.c
==============================================================================
--- trunk/src/interp/inter_create.c	Tue Feb 23 07:05:33 2010	(r44370)
+++ trunk/src/interp/inter_create.c	Tue Feb 23 07:40:47 2010	(r44371)
@@ -438,7 +438,7 @@
     destroy_object_cache(interp);
 
     if (interp->evc_func_table) {
-        mem_sys_free(interp->evc_func_table);
+        mem_gc_free(interp, interp->evc_func_table);
         interp->evc_func_table = NULL;
     }
 
@@ -449,7 +449,7 @@
 
     if (!interp->parent_interpreter) {
         if (interp->thread_data)
-            mem_sys_free(interp->thread_data);
+            mem_internal_free(interp->thread_data);
 
         /* free vtables */
         parrot_free_vtables(interp);
@@ -458,10 +458,10 @@
         Parrot_gc_finalize(interp);
 
         MUTEX_DESTROY(interpreter_array_mutex);
-        mem_sys_free(interp);
+        mem_internal_free(interp);
 
         /* finally free other globals */
-        mem_sys_free(interpreter_array);
+        mem_internal_free(interpreter_array);
         interpreter_array = NULL;
     }
 
@@ -471,7 +471,7 @@
         || (interp->thread_data
         && (interp->thread_data->state & THREAD_STATE_JOINED))) {
             if (interp->thread_data) {
-                mem_sys_free(interp->thread_data);
+                mem_internal_free(interp->thread_data);
                 interp->thread_data = NULL;
             }
 
@@ -479,7 +479,7 @@
             Parrot_gc_finalize(interp);
 
             parrot_free_vtables(interp);
-            mem_sys_free(interp);
+            mem_internal_free(interp);
         }
     }
 }

Modified: trunk/src/io/filehandle.c
==============================================================================
--- trunk/src/io/filehandle.c	Tue Feb 23 07:05:33 2010	(r44370)
+++ trunk/src/io/filehandle.c	Tue Feb 23 07:40:47 2010	(r44371)
@@ -552,12 +552,12 @@
 
 PARROT_CAN_RETURN_NULL
 void
-Parrot_io_clear_buffer(SHIM_INTERP, ARGIN(PMC *filehandle))
+Parrot_io_clear_buffer(PARROT_INTERP, ARGIN(PMC *filehandle))
 {
     ASSERT_ARGS(Parrot_io_clear_buffer)
     Parrot_FileHandle_attributes * const io = PARROT_FILEHANDLE(filehandle);
     if (io->buffer_start && (io->flags & PIO_BF_MALLOC)) {
-        mem_sys_free(io->buffer_start);
+        mem_gc_free(interp, io->buffer_start);
         io->buffer_start = NULL;
     }
 }

Modified: trunk/src/pmc/filehandle.pmc
==============================================================================
--- trunk/src/pmc/filehandle.pmc	Tue Feb 23 07:05:33 2010	(r44370)
+++ trunk/src/pmc/filehandle.pmc	Tue Feb 23 07:40:47 2010	(r44371)
@@ -153,7 +153,7 @@
             }
 
             if (data_struct->buffer_start)
-                mem_sys_free(data_struct->buffer_start);
+                mem_gc_free(INTERP, data_struct->buffer_start);
         }
     }
 
@@ -374,7 +374,7 @@
                 add_history(r);
 
             string_result = Parrot_str_new(INTERP, r, 0);
-            mem_sys_free(r);
+            mem_internal_free(r);
         }
 #else
         if (got_prompt)

Modified: trunk/src/pmc/nci.pmc
==============================================================================
--- trunk/src/pmc/nci.pmc	Tue Feb 23 07:05:33 2010	(r44370)
+++ trunk/src/pmc/nci.pmc	Tue Feb 23 07:40:47 2010	(r44371)
@@ -78,7 +78,7 @@
             break;
           default:
             if (sig_length > 7)
-                mem_sys_free(param_sig);
+                mem_gc_free(interp, param_sig);
             Parrot_ex_throw_from_c_args(interp, NULL,
                     EXCEPTION_JIT_ERROR,
                     "Unknown param Signature %c\n", (char)c);
@@ -97,7 +97,7 @@
         nci_info->pcc_params_signature = CONST_STRING(interp, "");
 
     if (sig_length > 7)
-        mem_sys_free(param_sig);
+        mem_gc_free(interp, param_sig);
 }
 
 /* actually build the NCI thunk */

Modified: trunk/src/pmc/sockaddr.pmc
==============================================================================
--- trunk/src/pmc/sockaddr.pmc	Tue Feb 23 07:05:33 2010	(r44370)
+++ trunk/src/pmc/sockaddr.pmc	Tue Feb 23 07:40:47 2010	(r44371)
@@ -65,7 +65,7 @@
         Parrot_Sockaddr_attributes * const data = PARROT_SOCKADDR(SELF);
 
         if (data) {
-            mem_sys_free(data->pointer);
+            mem_gc_free(INTERP, data->pointer);
             data->pointer = NULL;
         }
     }

Modified: trunk/src/tsq.c
==============================================================================
--- trunk/src/tsq.c	Tue Feb 23 07:05:33 2010	(r44370)
+++ trunk/src/tsq.c	Tue Feb 23 07:40:47 2010	(r44371)
@@ -402,7 +402,7 @@
 
     COND_DESTROY(queue->queue_condition);
     MUTEX_DESTROY(queue->queue_mutex);
-    mem_sys_free(queue);
+    mem_internal_free(queue);
 }
 
 /*