Branch: Tag:

2003-02-01

2003-02-01 15:37:23 by Martin Stjernholm <mast@lysator.liu.se>

Enabled some consistency checks in the gc when compiled without rtldebug
(only activated on debug level 1 or higher). Always define _verify_internals
to be able to use this. Made it possible to turn on trace messages for the
gc only with trace(1,"gc") (intended to be compatible with a facility based
trace system in 7.5).

Rev: src/array.c:1.134
Rev: src/builtin.cmod:1.103
Rev: src/builtin_functions.c:1.455
Rev: src/gc.c:1.192
Rev: src/gc.h:1.94
Rev: src/mapping.c:1.158
Rev: src/multiset.c:1.61
Rev: src/object.c:1.213
Rev: src/program.c:1.467

2:   || This file is part of Pike. For copyright information see COPYRIGHT.   || Pike is distributed under GPL, LGPL and MPL. See the file COPYING   || for more information. - || $Id: gc.c,v 1.191 2003/01/12 17:25:39 mast Exp $ + || $Id: gc.c,v 1.192 2003/02/01 15:37:23 mast Exp $   */      #include "global.h"
31:      #include "block_alloc.h"    - RCSID("$Id: gc.c,v 1.191 2003/01/12 17:25:39 mast Exp $"); + RCSID("$Id: gc.c,v 1.192 2003/02/01 15:37:23 mast Exp $");      /* Run garbage collect approximately every time    * 20 percent of all arrays, objects and programs is
102:   int gc_generation = 0;   struct pike_queue gc_mark_queue;   time_t last_gc; + int gc_trace = 0, gc_debug = 0;      struct gc_frame   {
319:   static int found_in_type=0;   void *gc_svalue_location=0;   char *fatal_after_gc=0; - int gc_debug = 0; +       #define DESCRIBE_MEM 1   #define DESCRIBE_NO_REFS 2
623:    fprintf(stderr, "no marker\n");   }    + #endif /* PIKE_DEBUG */ +    void debug_gc_fatal(void *a, int flags, const char *fmt, ...)   {    struct marker *m;
636:       va_end(args);    + #ifdef PIKE_DEBUG    if (a) {    /* Temporarily jumping out of gc to avoid being catched in debug    * checks in describe(). */
658:    if (flags & 2)    fatal_after_gc = "Fatal in garbage collector.\n";    else + #endif    debug_fatal("Fatal in garbage collector.\n");   }    -  + #ifdef PIKE_DEBUG +    static void gdb_gc_stop_here(void *a, int weak)   {   #if 0
1113:    fprintf(stderr, "## Already watching thing %p.\n", a);   }    + #endif /* PIKE_DEBUG */ +    void debug_gc_touch(void *a)   {    struct marker *m;    -  + #ifdef PIKE_DEBUG    if (gc_is_watching && (m = find_marker(a)) && m->flags & GC_WATCHED) {    /* This is useful to set breakpoints on. */    fprintf(stderr, "## Watched thing %p found in "    "gc_touch() in pass %d.\n", a, Pike_in_gc);    } -  + #endif       if (!a) Pike_fatal("Got null pointer.\n");       switch (Pike_in_gc) {    case GC_PASS_PRETOUCH:    m = find_marker(a); -  if (m && !(m->flags & (GC_PRETOUCHED|GC_WATCHED))) +  if (m && !(m->flags & (GC_PRETOUCHED + #ifdef PIKE_DEBUG +  |GC_WATCHED + #endif +  )))    gc_fatal(a, 1, "Thing got an existing but untouched marker.\n");    m = get_marker(a);    m->flags |= GC_PRETOUCHED; -  + #ifdef PIKE_DEBUG    m->saved_refs = *(INT32 *) a; -  + #endif    break;       case GC_PASS_MIDDLETOUCH: {
1142:    gc_fatal(a, 1, "Found a thing without marker.\n");    else if (!(m->flags & GC_PRETOUCHED))    gc_fatal(a, 1, "Thing got an existing but untouched marker.\n"); + #ifdef PIKE_DEBUG    extra_ref = (m->flags & GC_GOT_EXTRA_REF) == GC_GOT_EXTRA_REF;    if (m->saved_refs + extra_ref < *(INT32 *) a)    if (m->flags & GC_WEAK_FREED)
1149:    "or it has gotten more references since gc start.\n");    else    gc_fatal(a, 1, "Thing has gotten more references since gc start.\n"); -  else if (m->weak_refs > m->saved_refs) +  else +  if (m->weak_refs > m->saved_refs)    gc_fatal(a, 0, "A thing got more weak references than references.\n"); -  + #endif    m->flags |= GC_MIDDLETOUCHED;    break;    }
1166:    else if (m->flags & GC_LIVE_RECURSE ||    (m->frame && m->frame->frameflags & (GC_WEAK_REF|GC_STRONG_REF)))    gc_fatal(a, 2, "Thing still got flag from recurse list.\n"); + #ifdef PIKE_DEBUG    else if (m->flags & GC_MARKED)    return;    else if (!(m->flags & GC_NOT_REFERENCED) || m->flags & GC_XREFERENCED)
1191:    else    gc_fatal(a, 3, "A thing to garb is still around.\n");    } + #endif    }    break;   
1199:    }   }    + #ifdef PIKE_DEBUG +    static INLINE struct marker *gc_check_debug(void *a, int weak)   {    struct marker *m;
2397:    double tmp;    ptrdiff_t start_num_objs, objs, pre_kill_objs;    double multiplier; - #ifdef PIKE_DEBUG +    #ifdef HAVE_GETHRTIME    hrtime_t gcstarttime = 0;   #endif -  + #ifdef PIKE_DEBUG    unsigned destroy_count, obj_count;    ONERROR uwp;   #endif
2413:    init_gc();    gc_generation++;    Pike_in_gc=GC_PASS_PREPARE; - #ifdef PIKE_DEBUG +     gc_debug = d_flag; -  + #ifdef PIKE_DEBUG    SET_ONERROR(uwp, fatal_on_error, "Shouldn't get an exception inside the gc.\n");    if (gc_is_watching)    fprintf(stderr, "## Doing gc while watching for %d things.\n", gc_is_watching);
2431:    objs=num_objects;    last_cycle = 0;    - #ifdef PIKE_DEBUG -  if(GC_VERBOSE_DO(1 ||) t_flag) { +  if(GC_VERBOSE_DO(1 ||) gc_trace) {    fprintf(stderr,"Garbage collecting ... ");    GC_VERBOSE_DO(fprintf(stderr, "\n"));   #ifdef HAVE_GETHRTIME    gcstarttime = gethrtime();   #endif    } -  + #ifdef PIKE_DEBUG    if(num_objects < 0)    Pike_fatal("Panic, less than zero objects!\n");   #endif
2459: Inside #if defined(PIKE_DEBUG)
  #ifdef PIKE_DEBUG    delayed_freed = weak_freed = checked = marked = cycle_checked = live_ref = 0;    live_rec = frame_rot = 0; + #endif    if (gc_debug) {    unsigned n;    Pike_in_gc = GC_PASS_PRETOUCH;
2467: Inside #if defined(PIKE_DEBUG)
   n += gc_touch_all_mappings();    n += gc_touch_all_programs();    n += gc_touch_all_objects(); + #ifdef PIKE_DEBUG    gc_touch_all_strings(); -  + #endif    if (n != (unsigned) num_objects)    Pike_fatal("Object count wrong before gc; expected %d, got %d.\n", num_objects, n);    GC_VERBOSE_DO(fprintf(stderr, "| pretouch: %u things\n", n));    } - #endif +        Pike_in_gc=GC_PASS_CHECK;    gc_ext_weak_refs = 0;
2606:    delayed_freed - obj_count));    }    - #ifdef PIKE_DEBUG +     if (gc_debug) {    unsigned n;    size_t i;
2617: Inside #if defined(PIKE_DEBUG)
   n += gc_touch_all_mappings();    n += gc_touch_all_programs();    n += gc_touch_all_objects(); + #ifdef PIKE_DEBUG    gc_touch_all_strings(); -  + #endif    if (n != (unsigned) num_objects)    Pike_fatal("Object count wrong in gc; expected %d, got %d.\n", num_objects, n);    get_marker(rec_list.data)->flags |= GC_MIDDLETOUCHED;   #if 0 /* Temporarily disabled - Hubbe */ -  + #ifdef PIKE_DEBUG   #ifdef DEBUG_MALLOC    PTR_HASH_LOOP(marker, i, m)    if (!(m->flags & (GC_MIDDLETOUCHED|GC_WEAK_FREED)) &&
2638: Inside #if defined(PIKE_DEBUG) and #if 0 /* Temporarily disabled - Hubbe */
   }   #endif   #endif + #endif    GC_VERBOSE_DO(fprintf(stderr, "| middletouch\n"));    } - #endif +        /* Add an extra reference to the stuff gc_internal_* point to, so we    * know they're still around when gc_free_all_unreferenced_* are
2764:    GC_VERBOSE_DO(fprintf(stderr, "| destruct: %d things really freed\n",    obj_count - num_objects));    - #ifdef PIKE_DEBUG +     if (gc_debug) {    unsigned n;    Pike_in_gc=GC_PASS_POSTTOUCH;
2778: Inside #if defined(PIKE_DEBUG)
   Pike_fatal("Object count wrong after gc; expected %d, got %d.\n", num_objects, n);    GC_VERBOSE_DO(fprintf(stderr, "| posttouch: %u things\n", n));    } + #ifdef PIKE_DEBUG    if (gc_extra_refs)    Pike_fatal("Lost track of %d extra refs to things in gc.\n", gc_extra_refs);    if(fatal_after_gc) Pike_fatal("%s", fatal_after_gc);
2811: Inside #if defined(PIKE_DEBUG)
     #ifdef PIKE_DEBUG    UNSET_ONERROR (uwp); -  if(GC_VERBOSE_DO(1 ||) t_flag) +  if (max_gc_frames > max_tot_gc_frames) max_tot_gc_frames = max_gc_frames; +  tot_cycle_checked += cycle_checked; +  tot_live_rec += live_rec, tot_frame_rot += frame_rot; + #endif +  +  if(GC_VERBOSE_DO(1 ||) gc_trace)    {   #ifdef HAVE_GETHRTIME    fprintf(stderr,
2823:    objs, start_num_objs);   #endif    } -  if (max_gc_frames > max_tot_gc_frames) max_tot_gc_frames = max_gc_frames; -  tot_cycle_checked += cycle_checked; -  tot_live_rec += live_rec, tot_frame_rot += frame_rot; - #endif +       #ifdef ALWAYS_GC    ADD_GC_CALLBACK();