0.8.15.7

[sbcl.git] / src / runtime / cheneygc.c

diff --git a/src/runtime/cheneygc.c b/src/runtime/cheneygc.c
index 2c03339..63383f5 100644 (file)
--- a/src/runtime/cheneygc.c
+++ b/src/runtime/cheneygc.c
@@ -17,8 +17,8 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <signal.h>
-#include "runtime.h"
 #include "sbcl.h"
+#include "runtime.h"
 #include "os.h"
 #include "gc.h"
 #include "gc-internal.h"
@@ -50,6 +50,8 @@ static void scavenge_newspace(void);
 static void scavenge_interrupt_contexts(void);
 extern struct interrupt_data * global_interrupt_data;
 
+extern unsigned long bytes_consed_between_gcs;
+
 \f
 /* collecting garbage */
 
@@ -70,7 +72,7 @@ tv_diff(struct timeval *x, struct timeval *y)
 static void
 zero_stack(void)
 {
-    u32 *ptr = (u32 *)current_control_stack_pointer;
+    lispobj *ptr = current_control_stack_pointer;
  search:
     do {
        if (*ptr)
@@ -90,7 +92,7 @@ zero_stack(void)
 void *
 gc_general_alloc(int bytes, int unboxed_p, int quick_p) {
     lispobj *new=new_space_free_pointer;
-    new_space_free_pointer+=(bytes/4);
+    new_space_free_pointer+=(bytes/N_WORD_BYTES);
     return new;
 }
 
@@ -116,8 +118,8 @@ collect_garbage(unsigned ignore)
     double real_time, system_time, user_time;
     double percent_retained, gc_rate;
     unsigned long size_discarded;
-    unsigned long size_retained;
 #endif
+    unsigned long size_retained;
     lispobj *current_static_space_free_pointer;
     unsigned long static_space_size; 
     unsigned long control_stack_size, binding_stack_size; 
@@ -134,6 +136,8 @@ collect_garbage(unsigned ignore)
     gettimeofday(&start_tv, (struct timezone *) 0);
 #endif
        
+    /* it's possible that signals are blocked already if this was called 
+     * from a signal handler (e.g. with the sigsegv gc_trigger stuff) */
     sigemptyset(&tmp);
     sigaddset_blockable(&tmp);
     sigprocmask(SIG_BLOCK, &tmp, &old);
@@ -241,15 +245,15 @@ collect_garbage(unsigned ignore)
 
 #ifdef PRINTNOISE
     size_discarded = (from_space_free_pointer - from_space) * sizeof(lispobj);
-    size_retained = (new_space_free_pointer - new_space) * sizeof(lispobj);
 #endif
+    size_retained = (new_space_free_pointer - new_space) * sizeof(lispobj);
 
     /* Zero stack. */
 #ifdef PRINTNOISE
     printf("Zeroing empty part of control stack ...\n");
 #endif
     zero_stack();
-
+    set_auto_gc_trigger(size_retained+bytes_consed_between_gcs);
     sigprocmask(SIG_SETMASK, &old, 0);
 
 
@@ -269,15 +273,8 @@ collect_garbage(unsigned ignore)
     user_time = tv_diff(&stop_rusage.ru_utime, &start_rusage.ru_utime);
     system_time = tv_diff(&stop_rusage.ru_stime, &start_rusage.ru_stime);
 
-#if 0
-    printf("Statistics:\n");
-    printf("%10.2f sec of real time\n", real_time);
-    printf("%10.2f sec of user time,\n", user_time);
-    printf("%10.2f sec of system time.\n", system_time);
-#else
     printf("Statistics: %10.2fs real, %10.2fs user, %10.2fs system.\n",
           real_time, user_time, system_time);
-#endif        
 
     gc_rate = ((float) size_retained / (float) (1<<20)) / real_time;
        
@@ -335,8 +332,9 @@ scavenge_interrupt_context(os_context_t *context)
     /* before we scavenge the context. */
 #ifdef reg_LIP
     lip = *os_context_register_addr(context, reg_LIP);
-    /*  0x7FFFFFFF or 0x7FFFFFFFFFFFFFFF ? */
-    lip_offset = 0x7FFFFFFF;
+    /* 0x7FFFFFFF on 32-bit platforms;
+       0x7FFFFFFFFFFFFFFF on 64-bit platforms */
+    lip_offset = (((unsigned long)1) << (N_WORD_BITS - 1)) - 1;
     lip_register_pair = -1;
     for (i = 0; i < (sizeof(boxed_registers) / sizeof(int)); i++) {
        unsigned long reg;
@@ -525,7 +523,7 @@ scav_fdefn(lispobj *where, lispobj object)
        == (char *)((unsigned long)(fdefn->raw_addr))) {
         scavenge(where + 1, sizeof(struct fdefn)/sizeof(lispobj) - 1);
         fdefn->raw_addr =
-           (u32)  ((char *) LOW_WORD(fdefn->fun)) + FUN_RAW_ADDR_OFFSET;
+            (u32) ((char *) LOW_WORD(fdefn->fun)) + FUN_RAW_ADDR_OFFSET;
         return sizeof(struct fdefn) / sizeof(lispobj);
     }
     else
@@ -537,8 +535,6 @@ scav_fdefn(lispobj *where, lispobj object)
 \f
 /* vector-like objects */
 
-/* #define NWORDS(x,y) (CEILING((x),(y)) / (y)) */
-
 static int
 scav_vector(lispobj *where, lispobj object)
 {
@@ -565,7 +561,42 @@ scav_weak_pointer(lispobj *where, lispobj object)
 
     return WEAK_POINTER_NWORDS;
 }
+\f
+lispobj *
+search_read_only_space(void *pointer)
+{
+    lispobj* start = (lispobj*)READ_ONLY_SPACE_START;
+    lispobj* end = (lispobj*)SymbolValue(READ_ONLY_SPACE_FREE_POINTER,0);
+    if ((pointer < (void *)start) || (pointer >= (void *)end))
+       return NULL;
+    return (search_space(start, 
+                        (((lispobj *)pointer)+2)-start, 
+                        (lispobj *)pointer));
+}
+
+lispobj *
+search_static_space(void *pointer)
+{
+    lispobj* start = (lispobj*)STATIC_SPACE_START;
+    lispobj* end = (lispobj*)SymbolValue(STATIC_SPACE_FREE_POINTER,0);
+    if ((pointer < (void *)start) || (pointer >= (void *)end))
+       return NULL;
+    return (search_space(start, 
+                        (((lispobj *)pointer)+2)-start, 
+                        (lispobj *)pointer));
+}
 
+lispobj *
+search_dynamic_space(void *pointer)
+{
+    lispobj *start = (lispobj *) current_dynamic_space;
+    lispobj *end = (lispobj *) dynamic_space_free_pointer;
+    if ((pointer < (void *)start) || (pointer >= (void *)end))
+       return NULL;
+    return (search_space(start, 
+                        (((lispobj *)pointer)+2)-start, 
+                        (lispobj *)pointer));
+}
 \f
 /* initialization.  if gc_init can be moved to after core load, we could
  * combine these two functions */
@@ -595,11 +626,13 @@ gc_initialize_pointers(void)
 \f
 /* noise to manipulate the gc trigger stuff */
 
+/* Functions that substantially change the dynamic space free pointer
+ * (collect_garbage, purify) are responsible also for resettting the
+ * auto_gc_trigger */
 void set_auto_gc_trigger(os_vm_size_t dynamic_usage)
 {
     os_vm_address_t addr=(os_vm_address_t)current_dynamic_space 
        + dynamic_usage;
-       
     long length = DYNAMIC_SPACE_SIZE - dynamic_usage;
 
     if (addr < (os_vm_address_t)dynamic_space_free_pointer) {