Changeset 554Tweet

Timestamp:

Apr 29, 2011, 1:39:32 AM (12 years ago)

Author:

Sam Hocevar

Message:

lisp: if the Lisp permanent space grows out of memory, grow the space
during GCs instead of dying.

Location:

abuse/trunk/src

Files:

• game.cpp (modified) (1 diff)
• lisp/lisp.cpp (modified) (2 diffs)
• lisp/lisp_gc.cpp (modified) (3 diffs)
• lisp/lisp_gc.h (modified) (1 diff)

abuse/trunk/src/game.cpp

@@ -2468 +2468 @@
 
         game_net_init(argc, argv);
-        lisp_init(0x80000, 0x94000);
+        lisp_init(0x8000, 0x94000);
 
         dev_init(argc, argv);

abuse/trunk/src/lisp/lisp.cpp

@@ -188 +188 @@
     {
         if (which_space == PERM_SPACE || which_space == TMP_SPACE)
-            collect_space(which_space);
+            collect_space(which_space, 0);
+
+        if (size > get_free_size(which_space))
+            collect_space(which_space, 1);
 
         if (size > get_free_size(which_space))
@@ -2818 +2821 @@
     }
     case SYS_FUNC_GC:
-        collect_space(current_space);
+        collect_space(current_space, 0);
         break;
     case SYS_FUNC_SCHAR:

abuse/trunk/src/lisp/lisp_gc.cpp

@@ -233 +233 @@
 }
 
-void collect_space(int which_space) // should be tmp or permanent
+void collect_space(int which_space, int grow) // should be tmp or permanent
 {
   int old_space = current_space;
@@ -240 +240 @@
 
   space_size[GC_SPACE] = space_size[which_space];
+  if (grow)
+  {
+    space_size[GC_SPACE] += space_size[which_space] >> 1;
+    space_size[GC_SPACE] -= (space_size[GC_SPACE] & 7);
+  }
   uint8_t *new_space = (uint8_t *)malloc(space_size[GC_SPACE]);
   current_space = GC_SPACE;
@@ -255 +260 @@
 
   space[which_space] = new_space;
+  space_size[which_space] = space_size[GC_SPACE];
   free_space[which_space] = new_space
                           + (free_space[GC_SPACE] - space[GC_SPACE]);

abuse/trunk/src/lisp/lisp_gc.h

@@ -15 +15 @@
 extern grow_stack<void> l_user_stack;       // stack user progs can push data and have it GCed
 
-void collect_space(int which_space); // should be tmp or permenant
+void collect_space(int which_space, int grow); // should be tmp or permenant
 
 void register_pointer(void *&addr);