[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.1.1.1 and 1.4

version 1.1.1.1, 1999/12/03 07:39:09 version 1.4, 2001/04/20 07:39:18
Line 1 
Line 1 
 /*  /*
  * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers   * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
  * Copyright (c) 1991-1994 by Xerox Corporation.  All rights reserved.   * Copyright (c) 1991-1996 by Xerox Corporation.  All rights reserved.
  * Copyright (c) 1998 by Silicon Graphics.  All rights reserved.   * Copyright (c) 1998 by Silicon Graphics.  All rights reserved.
    * Copyright (c) 1999 by Hewlett-Packard Company. All rights reserved.
  *   *
  * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED   * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
  * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.   * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
Line 15 
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
Line 61  word GC_non_gc_bytes = 0;  /* Number of bytes not inte
Line 62  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_full_freq = 4;      /* Every 5th collection is a full    */  int GC_parallel = FALSE;   /* By default, parallel GC is off.   */
                            /* collection.                       */  
   
   int GC_full_freq = 19;     /* Every 20th collection is a full   */
                              /* collection, whether we need it    */
                              /* or not.                           */
   
   GC_bool GC_need_full_gc = FALSE;
                              /* Need full GC do to heap growth.   */
   
   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-2000 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 111  int GC_n_attempts = 0;  /* Number of attempts at finis
Line 121  int GC_n_attempts = 0;  /* Number of attempts at finis
     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 >= 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 213  GC_bool GC_should_collect()
Line 225  GC_bool GC_should_collect()
     return(GC_adj_words_allocd() >= min_words_allocd());      return(GC_adj_words_allocd() >= min_words_allocd());
 }  }
   
   
 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)();
     }      }
 }  }
   
   GC_bool GC_is_full_gc = FALSE;
   
 /*  /*
  * Initiate a garbage collection if appropriate.   * Initiate a garbage collection if appropriate.
  * Choose judiciously   * Choose judiciously
Line 229  void GC_notify_full_gc()
Line 244  void GC_notify_full_gc()
 void GC_maybe_gc()  void GC_maybe_gc()
 {  {
     static int n_partial_gcs = 0;      static int n_partial_gcs = 0;
     GC_bool is_full_gc = FALSE;  
   
     if (GC_should_collect()) {      if (GC_should_collect()) {
         if (!GC_incremental) {          if (!GC_incremental) {
Line 237  void GC_maybe_gc()
Line 251  void GC_maybe_gc()
             GC_gcollect_inner();              GC_gcollect_inner();
             n_partial_gcs = 0;              n_partial_gcs = 0;
             return;              return;
         } else if (n_partial_gcs >= GC_full_freq) {          } else if (GC_need_full_gc || n_partial_gcs >= GC_full_freq) {
 #           ifdef PRINTSTATS  #           ifdef CONDPRINT
               GC_printf2(                if (GC_print_stats) {
                 "***>Full mark for collection %lu after %ld allocd bytes\n",                  GC_printf2(
                 (unsigned long) GC_gc_no+1,                    "***>Full mark for collection %lu after %ld allocd bytes\n",
                 (long)WORDS_TO_BYTES(GC_words_allocd));                    (unsigned long) GC_gc_no+1,
                     (long)WORDS_TO_BYTES(GC_words_allocd));
                 }
 #           endif  #           endif
             GC_promote_black_lists();              GC_promote_black_lists();
   #           ifdef PARALLEL_MARK
                   GC_wait_for_reclaim();
   #           endif
             (void)GC_reclaim_all((GC_stop_func)0, TRUE);              (void)GC_reclaim_all((GC_stop_func)0, TRUE);
             GC_clear_marks();              GC_clear_marks();
             n_partial_gcs = 0;              n_partial_gcs = 0;
             GC_notify_full_gc();              GC_notify_full_gc();
             is_full_gc = TRUE;              GC_is_full_gc = TRUE;
         } else {          } else {
             n_partial_gcs++;              n_partial_gcs++;
         }          }
Line 263  void GC_maybe_gc()
Line 282  void GC_maybe_gc()
 #           endif  #           endif
             GC_finish_collection();              GC_finish_collection();
         } else {          } else {
             if (!is_full_gc) {              if (!GC_is_full_gc) {
                 /* Count this as the first attempt */                  /* Count this as the first attempt */
                 GC_n_attempts++;                  GC_n_attempts++;
             }              }
Line 280  GC_bool GC_try_to_collect_inner(stop_func)
Line 299  GC_bool GC_try_to_collect_inner(stop_func)
 GC_stop_func stop_func;  GC_stop_func stop_func;
 {  {
     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) {
         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 310  GC_stop_func stop_func;
Line 338  GC_stop_func stop_func;
 #   ifdef SAVE_CALL_CHAIN  #   ifdef SAVE_CALL_CHAIN
         GC_save_callers(GC_last_stack);          GC_save_callers(GC_last_stack);
 #   endif  #   endif
       GC_is_full_gc = TRUE;
     if (!GC_stopped_mark(stop_func)) {      if (!GC_stopped_mark(stop_func)) {
       if (!GC_incremental) {        if (!GC_incremental) {
         /* We're partially done and have no way to complete or use      */          /* We're partially done and have no way to complete or use      */
Line 401  GC_stop_func stop_func;
Line 430  GC_stop_func stop_func;
 {  {
     register int i;      register int i;
     int dummy;      int dummy;
 #   ifdef PRINTSTATS  #   ifdef PRINTTIMES
         CLOCK_TYPE start_time, current_time;          CLOCK_TYPE start_time, current_time;
 #   endif  #   endif
   
     STOP_WORLD();      STOP_WORLD();
         GC_timerstart();      GC_timerstart();
 #   ifdef PRINTSTATS  #   ifdef PRINTTIMES
         GET_TIME(start_time);          GET_TIME(start_time);
   #   endif
   #   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
   
     /* Mark from all roots.  */      /* Mark from all roots.  */
Line 423  GC_stop_func stop_func;
Line 456  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_timerstop();
                     GC_deficit = i; /* Give the mutator a chance. */                      GC_deficit = i; /* Give the mutator a chance. */
Line 441  GC_stop_func stop_func;
Line 476  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) {
Line 481  void GC_finish_collection()
Line 526  void GC_finish_collection()
 #   ifdef GATHERSTATS  #   ifdef GATHERSTATS
         GC_mem_found = 0;          GC_mem_found = 0;
 #   endif  #   endif
 #   ifdef FIND_LEAK  #   if defined(LINUX) && defined(__ELF__) && !defined(SMALL_CONFIG)
           if (getenv("GC_PRINT_ADDRESS_MAP") != 0) {
             GC_print_address_map();
           }
   #   endif
       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.                                   */
         {          {
Line 504  void GC_finish_collection()
Line 554  void GC_finish_collection()
             }              }
           }            }
         }          }
       /* Check that everything is marked */  
         GC_start_reclaim(TRUE);          GC_start_reclaim(TRUE);
 #   else            /* The above just checks; it doesn't really reclaim anything. */
       }
   
       GC_finalize();      GC_finalize();
 #     ifdef STUBBORN_ALLOC  #   ifdef STUBBORN_ALLOC
         GC_clean_changing_list();        GC_clean_changing_list();
 #     endif  #   endif
   
 #     ifdef PRINTTIMES  #   ifdef PRINTTIMES
         GET_TIME(finalize_time);        GET_TIME(finalize_time);
 #     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        */      /* Note: HBLKPTR(p) == pointer to head of block containing *p        */
       /* Also subtract memory remaining from GC_mem_found count.           */      /* (or GC_find_leak is set and they were intentionally marked.)      */
       /* Note that composite objects on free list are cleared.             */      /* Also subtract memory remaining from GC_mem_found count.           */
       /* Thus accidentally marking a free list is not a problem;  only     */      /* Note that composite objects on free list are cleared.             */
       /* objects on the list itself will be marked, and that's fixed here. */      /* Thus accidentally marking a free list is not a problem;  only     */
       /* 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 p;       /* pointer to current object    */
Line 548  void GC_finish_collection()
Line 599  void GC_finish_collection()
       }        }
   
   
 #     ifdef PRINTSTATS  #   ifdef PRINTSTATS
         GC_printf1("Bytes recovered before sweep - f.l. count = %ld\n",          GC_printf1("Bytes recovered before sweep - f.l. count = %ld\n",
                   (long)WORDS_TO_BYTES(GC_mem_found));                    (long)WORDS_TO_BYTES(GC_mem_found));
 #     endif  #   endif
   
     /* Reconstruct free lists to contain everything not marked */      /* Reconstruct free lists to contain everything not marked */
       GC_start_reclaim(FALSE);          GC_start_reclaim(FALSE);
           if (GC_is_full_gc)  {
 #   endif /* !FIND_LEAK */              GC_used_heap_size_after_full = USED_HEAP_SIZE;
               GC_need_full_gc = FALSE;
           } else {
               GC_need_full_gc =
                    BYTES_TO_WORDS(USED_HEAP_SIZE - GC_used_heap_size_after_full)
                    > min_words_allocd();
           }
   
 #   ifdef PRINTSTATS  #   ifdef PRINTSTATS
         GC_printf2(          GC_printf2(
Line 573  void GC_finish_collection()
Line 629  void GC_finish_collection()
 #   endif  #   endif
   
       GC_n_attempts = 0;        GC_n_attempts = 0;
         GC_is_full_gc = FALSE;
     /* Reset or increment counters for next cycle */      /* Reset or increment counters for next cycle */
       GC_words_allocd_before_gc += GC_words_allocd;        GC_words_allocd_before_gc += GC_words_allocd;
       GC_non_gc_bytes_at_gc = GC_non_gc_bytes;        GC_non_gc_bytes_at_gc = GC_non_gc_bytes;
Line 640  word bytes;
Line 697  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 649  word bytes;
Line 707  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);
     }      }
 }  }
   
 #ifdef PRESERVE_LAST  
   
 GC_bool GC_protect_last_block = FALSE;  
   
 GC_bool GC_in_last_heap_sect(p)  
 ptr_t p;  
 {  
     struct HeapSect * last_heap_sect;  
     ptr_t start;  
     ptr_t end;  
   
     if (!GC_protect_last_block) return FALSE;  
     last_heap_sect = &(GC_heap_sects[GC_n_heap_sects-1]);  
     start = last_heap_sect -> hs_start;  
     if (p < start) return FALSE;  
     end = start + last_heap_sect -> hs_bytes;  
     if (p >= end) return FALSE;  
     return TRUE;  
 }  
 #endif  
   
 # if !defined(NO_DEBUGGING)  # if !defined(NO_DEBUGGING)
 void GC_print_heap_sects()  void GC_print_heap_sects()
 {  {
Line 713  void GC_print_heap_sects()
Line 749  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 770  word n;
Line 806  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 781  word n;
Line 824  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 823  word n;
Line 867  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));
 #   ifdef PRESERVE_LAST      if (result) GC_requested_heapsize += bytes;
         if (result) GC_protect_last_block = FALSE;  
 #   endif  
     UNLOCK();      UNLOCK();
     ENABLE_SIGNALS();      ENABLE_SIGNALS();
     return(result);      return(result);
Line 839  GC_bool GC_collect_or_expand(needed_blocks, ignore_off
Line 881  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 {
Line 868  GC_bool ignore_off_page;
Line 911  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
 #         ifdef PRESERVE_LAST  
             if (needed_blocks > 1) GC_protect_last_block = TRUE;  
                 /* We were forced to expand the heap as the result      */  
                 /* of a large block allocation.  Avoid breaking up      */  
                 /* new block into small pieces.                         */  
 #         endif  
       }        }
     }      }
     return(TRUE);      return(TRUE);
Legend:
Removed from v.1.1.1.1  
changed lines
  Added in v.1.4
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>