Changeset 13954

Timestamp:

Jul 12, 2010, 5:10:49 AM (14 years ago)

Author:

Gary Byers

Message:

In commit_pages(), try to ensure that we return false if CommitMemory() does.
In gc(), zero_pages() after possibly shrinking heap.

Location:

trunk/source/lisp-kernel

Files:

• gc-common.c (modified) (2 diffs)
• pmcl-kernel.c (modified) (1 diff)

trunk/source/lisp-kernel/gc-common.c

@@ -1365 +1365 @@
     pkg = 0,
     itabvec = 0;
-  BytePtr oldfree = a->active;
+  BytePtr oldfree = a->active, last_zeroed_addr;
   TCR *other_tcr;
   natural static_dnodes;
@@ -1678 +1678 @@
     }
 
-    zero_memory_range(a->active, oldfree);
 
     resize_dynamic_heap(a->active,
                         (GCephemeral_low == 0) ? lisp_heap_gc_threshold : 0);
+
+    if (oldfree < a->high) {
+      last_zeroed_addr = oldfree;
+    } else {
+      last_zeroed_addr = a->high;
+    }
+    zero_memory_range(a->active, last_zeroed_addr);
 
     /*

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

@@ -448 +448 @@
 {
   if (len != 0) {
-    if (CommitMemory(start, len)) {
-      if (touch_all_pages(start, len)) {
-        return true;
-      }
+    if (!CommitMemory(start, len)) {
+      return false;
+    }
+    if (!touch_all_pages(start, len)) {
+      return false;
     }
   }