Changeset 12806

Timestamp:

Sep 10, 2009, 8:43:00 AM (15 years ago)

Author:

R. Matthew Emerson

Message:

Scan AREA_WATCHED areas. Un-protect watched areas during GC using new
functions protect_watched_areas() and unprotect_watched_areas().

Location:

trunk/source/lisp-kernel

Files:

• gc-common.c (modified) (6 diffs)
• memory.c (modified) (1 diff)

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

@@ -1101 +1101 @@
 
   install_weak_mark_functions(lisp_global(WEAK_GC_METHOD) >> fixnumshift);
-
-
-
+  
 #ifndef FORCE_DWS_MARK
   if ((natural) (tcr->cs_limit) == CS_OVERFLOW_FORCE_LIMIT) {
@@ -1163 +1161 @@
 
   get_time(start);
+
+  /* The link-inverting marker might need to write to watched areas */
+  unprotect_watched_areas(PROT_READ|PROT_EXEC|PROT_WRITE);
+
   lisp_global(IN_GC) = (1<<fixnumshift);
 
@@ -1238 +1240 @@
 
         case AREA_STATIC:
+        case AREA_WATCHED:
         case AREA_DYNAMIC:                  /* some heap that isn't "the" heap */
           /* In both of these cases, we -could- use the area's "markbits"
@@ -1373 +1376 @@
 
         case AREA_STATIC:
+        case AREA_WATCHED:
         case AREA_DYNAMIC:                  /* some heap that isn't "the" heap */
           if (next_area->younger == NULL) {
@@ -1384 +1388 @@
       }
     }
-  
+
     if (GCephemeral_low) {
       forward_memoized_area(tenured_area, area_dnode(a->low, tenured_area->low));
@@ -1428 +1432 @@
   
   lisp_global(IN_GC) = 0;
+  
+  protect_watched_areas();
 
   nrs_GC_EVENT_STATUS_BITS.vcell |= gc_postgc_pending;

trunk/source/lisp-kernel/memory.c

@@ -948 +948 @@
   pure_space_active = pure_space_start;
 }
+
+void
+protect_watched_areas()
+{
+  area *a = active_dynamic_area;
+  natural code = a->code;
+
+  while (code != AREA_VOID) {
+    if (code == AREA_WATCHED) {
+      natural size = a->high - a->low;
+      
+      ProtectMemory(a->low, size);
+    }
+    a = a->succ;
+    code = a->code;
+  }
+}
+
+void
+unprotect_watched_areas()
+{
+  area *a = active_dynamic_area;
+  natural code = a->code;
+
+  while (code != AREA_VOID) {
+    if (code == AREA_WATCHED) {
+      natural size = a->high - a->low;
+      
+      UnProtectMemory(a->low, size);
+    }
+    a = a->succ;
+    code = a->code;
+  }
+}