Changeset 5951

Timestamp:

Feb 21, 2007, 4:58:51 AM (18 years ago)

Author:

Gary Byers

Message:

If full GC is deferred, ensure that a full GC happens after
WITHOUT-GCING exits.

Location:

trunk/ccl/lisp-kernel

Files:

• ppc-exceptions.c (modified) (5 diffs)
• x86-exceptions.c (modified) (6 diffs)

trunk/ccl/lisp-kernel/ppc-exceptions.c

@@ -364 +364 @@
 }
 
+natural gc_deferred = 0, full_gc_deferred = 0;
+
 OSStatus
 handle_gc_trap(ExceptionInformation *xp, TCR *tcr)
@@ -372 +374 @@
   area *a = active_dynamic_area;
   Boolean egc_was_enabled = (a->older != NULL);
+  natural gc_previously_deferred = gc_deferred;
 
 
@@ -416 +419 @@
 
     if (selector == GC_TRAP_FUNCTION_IMMEDIATE_GC) {
-      gc_from_xp(xp, 0L);
-      break;
+      if (!full_gc_deferred) {
+        gc_from_xp(xp, 0L);
+        break;
+      }
+      /* Tried to do a full GC when gc was disabled.  That failed,
+         so try full GC now */
+      selector = GC_TRAP_FUNCTION_GC;
     }
     
@@ -424 +432 @@
     }
     gc_from_xp(xp, 0L);
+    if (gc_deferred > gc_previously_deferred) {
+      full_gc_deferred = 1;
+    } else {
+      full_gc_deferred = 0;
+    }
     if (selector > GC_TRAP_FUNCTION_GC) {
       if (selector & GC_TRAP_FUNCTION_IMPURIFY) {
@@ -680 +693 @@
     }
     resume_other_threads(true);
+    gc_deferred++;
     return 0;
   }
+  gc_deferred = 0;
 
   gc_tcr = tcr;

trunk/ccl/lisp-kernel/x86-exceptions.c

@@ -141 +141 @@
 }
 
+natural gc_deferred = 0, full_gc_deferred = 0;
+
 Boolean
 handle_gc_trap(ExceptionInformation *xp, TCR *tcr)
@@ -149 +151 @@
   area *a = active_dynamic_area;
   Boolean egc_was_enabled = (a->older != NULL);
+  natural gc_previously_deferred = gc_deferred;
 
   switch (selector) {
@@ -192 +195 @@
 
     if (selector == GC_TRAP_FUNCTION_IMMEDIATE_GC) {
-      gc_from_xp(xp, 0L);
-      break;
+      if (!full_gc_deferred) {
+        gc_from_xp(xp, 0L);
+        break;
+      }
+      /* Tried to do a full GC when gc was disabled.  That failed,
+         so try full GC now */
+      selector = GC_TRAP_FUNCTION_GC;
     }
     
@@ -200 +208 @@
     }
     gc_from_xp(xp, 0L);
+    if (gc_deferred > gc_previously_deferred) {
+      full_gc_deferred = 1;
+    } else {
+      full_gc_deferred = 0;
+    }
     if (selector & GC_TRAP_FUNCTION_PURIFY) {
       purify_from_xp(xp, 0L);
@@ -1640 +1653 @@
 TCR *gc_tcr = NULL;
 
+
 int
 gc_like_from_xp(ExceptionInformation *xp, 
@@ -1657 +1671 @@
     }
     resume_other_threads(true);
+    gc_deferred++;
     return 0;
   }
+  gc_deferred = 0;
 
   gc_tcr = tcr;