Changeset 13881

Timestamp:

Jun 24, 2010, 4:52:00 AM (14 years ago)

Author:

Gary Byers

Message:

Do GC notification if dynamic heap shrinks in ensure_static_conses().

File:

• trunk/source/lisp-kernel/pmcl-kernel.c (modified) (1 diff)

trunk/source/lisp-kernel/pmcl-kernel.c

@@ -2293 +2293 @@
   natural nbytes = nconses>>dnode_shift, have;
   BytePtr p = a->high-nbytes;
+  Boolean crossed_notify_threshold = false;
+  LispObj before_shrink, after_shrink;
 
   if (p < a->active) {
     untenure_from_area(tenured_area);
     gc_from_xp(xp, 0L);
+    did_gc_notification_since_last_full_gc = false;
   }
 
   have = unbox_fixnum(lisp_global(FREE_STATIC_CONSES));
   if (have < nconses) {
-    if ((a->high-a->active)>nbytes) {
+    before_shrink = a->high-a->active;
+    if (before_shrink>nbytes) {
       shrink_dynamic_area(nbytes);
+      after_shrink = a->high-a->active; 
+      if ((before_shrink >= lisp_heap_notify_threshold) &&
+          (after_shrink < lisp_heap_notify_threshold)) {
+        crossed_notify_threshold = true;
+      }
     }
     allocate_static_conses(nconses);
     tcr->bytes_allocated += nbytes;
   }
+  if (crossed_notify_threshold && !did_gc_notification_since_last_full_gc) {
+    callback_for_gc_notification(xp,tcr);
+  }
 }