Changeset 7303

Timestamp:

Sep 26, 2007, 9:57:37 AM (14 years ago)

Author:

gb

Message:

More heap-freezing changes.

Location:

branches/working-0709/ccl/lisp-kernel

Files:

• image.c (modified) (3 diffs)
• lisp_globals.h (modified) (1 diff)
• x86-exceptions.c (modified) (3 diffs)
• x86-gc.c (modified) (4 diffs)

branches/working-0709/ccl/lisp-kernel/image.c

@@ -211 +211 @@
 
     a->static_dnodes = sect->static_dnodes;
-    if (a->static_dnodes) {
-      natural pages_size = (align_to_power_of_2((align_to_power_of_2(a->static_dnodes, 
-                                                                     log2_nbits_in_word)>>3),
-                                                log2_page_size));
-      lseek(fd,pos+mem_size, SEEK_SET);
-      pos = seek_to_next_page(fd);
-      addr = mmap(NULL,
-                  pages_size,
-                  PROT_READ | PROT_WRITE,
-                  MAP_PRIVATE,
-                  fd,
-                  pos);
-      if (addr == MAP_FAILED) {
-        return;
-      }
-      a->static_used = addr;
-      advance = pages_size;
-    }
     sect->area = a;
     break;
@@ -477 +459 @@
     case FWDNUM:
     case GC_NUM:
-    case DELETED_STATIC_PAIRS:
+    case STATIC_CONSES:
       break;
     default:
@@ -503 +485 @@
         return errno;
       }
-      if (nstatic) {
-        /* Need to write the static_used bitmap */
-        natural static_used_size_in_bytes =
-          (align_to_power_of_2((align_to_power_of_2(nstatic, log2_nbits_in_word)>>3),
-                               log2_page_size));
-        seek_to_next_page(fd);
-        if (write(fd, tenured_area->static_used, static_used_size_in_bytes) 
-            != static_used_size_in_bytes) {
-          return errno;
-        }
-      }
     }
   }

branches/working-0709/ccl/lisp-kernel/lisp_globals.h

@@ -33 +33 @@
 #define TCR_AREA_LOCK (-11)       /* all_areas/tcr queue lock */
 #define EXCEPTION_LOCK (-12)    /* serialize exception handling */
-#define DELETED_STATIC_PAIRS (-13) /* for hash-consing */
+#define STATIC_CONSES (-13)
 #define DEFAULT_ALLOCATION_QUANTUM (-14)
 #define INTFLAG (-15)

branches/working-0709/ccl/lisp-kernel/x86-exceptions.c

@@ -237 +237 @@
       fatal_oserr(": save_application", err);
     }
-    switch {salector) {
+    switch (selector) {
     case GC_TRAP_FUNCTION_SET_HONS_AREA_SIZE:
       xpGPR(xp, Iimm0) = 0;
@@ -243 +243 @@
     case GC_TRAP_FUNCTION_FREEZE:
       a->active = (BytePtr) align_to_power_of_2(a->active, log2_page_size);
-      static_area->static_dnodes = area_dnode(a->active, a->low);
-      xpGPR(xp, Iimm0) = static_area->static_dnodes;
+      tenured_area->static_dnodes = area_dnode(a->active, a->low);
+      xpGPR(xp, Iimm0) = tenured_area->static_dnodes << dnode_shift;
       break;
     default:
@@ -1897 +1897 @@
 
 int
-change_hons_area_size_from_xp(ExceptionInformation *xp, signed_natural delta_in_bytes)
-{
-  return gc_like_from_xp(xp, change_hons_area_size, delta_in_bytes);
-}
-
-int
 purify_from_xp(ExceptionInformation *xp, signed_natural param)
 {

branches/working-0709/ccl/lisp-kernel/x86-gc.c

@@ -2112 +2112 @@
 }
 
-void
-forward_and_resolve_static_references(area *a)
-{
-  natural 
-    nstatic = static_dnodes_for_area(a),
-    nstatic_bitmap_words = nstatic >> bitmap_shift;
-  if (nstatic != 0) {
-    /* exploit the fact that a cons is the same size as a dnode. */
-    cons *pagelet_start = (cons *) a->low, *work;
-    bitvector markbits = GCmarkbits, 
-      usedbits = tenured_area->static_used;
-    natural marked, used, used_but_not_marked, ndeleted = 0, i;
-
-    while (nstatic_bitmap_words--) {
-      marked = *markbits++;
-      used = *usedbits;
-      if (marked != used) {
-        *usedbits = marked;
-      }
-      used |= marked;
-      used_but_not_marked = used & ~marked;
-
-      while (marked) {
-        i = count_leading_zeros(marked);
-        marked &= ~(BIT0_MASK >> i);
-        work = pagelet_start+i;
-        update_noderef(&work->cdr);
-        update_noderef(&work->car);
-      }
-
-      while (used_but_not_marked) {
-        i = count_leading_zeros(used_but_not_marked);
-        used_but_not_marked &= ~(BIT0_MASK >> i);
-        work = pagelet_start+i;
-        if ((work->cdr != undefined) &&
-            (work->cdr != slot_unbound)) {
-          work->car = slot_unbound;
-          work->cdr = slot_unbound;
-          ndeleted++;
-        }
-      }
-      usedbits++;
-      pagelet_start += nbits_in_word;
-    }
-    lisp_global(DELETED_STATIC_PAIRS) += box_fixnum(ndeleted);
-  }
-}
+
 
 
@@ -2324 +2278 @@
 }
 
+void
+reclaim_static_dnodes()
+{
+  natural nstatic = tenured_area->static_dnodes, i, bits, mask, bitnum;
+  cons *c = (cons *)tenured_area->low, *d;
+  bitvector bitsp = GCmarkbits;
+  LispObj head = lisp_global(STATIC_CONSES);
+
+  if (nstatic) {
+    if (head) {
+      for (i = 0; i < nstatic; i+= nbits_in_word, c+= nbits_in_word) {
+        bits = *bitsp++;
+        if (bits != ALL_ONES) {
+          for (bitnum = 0; bitnum < nbits_in_word; bitnum++) {
+            if (! (bits & (BIT0_MASK>>bitnum))) {
+              d = c + bitnum;
+              d->car = 0;
+              d->cdr = head;
+              head = ((LispObj)d)+fulltag_cons;
+            }
+          }
+        }
+      }
+      lisp_global(STATIC_CONSES) = head;
+    } else {
+      for (i = 0; i < nstatic; i+= nbits_in_word, c+= nbits_in_word) {
+        bits = *bitsp++;
+        if (bits != ALL_ONES) {
+          for (bitnum = 0; bitnum < nbits_in_word; bitnum++) {
+            if (! (bits & (BIT0_MASK>>bitnum))) {
+              d = c + bitnum;
+              d->car = 0;
+              d->cdr = 0;
+            }
+          }
+        }
+      }
+    }
+  }
+}
 
 Boolean
@@ -2598 +2592 @@
     GCfirstunmarked = calculate_relocation();
 
-    forward_range((LispObj *) ptr_from_lispobj(GCareadynamiclow), (LispObj *) ptr_from_lispobj(GCfirstunmarked));
+    if (!GCephemeral_low) {
+      reclaim_static_dnodes();
+    }
+
+    forward_range((LispObj *) ptr_from_lispobj(GCarealow), (LispObj *) ptr_from_lispobj(GCfirstunmarked));
 
     other_tcr = tcr;
@@ -2644 +2642 @@
     if (GCephemeral_low) {
       forward_memoized_area(tenured_area, area_dnode(a->low, tenured_area->low));
-    } else {
-      /* Full GC, need to process static space */
-      forward_and_resolve_static_references(a);
     }