[BACK]Return to alloc.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / gc

Diff for /OpenXM_contrib2/asir2000/gc/alloc.c between version 1.2 and 1.8

version 1.2, 2000/04/10 08:31:30 version 1.8, 2002/07/25 02:48:53
Line 16 
Line 16 
  */   */
   
   
 # include "gc_priv.h"  # include "private/gc_priv.h"
   
 # include <stdio.h>  # include <stdio.h>
 # ifndef MACOS  # if !defined(MACOS) && !defined(MSWINCE)
 #   include <signal.h>  #   include <signal.h>
 #   include <sys/types.h>  #   include <sys/types.h>
 # endif  # endif
   
 void GC_timerstart(),GC_timerstop();  
   
 /*  /*
  * Separate free lists are maintained for different sized objects   * Separate free lists are maintained for different sized objects
  * up to MAXOBJSZ.   * up to MAXOBJSZ.
Line 62  word GC_non_gc_bytes = 0;  /* Number of bytes not inte
Line 60  word GC_non_gc_bytes = 0;  /* Number of bytes not inte
 word GC_gc_no = 0;  word GC_gc_no = 0;
   
 #ifndef SMALL_CONFIG  #ifndef SMALL_CONFIG
   int GC_incremental = 0;    /* By default, stop the world.     */    int GC_incremental = 0;  /* By default, stop the world.       */
 #endif  #endif
   
   int GC_parallel = FALSE;   /* By default, parallel GC is off.   */
   
 int GC_full_freq = 19;     /* Every 20th collection is a full   */  int GC_full_freq = 19;     /* Every 20th collection is a full   */
                            /* collection, whether we need it    */                             /* collection, whether we need it    */
                            /* or not.                           */                             /* or not.                           */
Line 72  int GC_full_freq = 19;    /* Every 20th collection is 
Line 72  int GC_full_freq = 19;    /* Every 20th collection is 
 GC_bool GC_need_full_gc = FALSE;  GC_bool GC_need_full_gc = FALSE;
                            /* Need full GC do to heap growth.   */                             /* Need full GC do to heap growth.   */
   
 #define USED_HEAP_SIZE (GC_heapsize - GC_large_free_bytes)  
   
 word GC_used_heap_size_after_full = 0;  word GC_used_heap_size_after_full = 0;
   
 char * GC_copyright[] =  char * GC_copyright[] =
 {"Copyright 1988,1989 Hans-J. Boehm and Alan J. Demers ",  {"Copyright 1988,1989 Hans-J. Boehm and Alan J. Demers ",
 "Copyright (c) 1991-1995 by Xerox Corporation.  All rights reserved. ",  "Copyright (c) 1991-1995 by Xerox Corporation.  All rights reserved. ",
 "Copyright (c) 1996-1998 by Silicon Graphics.  All rights reserved. ",  "Copyright (c) 1996-1998 by Silicon Graphics.  All rights reserved. ",
   "Copyright (c) 1999-2001 by Hewlett-Packard Company.  All rights reserved. ",
 "THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY",  "THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY",
 " EXPRESSED OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.",  " EXPRESSED OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.",
 "See source code for details." };  "See source code for details." };
Line 93  extern signed_word GC_mem_found;  /* Number of reclaim
Line 92  extern signed_word GC_mem_found;  /* Number of reclaim
   
 GC_bool GC_dont_expand = 0;  GC_bool GC_dont_expand = 0;
   
 word GC_free_space_numerator = 1;  
 word GC_free_space_divisor = 3;  word GC_free_space_divisor = 3;
   word GC_free_space_numerator = 1;
   
 extern GC_bool GC_collection_in_progress();  extern GC_bool GC_collection_in_progress();
                 /* Collection is in progress, or was abandoned. */                  /* Collection is in progress, or was abandoned. */
   
   extern GC_bool GC_print_back_height;
   
 int GC_never_stop_func GC_PROTO((void)) { return(0); }  int GC_never_stop_func GC_PROTO((void)) { return(0); }
   
   unsigned long GC_time_limit = TIME_LIMIT;
   
 CLOCK_TYPE GC_start_time;       /* Time at which we stopped world.      */  CLOCK_TYPE GC_start_time;       /* Time at which we stopped world.      */
                                 /* used only in GC_timeout_stop_func.   */                                  /* used only in GC_timeout_stop_func.   */
   
 int GC_n_attempts = 0;          /* Number of attempts at finishing      */  int GC_n_attempts = 0;          /* Number of attempts at finishing      */
                                 /* collection within TIME_LIMIT         */                                  /* collection within GC_time_limit.     */
   
 #ifdef SMALL_CONFIG  #if defined(SMALL_CONFIG) || defined(NO_CLOCK)
 #   define GC_timeout_stop_func GC_never_stop_func  #   define GC_timeout_stop_func GC_never_stop_func
 #else  #else
   int GC_timeout_stop_func GC_PROTO((void))    int GC_timeout_stop_func GC_PROTO((void))
Line 119  int GC_n_attempts = 0;  /* Number of attempts at finis
Line 122  int GC_n_attempts = 0;  /* Number of attempts at finis
     if ((count++ & 3) != 0) return(0);      if ((count++ & 3) != 0) return(0);
     GET_TIME(current_time);      GET_TIME(current_time);
     time_diff = MS_TIME_DIFF(current_time,GC_start_time);      time_diff = MS_TIME_DIFF(current_time,GC_start_time);
     if (time_diff >= TIME_LIMIT) {      if (time_diff >= GC_time_limit) {
 #       ifdef PRINTSTATS  #       ifdef CONDPRINT
             if (GC_print_stats) {
             GC_printf0("Abandoning stopped marking after ");              GC_printf0("Abandoning stopped marking after ");
             GC_printf1("%lu msecs", (unsigned long)time_diff);              GC_printf1("%lu msecs", (unsigned long)time_diff);
             GC_printf1("(attempt %d)\n", (unsigned long) GC_n_attempts);              GC_printf1("(attempt %d)\n", (unsigned long) GC_n_attempts);
             }
 #       endif  #       endif
         return(1);          return(1);
     }      }
Line 154  static word min_words_allocd()
Line 159  static word min_words_allocd()
                                + (GC_large_free_bytes >> 2)                                 + (GC_large_free_bytes >> 2)
                                    /* use a bit more of large empty heap */                                     /* use a bit more of large empty heap */
                                + total_root_size);                                 + total_root_size);
     if (GC_incremental) {      if (TRUE_INCREMENTAL) {
         return (scan_size*GC_free_space_numerator) / (2 * GC_free_space_divisor);          return scan_size * GC_free_space_numerator / (2 * GC_free_space_divisor);
     } else {      } else {
         return (scan_size*GC_free_space_numerator) / GC_free_space_divisor;          return scan_size * GC_free_space_numerator / GC_free_space_divisor;
     }      }
 }  }
   
Line 176  word GC_adj_words_allocd()
Line 181  word GC_adj_words_allocd()
     /* managed object should not alter result, assuming the client      */      /* managed object should not alter result, assuming the client      */
     /* is playing by the rules.                                         */      /* is playing by the rules.                                         */
     result = (signed_word)GC_words_allocd      result = (signed_word)GC_words_allocd
              - (signed_word)GC_mem_freed - expl_managed;               - (signed_word)GC_mem_freed
                + (signed_word)GC_finalizer_mem_freed - expl_managed;
     if (result > (signed_word)GC_words_allocd) {      if (result > (signed_word)GC_words_allocd) {
         result = GC_words_allocd;          result = GC_words_allocd;
         /* probably client bug or unfortunate scheduling */          /* probably client bug or unfortunate scheduling */
Line 225  GC_bool GC_should_collect()
Line 231  GC_bool GC_should_collect()
   
 void GC_notify_full_gc()  void GC_notify_full_gc()
 {  {
     if (GC_start_call_back != (void (*)())0) {      if (GC_start_call_back != (void (*) GC_PROTO((void)))0) {
         (*GC_start_call_back)();          (*GC_start_call_back)();
     }      }
 }  }
Line 248  void GC_maybe_gc()
Line 254  void GC_maybe_gc()
             GC_gcollect_inner();              GC_gcollect_inner();
             n_partial_gcs = 0;              n_partial_gcs = 0;
             return;              return;
         } else if (GC_need_full_gc || n_partial_gcs >= GC_full_freq) {          } else {
 #           ifdef PRINTSTATS  #         ifdef PARALLEL_MARK
               GC_printf2(              GC_wait_for_reclaim();
                 "***>Full mark for collection %lu after %ld allocd bytes\n",  #         endif
                 (unsigned long) GC_gc_no+1,            if (GC_need_full_gc || n_partial_gcs >= GC_full_freq) {
                 (long)WORDS_TO_BYTES(GC_words_allocd));  #           ifdef CONDPRINT
                 if (GC_print_stats) {
                   GC_printf2(
                     "***>Full mark for collection %lu after %ld allocd bytes\n",
                     (unsigned long) GC_gc_no+1,
                     (long)WORDS_TO_BYTES(GC_words_allocd));
                 }
 #           endif  #           endif
             GC_promote_black_lists();              GC_promote_black_lists();
             (void)GC_reclaim_all((GC_stop_func)0, TRUE);              (void)GC_reclaim_all((GC_stop_func)0, TRUE);
Line 261  void GC_maybe_gc()
Line 273  void GC_maybe_gc()
             n_partial_gcs = 0;              n_partial_gcs = 0;
             GC_notify_full_gc();              GC_notify_full_gc();
             GC_is_full_gc = TRUE;              GC_is_full_gc = TRUE;
         } else {            } else {
             n_partial_gcs++;              n_partial_gcs++;
         }            }
           }
         /* We try to mark with the world stopped.       */          /* We try to mark with the world stopped.       */
         /* If we run out of time, this turns into       */          /* If we run out of time, this turns into       */
         /* incremental marking.                 */          /* incremental marking.                 */
         GET_TIME(GC_start_time);  #       ifndef NO_CLOCK
         if (GC_stopped_mark(GC_timeout_stop_func)) {            if (GC_time_limit != GC_TIME_UNLIMITED) { GET_TIME(GC_start_time); }
   #       endif
           if (GC_stopped_mark(GC_time_limit == GC_TIME_UNLIMITED?
                               GC_never_stop_func : GC_timeout_stop_func)) {
 #           ifdef SAVE_CALL_CHAIN  #           ifdef SAVE_CALL_CHAIN
                 GC_save_callers(GC_last_stack);                  GC_save_callers(GC_last_stack);
 #           endif  #           endif
Line 290  void GC_maybe_gc()
Line 306  void GC_maybe_gc()
 GC_bool GC_try_to_collect_inner(stop_func)  GC_bool GC_try_to_collect_inner(stop_func)
 GC_stop_func stop_func;  GC_stop_func stop_func;
 {  {
   #   ifdef CONDPRINT
           CLOCK_TYPE start_time, current_time;
   #   endif
     if (GC_incremental && GC_collection_in_progress()) {      if (GC_incremental && GC_collection_in_progress()) {
 #   ifdef PRINTSTATS  #   ifdef CONDPRINT
         if (GC_print_stats) {
         GC_printf0(          GC_printf0(
             "GC_try_to_collect_inner: finishing collection in progress\n");              "GC_try_to_collect_inner: finishing collection in progress\n");
 #    endif /* PRINTSTATS */        }
   #   endif /* CONDPRINT */
       /* Just finish collection already in progress.    */        /* Just finish collection already in progress.    */
         while(GC_collection_in_progress()) {          while(GC_collection_in_progress()) {
             if (stop_func()) return(FALSE);              if (stop_func()) return(FALSE);
             GC_collect_a_little_inner(1);              GC_collect_a_little_inner(1);
         }          }
     }      }
 #   ifdef PRINTSTATS  #   ifdef CONDPRINT
         if (GC_print_stats) {
           if (GC_print_stats) GET_TIME(start_time);
         GC_printf2(          GC_printf2(
            "Initiating full world-stop collection %lu after %ld allocd bytes\n",             "Initiating full world-stop collection %lu after %ld allocd bytes\n",
            (unsigned long) GC_gc_no+1,             (unsigned long) GC_gc_no+1,
            (long)WORDS_TO_BYTES(GC_words_allocd));             (long)WORDS_TO_BYTES(GC_words_allocd));
         }
 #   endif  #   endif
     GC_promote_black_lists();      GC_promote_black_lists();
     /* Make sure all blocks have been reclaimed, so sweep routines      */      /* Make sure all blocks have been reclaimed, so sweep routines      */
     /* don't see cleared mark bits.                                     */      /* don't see cleared mark bits.                                     */
     /* If we're guaranteed to finish, then this is unnecessary.         */      /* If we're guaranteed to finish, then this is unnecessary.         */
         if (stop_func != GC_never_stop_func      /* In the find_leak case, we have to finish to guarantee that       */
       /* previously unmarked objects are not reported as leaks.           */
   #       ifdef PARALLEL_MARK
               GC_wait_for_reclaim();
   #       endif
           if ((GC_find_leak || stop_func != GC_never_stop_func)
             && !GC_reclaim_all(stop_func, FALSE)) {              && !GC_reclaim_all(stop_func, FALSE)) {
             /* Aborted.  So far everything is still consistent. */              /* Aborted.  So far everything is still consistent. */
             return(FALSE);              return(FALSE);
Line 334  GC_stop_func stop_func;
Line 363  GC_stop_func stop_func;
       return(FALSE);        return(FALSE);
     }      }
     GC_finish_collection();      GC_finish_collection();
   #   if defined(CONDPRINT)
         if (GC_print_stats) {
           GET_TIME(current_time);
           GC_printf1("Complete collection took %lu msecs\n",
                      MS_TIME_DIFF(current_time,start_time));
         }
   #   endif
     return(TRUE);      return(TRUE);
 }  }
   
Line 349  GC_stop_func stop_func;
Line 385  GC_stop_func stop_func;
 # define GC_RATE 10  # define GC_RATE 10
 # define MAX_PRIOR_ATTEMPTS 1  # define MAX_PRIOR_ATTEMPTS 1
         /* Maximum number of prior attempts at world stop marking       */          /* Maximum number of prior attempts at world stop marking       */
         /* A value of 1 means that we finish the seconf time, no matter */          /* A value of 1 means that we finish the second time, no matter */
         /* how long it takes.  Doesn't count the initial root scan      */          /* how long it takes.  Doesn't count the initial root scan      */
         /* for a full GC.                                               */          /* for a full GC.                                               */
   
Line 368  int n;
Line 404  int n;
 #               ifdef SAVE_CALL_CHAIN  #               ifdef SAVE_CALL_CHAIN
                     GC_save_callers(GC_last_stack);                      GC_save_callers(GC_last_stack);
 #               endif  #               endif
                 if (GC_n_attempts < MAX_PRIOR_ATTEMPTS) {  #               ifdef PARALLEL_MARK
                       GC_wait_for_reclaim();
   #               endif
                   if (GC_n_attempts < MAX_PRIOR_ATTEMPTS
                       && GC_time_limit != GC_TIME_UNLIMITED) {
                   GET_TIME(GC_start_time);                    GET_TIME(GC_start_time);
                   if (!GC_stopped_mark(GC_timeout_stop_func)) {                    if (!GC_stopped_mark(GC_timeout_stop_func)) {
                     GC_n_attempts++;                      GC_n_attempts++;
Line 399  int GC_collect_a_little GC_PROTO(())
Line 439  int GC_collect_a_little GC_PROTO(())
     result = (int)GC_collection_in_progress();      result = (int)GC_collection_in_progress();
     UNLOCK();      UNLOCK();
     ENABLE_SIGNALS();      ENABLE_SIGNALS();
       if (!result && GC_debugging_started) GC_print_all_smashed();
     return(result);      return(result);
 }  }
   
Line 413  GC_stop_func stop_func;
Line 454  GC_stop_func stop_func;
 {  {
     register int i;      register int i;
     int dummy;      int dummy;
 #   ifdef PRINTSTATS  #   if defined(PRINTTIMES) || defined(CONDPRINT)
         CLOCK_TYPE start_time, current_time;          CLOCK_TYPE start_time, current_time;
 #   endif  #   endif
   
     STOP_WORLD();  #   ifdef PRINTTIMES
         GC_timerstart();  
 #   ifdef PRINTSTATS  
         GET_TIME(start_time);          GET_TIME(start_time);
   #   endif
   #   if defined(CONDPRINT) && !defined(PRINTTIMES)
           if (GC_print_stats) GET_TIME(start_time);
   #   endif
       GC_timerstart();
       STOP_WORLD();
   #   ifdef CONDPRINT
         if (GC_print_stats) {
         GC_printf1("--> Marking for collection %lu ",          GC_printf1("--> Marking for collection %lu ",
                    (unsigned long) GC_gc_no + 1);                     (unsigned long) GC_gc_no + 1);
         GC_printf2("after %lu allocd bytes + %lu wasted bytes\n",          GC_printf2("after %lu allocd bytes + %lu wasted bytes\n",
                    (unsigned long) WORDS_TO_BYTES(GC_words_allocd),                     (unsigned long) WORDS_TO_BYTES(GC_words_allocd),
                    (unsigned long) WORDS_TO_BYTES(GC_words_wasted));                     (unsigned long) WORDS_TO_BYTES(GC_words_wasted));
         }
 #   endif  #   endif
   #   ifdef MAKE_BACK_GRAPH
         if (GC_print_back_height) {
           GC_build_back_graph();
         }
   #   endif
   
     /* Mark from all roots.  */      /* Mark from all roots.  */
         /* Minimize junk left in my registers and on the stack */          /* Minimize junk left in my registers and on the stack */
Line 435  GC_stop_func stop_func;
Line 488  GC_stop_func stop_func;
         GC_initiate_gc();          GC_initiate_gc();
         for(i = 0;;i++) {          for(i = 0;;i++) {
             if ((*stop_func)()) {              if ((*stop_func)()) {
 #                   ifdef PRINTSTATS  #                   ifdef CONDPRINT
                         if (GC_print_stats) {
                         GC_printf0("Abandoned stopped marking after ");                          GC_printf0("Abandoned stopped marking after ");
                         GC_printf1("%lu iterations\n",                          GC_printf1("%lu iterations\n",
                                    (unsigned long)i);                                     (unsigned long)i);
                         }
 #                   endif  #                   endif
                         GC_timerstop();  
                     GC_deficit = i; /* Give the mutator a chance. */                      GC_deficit = i; /* Give the mutator a chance. */
                     START_WORLD();                      START_WORLD();
                           GC_timerstop();
                     return(FALSE);                      return(FALSE);
             }              }
             if (GC_mark_some((ptr_t)(&dummy))) break;              if (GC_mark_some((ptr_t)(&dummy))) break;
Line 453  GC_stop_func stop_func;
Line 508  GC_stop_func stop_func;
       GC_printf2("Collection %lu reclaimed %ld bytes",        GC_printf2("Collection %lu reclaimed %ld bytes",
                   (unsigned long) GC_gc_no - 1,                    (unsigned long) GC_gc_no - 1,
                   (long)WORDS_TO_BYTES(GC_mem_found));                    (long)WORDS_TO_BYTES(GC_mem_found));
       GC_printf1(" ---> heapsize = %lu bytes\n",  #   else
                 (unsigned long) GC_heapsize);  #     ifdef CONDPRINT
       /* Printf arguments may be pushed in funny places.  Clear the     */          if (GC_print_stats) {
       /* space.                                                         */            GC_printf1("Collection %lu finished", (unsigned long) GC_gc_no - 1);
       GC_printf0("");          }
 #   endif  #     endif
   #   endif /* !PRINTSTATS */
   #   ifdef CONDPRINT
         if (GC_print_stats) {
           GC_printf1(" ---> heapsize = %lu bytes\n",
                      (unsigned long) GC_heapsize);
           /* Printf arguments may be pushed in funny places.  Clear the   */
           /* space.                                                       */
           GC_printf0("");
         }
   #   endif  /* CONDPRINT  */
   
     /* Check all debugged objects for consistency */      /* Check all debugged objects for consistency */
         if (GC_debugging_started) {          if (GC_debugging_started) {
             (*GC_check_heap)();              (*GC_check_heap)();
         }          }
   
       START_WORLD();
       GC_timerstop();
 #   ifdef PRINTTIMES  #   ifdef PRINTTIMES
         GET_TIME(current_time);          GET_TIME(current_time);
         GC_printf1("World-stopped marking took %lu msecs\n",          GC_printf1("World-stopped marking took %lu msecs\n",
                    MS_TIME_DIFF(current_time,start_time));                     MS_TIME_DIFF(current_time,start_time));
   #   else
   #     ifdef CONDPRINT
           if (GC_print_stats) {
             GET_TIME(current_time);
             GC_printf1("World-stopped marking took %lu msecs\n",
                        MS_TIME_DIFF(current_time,start_time));
           }
   #     endif
 #   endif  #   endif
         GC_timerstop();  
     START_WORLD();  
     return(TRUE);      return(TRUE);
 }  }
   
   /* Set all mark bits for the free list whose first entry is q   */
   #ifdef __STDC__
     void GC_set_fl_marks(ptr_t q)
   #else
     void GC_set_fl_marks(q)
     ptr_t q;
   #endif
   {
      ptr_t p;
      struct hblk * h, * last_h = 0;
      hdr *hhdr;
      int word_no;
   
      for (p = q; p != 0; p = obj_link(p)){
           h = HBLKPTR(p);
           if (h != last_h) {
             last_h = h;
             hhdr = HDR(h);
           }
           word_no = (((word *)p) - ((word *)h));
           set_mark_bit_from_hdr(hhdr, word_no);
      }
   }
   
   /* Clear all mark bits for the free list whose first entry is q */
   /* Decrement GC_mem_found by number of words on free list.      */
   #ifdef __STDC__
     void GC_clear_fl_marks(ptr_t q)
   #else
     void GC_clear_fl_marks(q)
     ptr_t q;
   #endif
   {
      ptr_t p;
      struct hblk * h, * last_h = 0;
      hdr *hhdr;
      int word_no;
   
      for (p = q; p != 0; p = obj_link(p)){
           h = HBLKPTR(p);
           if (h != last_h) {
             last_h = h;
             hhdr = HDR(h);
           }
           word_no = (((word *)p) - ((word *)h));
           clear_mark_bit_from_hdr(hhdr, word_no);
   #       ifdef GATHERSTATS
               GC_mem_found -= hhdr -> hb_sz;
   #       endif
      }
   }
   
 /* Finish up a collection.  Assumes lock is held, signals are disabled, */  /* Finish up a collection.  Assumes lock is held, signals are disabled, */
 /* but the world is otherwise running.                                  */  /* but the world is otherwise running.                                  */
 void GC_finish_collection()  void GC_finish_collection()
Line 493  void GC_finish_collection()
Line 617  void GC_finish_collection()
 #   ifdef GATHERSTATS  #   ifdef GATHERSTATS
         GC_mem_found = 0;          GC_mem_found = 0;
 #   endif  #   endif
   #   if defined(LINUX) && defined(__ELF__) && !defined(SMALL_CONFIG)
           if (getenv("GC_PRINT_ADDRESS_MAP") != 0) {
             GC_print_address_map();
           }
   #   endif
     if (GC_find_leak) {      if (GC_find_leak) {
       /* Mark all objects on the free list.  All objects should be */        /* Mark all objects on the free list.  All objects should be */
       /* marked when we're done.                                   */        /* marked when we're done.                                   */
         {          {
           register word size;           /* current object size          */            register word size;           /* current object size          */
           register ptr_t p;     /* pointer to current object    */  
           register struct hblk * h;     /* pointer to block containing *p */  
           register hdr * hhdr;  
           register int word_no;           /* "index" of *p in *q          */  
           int kind;            int kind;
             ptr_t q;
   
           for (kind = 0; kind < GC_n_kinds; kind++) {            for (kind = 0; kind < GC_n_kinds; kind++) {
             for (size = 1; size <= MAXOBJSZ; size++) {              for (size = 1; size <= MAXOBJSZ; size++) {
               for (p= GC_obj_kinds[kind].ok_freelist[size];                q = GC_obj_kinds[kind].ok_freelist[size];
                    p != 0; p=obj_link(p)){                if (q != 0) GC_set_fl_marks(q);
                 h = HBLKPTR(p);  
                 hhdr = HDR(h);  
                 word_no = (((word *)p) - ((word *)h));  
                 set_mark_bit_from_hdr(hhdr, word_no);  
               }  
             }              }
           }            }
         }          }
Line 529  void GC_finish_collection()
Line 650  void GC_finish_collection()
       GET_TIME(finalize_time);        GET_TIME(finalize_time);
 #   endif  #   endif
   
       if (GC_print_back_height) {
   #     ifdef MAKE_BACK_GRAPH
           GC_traverse_back_graph();
   #     else
   #       ifndef SMALL_CONFIG
             GC_err_printf0("Back height not available: "
                            "Rebuild collector with -DMAKE_BACK_GRAPH\n");
   #       endif
   #     endif
       }
   
     /* Clear free list mark bits, in case they got accidentally marked   */      /* Clear free list mark bits, in case they got accidentally marked   */
     /* Note: HBLKPTR(p) == pointer to head of block containing *p        */      /* (or GC_find_leak is set and they were intentionally marked).      */
     /* (or GC_find_leak is set and they were intentionally marked.)      */  
     /* Also subtract memory remaining from GC_mem_found count.           */      /* Also subtract memory remaining from GC_mem_found count.           */
     /* Note that composite objects on free list are cleared.             */      /* Note that composite objects on free list are cleared.             */
     /* Thus accidentally marking a free list is not a problem;  only     */      /* Thus accidentally marking a free list is not a problem;  only     */
     /* objects on the list itself will be marked, and that's fixed here. */      /* objects on the list itself will be marked, and that's fixed here. */
       {        {
         register word size;             /* current object size          */          register word size;             /* current object size          */
         register ptr_t p;       /* pointer to current object    */          register ptr_t q;       /* pointer to current object    */
         register struct hblk * h;       /* pointer to block containing *p */  
         register hdr * hhdr;  
         register int word_no;           /* "index" of *p in *q          */  
         int kind;          int kind;
   
         for (kind = 0; kind < GC_n_kinds; kind++) {          for (kind = 0; kind < GC_n_kinds; kind++) {
           for (size = 1; size <= MAXOBJSZ; size++) {            for (size = 1; size <= MAXOBJSZ; size++) {
             for (p= GC_obj_kinds[kind].ok_freelist[size];              q = GC_obj_kinds[kind].ok_freelist[size];
                  p != 0; p=obj_link(p)){              if (q != 0) GC_clear_fl_marks(q);
                 h = HBLKPTR(p);  
                 hhdr = HDR(h);  
                 word_no = (((word *)p) - ((word *)h));  
                 clear_mark_bit_from_hdr(hhdr, word_no);  
 #               ifdef GATHERSTATS  
                     GC_mem_found -= size;  
 #               endif  
             }  
           }            }
         }          }
       }        }
Line 598  void GC_finish_collection()
Line 718  void GC_finish_collection()
       GC_words_allocd = 0;        GC_words_allocd = 0;
       GC_words_wasted = 0;        GC_words_wasted = 0;
       GC_mem_freed = 0;        GC_mem_freed = 0;
         GC_finalizer_mem_freed = 0;
   
 #   ifdef USE_MUNMAP  #   ifdef USE_MUNMAP
       GC_unmap_old();        GC_unmap_old();
Line 622  void GC_finish_collection()
Line 743  void GC_finish_collection()
     int result;      int result;
     DCL_LOCK_STATE;      DCL_LOCK_STATE;
   
       if (GC_debugging_started) GC_print_all_smashed();
     GC_INVOKE_FINALIZERS();      GC_INVOKE_FINALIZERS();
     DISABLE_SIGNALS();      DISABLE_SIGNALS();
     LOCK();      LOCK();
Line 633  void GC_finish_collection()
Line 755  void GC_finish_collection()
     EXIT_GC();      EXIT_GC();
     UNLOCK();      UNLOCK();
     ENABLE_SIGNALS();      ENABLE_SIGNALS();
     if(result) GC_INVOKE_FINALIZERS();      if(result) {
           if (GC_debugging_started) GC_print_all_smashed();
           GC_INVOKE_FINALIZERS();
       }
     return(result);      return(result);
 }  }
   
Line 659  word bytes;
Line 784  word bytes;
     if (GC_n_heap_sects >= MAX_HEAP_SECTS) {      if (GC_n_heap_sects >= MAX_HEAP_SECTS) {
         ABORT("Too many heap sections: Increase MAXHINCR or MAX_HEAP_SECTS");          ABORT("Too many heap sections: Increase MAXHINCR or MAX_HEAP_SECTS");
     }      }
     if (!GC_install_header(p)) {      phdr = GC_install_header(p);
       if (0 == phdr) {
         /* This is extremely unlikely. Can't add it.  This will         */          /* This is extremely unlikely. Can't add it.  This will         */
         /* almost certainly result in a 0 return from the allocator,    */          /* almost certainly result in a 0 return from the allocator,    */
         /* which is entirely appropriate.                               */          /* which is entirely appropriate.                               */
Line 668  word bytes;
Line 794  word bytes;
     GC_heap_sects[GC_n_heap_sects].hs_start = (ptr_t)p;      GC_heap_sects[GC_n_heap_sects].hs_start = (ptr_t)p;
     GC_heap_sects[GC_n_heap_sects].hs_bytes = bytes;      GC_heap_sects[GC_n_heap_sects].hs_bytes = bytes;
     GC_n_heap_sects++;      GC_n_heap_sects++;
     words = BYTES_TO_WORDS(bytes - HDR_BYTES);      words = BYTES_TO_WORDS(bytes);
     phdr = HDR(p);  
     phdr -> hb_sz = words;      phdr -> hb_sz = words;
     phdr -> hb_map = (char *)1;   /* A value != GC_invalid_map  */      phdr -> hb_map = (unsigned char *)1;   /* A value != GC_invalid_map */
     phdr -> hb_flags = 0;      phdr -> hb_flags = 0;
     GC_freehblk(p);      GC_freehblk(p);
     GC_heapsize += bytes;      GC_heapsize += bytes;
     if ((ptr_t)p <= GC_least_plausible_heap_addr      if ((ptr_t)p <= (ptr_t)GC_least_plausible_heap_addr
         || GC_least_plausible_heap_addr == 0) {          || GC_least_plausible_heap_addr == 0) {
         GC_least_plausible_heap_addr = (ptr_t)p - sizeof(word);          GC_least_plausible_heap_addr = (GC_PTR)((ptr_t)p - sizeof(word));
                 /* Making it a little smaller than necessary prevents   */                  /* Making it a little smaller than necessary prevents   */
                 /* us from getting a false hit from the variable        */                  /* us from getting a false hit from the variable        */
                 /* itself.  There's some unintentional reflection       */                  /* itself.  There's some unintentional reflection       */
                 /* here.                                                */                  /* here.                                                */
     }      }
     if ((ptr_t)p + bytes >= GC_greatest_plausible_heap_addr) {      if ((ptr_t)p + bytes >= (ptr_t)GC_greatest_plausible_heap_addr) {
         GC_greatest_plausible_heap_addr = (ptr_t)p + bytes;          GC_greatest_plausible_heap_addr = (GC_PTR)((ptr_t)p + bytes);
     }      }
 }  }
   
Line 711  void GC_print_heap_sects()
Line 836  void GC_print_heap_sects()
 }  }
 # endif  # endif
   
 ptr_t GC_least_plausible_heap_addr = (ptr_t)ONES;  GC_PTR GC_least_plausible_heap_addr = (GC_PTR)ONES;
 ptr_t GC_greatest_plausible_heap_addr = 0;  GC_PTR GC_greatest_plausible_heap_addr = 0;
   
 ptr_t GC_max(x,y)  ptr_t GC_max(x,y)
 ptr_t x, y;  ptr_t x, y;
Line 768  word n;
Line 893  word n;
     }      }
     space = GET_MEM(bytes);      space = GET_MEM(bytes);
     if( space == 0 ) {      if( space == 0 ) {
   #       ifdef CONDPRINT
             if (GC_print_stats) {
               GC_printf1("Failed to expand heap by %ld bytes\n",
                          (unsigned long)bytes);
             }
   #       endif
         return(FALSE);          return(FALSE);
     }      }
 #   ifdef PRINTSTATS  #   ifdef CONDPRINT
         if (GC_print_stats) {
         GC_printf2("Increasing heap size by %lu after %lu allocated bytes\n",          GC_printf2("Increasing heap size by %lu after %lu allocated bytes\n",
                    (unsigned long)bytes,                     (unsigned long)bytes,
                    (unsigned long)WORDS_TO_BYTES(GC_words_allocd));                     (unsigned long)WORDS_TO_BYTES(GC_words_allocd));
Line 779  word n;
Line 911  word n;
           GC_print_block_list(); GC_print_hblkfreelist();            GC_print_block_list(); GC_print_hblkfreelist();
           GC_printf0("\n");            GC_printf0("\n");
 #       endif  #       endif
         }
 #   endif  #   endif
     expansion_slop = 8 * WORDS_TO_BYTES(min_words_allocd());      expansion_slop = 8 * WORDS_TO_BYTES(min_words_allocd());
     if (5 * HBLKSIZE * MAXHINCR > expansion_slop) {      if (5 * HBLKSIZE * MAXHINCR > expansion_slop) {
Line 821  word n;
Line 954  word n;
     LOCK();      LOCK();
     if (!GC_is_initialized) GC_init_inner();      if (!GC_is_initialized) GC_init_inner();
     result = (int)GC_expand_hp_inner(divHBLKSZ((word)bytes));      result = (int)GC_expand_hp_inner(divHBLKSZ((word)bytes));
       if (result) GC_requested_heapsize += bytes;
     UNLOCK();      UNLOCK();
     ENABLE_SIGNALS();      ENABLE_SIGNALS();
     return(result);      return(result);
Line 834  GC_bool GC_collect_or_expand(needed_blocks, ignore_off
Line 968  GC_bool GC_collect_or_expand(needed_blocks, ignore_off
 word needed_blocks;  word needed_blocks;
 GC_bool ignore_off_page;  GC_bool ignore_off_page;
 {  {
     if (!GC_incremental && !GC_dont_gc && GC_should_collect()) {      if (!GC_incremental && !GC_dont_gc &&
           (GC_dont_expand && GC_words_allocd > 0 || GC_should_collect())) {
       GC_notify_full_gc();        GC_notify_full_gc();
       GC_gcollect_inner();        GC_gcollect_inner();
     } else {      } else {
       word blocks_to_get = (GC_heapsize*GC_free_space_numerator)/(HBLKSIZE*GC_free_space_divisor)        word blocks_to_get = GC_heapsize/(HBLKSIZE*GC_free_space_divisor)
                            + needed_blocks;                             + needed_blocks;
   
       if (blocks_to_get > MAXHINCR) {        if (blocks_to_get > MAXHINCR) {
Line 863  GC_bool ignore_off_page;
Line 998  GC_bool ignore_off_page;
             GC_notify_full_gc();              GC_notify_full_gc();
             GC_gcollect_inner();              GC_gcollect_inner();
         } else {          } else {
             WARN("Out of Memory!  Returning NIL!\n", 0);  #           if !defined(AMIGA) || !defined(GC_AMIGA_FASTALLOC)
                 WARN("Out of Memory!  Returning NIL!\n", 0);
   #           endif
             return(FALSE);              return(FALSE);
         }          }
       } else {        } else {
 #         ifdef PRINTSTATS  #         ifdef CONDPRINT
             if (GC_fail_count) {              if (GC_fail_count && GC_print_stats) {
               GC_printf0("Memory available again ...\n");                GC_printf0("Memory available again ...\n");
             }              }
 #         endif  #         endif
Line 888  ptr_t GC_allocobj(sz, kind)
Line 1025  ptr_t GC_allocobj(sz, kind)
 word sz;  word sz;
 int kind;  int kind;
 {  {
     register ptr_t * flh = &(GC_obj_kinds[kind].ok_freelist[sz]);      ptr_t * flh = &(GC_obj_kinds[kind].ok_freelist[sz]);
       GC_bool tried_minor = FALSE;
   
     if (sz == 0) return(0);      if (sz == 0) return(0);
   
Line 910  int kind;
Line 1048  int kind;
     while (*flh == 0) {      while (*flh == 0) {
       ENTER_GC();        ENTER_GC();
       /* Do our share of marking work */        /* Do our share of marking work */
         if(GC_incremental && !GC_dont_gc) GC_collect_a_little_inner(1);          if(TRUE_INCREMENTAL && !GC_dont_gc) GC_collect_a_little_inner(1);
       /* Sweep blocks for objects of this size */        /* Sweep blocks for objects of this size */
           GC_continue_reclaim(sz, kind);          GC_continue_reclaim(sz, kind);
       EXIT_GC();        EXIT_GC();
       if (*flh == 0) {        if (*flh == 0) {
         GC_new_hblk(sz, kind);          GC_new_hblk(sz, kind);
       }        }
       if (*flh == 0) {        if (*flh == 0) {
         ENTER_GC();          ENTER_GC();
         if (!GC_collect_or_expand((word)1,FALSE)) {          if (GC_incremental && GC_time_limit == GC_TIME_UNLIMITED
               && ! tried_minor ) {
               GC_collect_a_little_inner(1);
               tried_minor = TRUE;
           } else {
             if (!GC_collect_or_expand((word)1,FALSE)) {
             EXIT_GC();              EXIT_GC();
             return(0);              return(0);
             }
         }          }
         EXIT_GC();          EXIT_GC();
       }        }
Legend:
Removed from v.1.2  
changed lines
  Added in v.1.8
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>