Changeset 129 for abuse/trunk/src/lisp/lisp.cppTweet

Timestamp:

Mar 22, 2008, 10:39:25 AM (14 years ago)

Author:

Sam Hocevar

Message:

• Get rid of jmalloc and replace it with standard malloc. Modern operating systems certainly perform a lot better than this custom implementation, and we have superior tools (eg. valgrind) to debug and profile memory usage without interfering with the code itself.

File:

• abuse/trunk/src/lisp/lisp.cpp (modified) (14 diffs)

abuse/trunk/src/lisp/lisp.cpp

@@ -25 +25 @@
 #else
 #include "status.hpp"
-#include "jmalloc.hpp"
 #include "macs.hpp"
 #include "specs.hpp"
@@ -862 +861 @@
      current_space=PERM_SPACE;       // make sure all symbols get defined in permanant space
 
-  p=(lisp_symbol *)jmalloc(sizeof(lisp_symbol),"lsymbol");
+  p=(lisp_symbol *)malloc(sizeof(lisp_symbol));
   p->type=L_SYMBOL;
   p->name=new_lisp_string(name);
@@ -889 +888 @@
     ldelete_syms(root->left);
     ldelete_syms(root->right);
-    jfree(root);
+    free(root);
   }
 }
@@ -1646 +1645 @@
   if (!num_args) return 0;
 
-  void **arg_on=(void **)jmalloc(sizeof(void *)*num_args,"mapcar tmp array");
+  void **arg_on=(void **)malloc(sizeof(void *)*num_args);
   cons_cell *list_on=(cons_cell *)CDR(arg_list);
   long old_ptr_son=l_ptr_stack.son;
@@ -1661 +1660 @@
   if (stop)
   {
-    jfree(arg_on);
+    free(arg_on);
     return NULL;
   }
@@ -1704 +1703 @@
   l_ptr_stack.son=old_ptr_son;
 
-  jfree(arg_on);
+  free(arg_on);
   return return_list;
 }
@@ -1722 +1721 @@
     else
     {
-      void **str_eval=(void **)jmalloc(elements*sizeof(void *),"tmp eval array");
+      void **str_eval=(void **)malloc(elements*sizeof(void *));
       int i,old_ptr_stack_start=l_ptr_stack.son;
 
@@ -1784 +1783 @@
     }
       }
-      jfree(str_eval);
+      free(str_eval);
       l_ptr_stack.son=old_ptr_stack_start;   // restore pointer GC stack
       *s=0;
@@ -2409 +2408 @@
                 {
                     char *gammapath;
-                    gammapath = (char *)jmalloc( strlen( get_save_filename_prefix() ) + 9 + 1, "gammapath" );
+                    gammapath = (char *)malloc( strlen( get_save_filename_prefix() ) + 9 + 1 );
                     sprintf( gammapath, "%sgamma.lsp", get_save_filename_prefix() );
                     fp = new jFILE( gammapath, "rb" );
-                    jfree( gammapath );
+                    free( gammapath );
                 }
                 else
@@ -2434 +2433 @@
             {
                 long l=fp->file_size();
-                char *s=(char *)jmalloc(l+1,"loaded script");
+                char *s=(char *)malloc(l + 1);
                 if (!s)
                 {
@@ -2468 +2467 @@
                 if (stat_man) stat_man->pop();
             #endif
-                jfree(s);
+                free(s);
                 ret=fn;
       }
@@ -3200 +3199 @@
   } else if (free_space[TMP_SPACE]==space[TMP_SPACE])
   {
-    free_space[TMP_SPACE]=space[TMP_SPACE]=(char *)jrealloc(space[TMP_SPACE],new_size,"lisp tmp space");
+    free_space[TMP_SPACE]=space[TMP_SPACE]=(char *)realloc(space[TMP_SPACE],new_size);
     space_size[TMP_SPACE]=new_size;
     dprintf("Lisp : tmp space resized to %d\n",new_size);
@@ -3212 +3211 @@
   lsym_root=NULL;
   total_user_functions=0;
-  free_space[0]=space[0]=(char *)jmalloc(perm_size,"lisp perm space");
+  free_space[0]=space[0]=(char *)malloc(perm_size);
   space_size[0]=perm_size;
 
 
-  free_space[1]=space[1]=(char *)jmalloc(tmp_size,"lisp tmp space");
+  free_space[1]=space[1]=(char *)malloc(tmp_size);
   space_size[1]=tmp_size;
 
@@ -3234 +3233 @@
 void lisp_uninit()
 {
-  jfree(space[0]);
-  jfree(space[1]);
+  free(space[0]);
+  free(space[1]);
   ldelete_syms(lsym_root);
   lsym_root=NULL;