summaryrefslogtreecommitdiff
path: root/reclaim.c
diff options
context:
space:
mode:
authorivmai <ivmai>2009-09-16 16:43:37 +0200
committerIvan Maidanski <ivmai@mail.ru>2011-07-26 19:06:46 +0200
commitdb2565100a193fa71336be2951b342ef7596f828 (patch)
tree4214eb726e4912fa34628655dc41ae247213caf8 /reclaim.c
parentd70b0280af3c3d53e2a794b26aa7a3127943b8c3 (diff)
2009-09-16 Ivan Maidanski <ivmai@mail.ru>
* ChangeLog: Remove trailing spaces at EOLn; insert blank lines where missed. * doc/README: Expand all tabs to spaces; remove trailing spaces at EOLn; remove multiple trailing blank lines. * doc/README.autoconf: Ditto. * doc/README.DGUX386: Ditto. * doc/README.environment: Ditto. * doc/README.macros: Ditto. * doc/README.win32: Ditto. * tests/test.c: Ditto. * tests/test_cpp.cc: Ditto. * backgraph.c: Ditto. * blacklst.c: Ditto. * checksums.c: Ditto. * darwin_stop_world.c: Ditto. * dbg_mlc.c: Ditto. * dyn_load.c: Ditto. * finalize.c: Ditto. * gc_dlopen.c: Ditto. * gcj_mlc.c: Ditto. * headers.c: Ditto. * mach_dep.c: Ditto. * malloc.c: Ditto. * mallocx.c: Ditto. * new_hblk.c: Ditto. * obj_map.c: Ditto. * ptr_chck.c: Ditto. * real_malloc.c: Ditto. * reclaim.c: Ditto. * stubborn.c: Ditto. * thread_local_alloc.c: Ditto. * typd_mlc.c: Ditto. * gc_cpp.cc: Ditto. * include/gc_allocator.h: Ditto. * include/gc_backptr.h: Ditto. * include/gc_config_macros.h: Ditto. * include/gc_cpp.h: Ditto. * include/gc_gcj.h: Ditto. * include/gc_inline.h: Ditto. * include/gc_mark.h: Ditto. * include/gc_pthread_redirects.h: Ditto. * include/gc_typed.h: Ditto. * include/gc_version.h: Ditto. * include/javaxfc.h: Ditto. * include/new_gc_alloc.h: Ditto. * include/private/darwin_semaphore.h: Ditto. * include/private/dbg_mlc.h: Ditto. * include/private/gc_hdrs.h: Ditto. * include/private/gc_locks.h: Ditto. * include/private/gc_pmark.h: Ditto. * include/private/gcconfig.h: Ditto. * include/private/pthread_support.h: Ditto. * include/private/thread_local_alloc.h: Ditto. * darwin_stop_world.c: Add copyright header. * include/gc_backptr.h: Ditto. * include/gc_config_macros.h: Ditto. * include/gc_pthread_redirects.h: Ditto. * include/gc_version.h: Ditto. * include/javaxfc.h: Ditto. * include/private/darwin_semaphore.h: Ditto. * include/private/pthread_support.h: Ditto. * gc_cpp.cc: Make copyright header uniform across the package. * include/gc_cpp.h: Ditto.
Diffstat (limited to 'reclaim.c')
-rw-r--r--reclaim.c376
1 files changed, 188 insertions, 188 deletions
diff --git a/reclaim.c b/reclaim.c
index 12afa91..159315f 100644
--- a/reclaim.c
+++ b/reclaim.c
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
* Copyright (c) 1991-1996 by Xerox Corporation. All rights reserved.
* Copyright (c) 1996-1999 by Silicon Graphics. All rights reserved.
@@ -18,20 +18,20 @@
#include "private/gc_priv.h"
signed_word GC_bytes_found = 0;
- /* Number of bytes of memory reclaimed */
- /* minus the number of bytes originally */
- /* on free lists which we had to drop. */
+ /* Number of bytes of memory reclaimed */
+ /* minus the number of bytes originally */
+ /* on free lists which we had to drop. */
#if defined(PARALLEL_MARK)
word GC_fl_builder_count = 0;
- /* Number of threads currently building free lists without */
- /* holding GC lock. It is not safe to collect if this is */
- /* nonzero. */
+ /* Number of threads currently building free lists without */
+ /* holding GC lock. It is not safe to collect if this is */
+ /* nonzero. */
#endif /* PARALLEL_MARK */
-/* We defer printing of leaked objects until we're done with the GC */
-/* cycle, since the routine for printing objects needs to run outside */
-/* the collector, e.g. without the allocation lock. */
+/* We defer printing of leaked objects until we're done with the GC */
+/* cycle, since the routine for printing objects needs to run outside */
+/* the collector, e.g. without the allocation lock. */
#define MAX_LEAKED 40
ptr_t GC_leaked[MAX_LEAKED];
STATIC unsigned GC_n_leaked = 0;
@@ -49,31 +49,31 @@ STATIC void GC_add_leaked(ptr_t leaked)
}
static GC_bool printing_errors = FALSE;
-/* Print all objects on the list after printing any smashed objs. */
-/* Clear both lists. */
+/* Print all objects on the list after printing any smashed objs. */
+/* Clear both lists. */
void GC_print_all_errors (void)
{
unsigned i;
LOCK();
if (printing_errors) {
- UNLOCK();
- return;
+ UNLOCK();
+ return;
}
printing_errors = TRUE;
UNLOCK();
if (GC_debugging_started) GC_print_all_smashed();
for (i = 0; i < GC_n_leaked; ++i) {
- ptr_t p = GC_leaked[i];
- if (HDR(p) -> hb_obj_kind == PTRFREE) {
- GC_err_printf("Leaked atomic object at ");
- } else {
- GC_err_printf("Leaked composite object at ");
- }
- GC_print_heap_obj(p);
- GC_err_printf("\n");
- GC_free(p);
- GC_leaked[i] = 0;
+ ptr_t p = GC_leaked[i];
+ if (HDR(p) -> hb_obj_kind == PTRFREE) {
+ GC_err_printf("Leaked atomic object at ");
+ } else {
+ GC_err_printf("Leaked composite object at ");
+ }
+ GC_print_heap_obj(p);
+ GC_err_printf("\n");
+ GC_free(p);
+ GC_leaked[i] = 0;
}
GC_n_leaked = 0;
printing_errors = FALSE;
@@ -91,7 +91,7 @@ void GC_print_all_errors (void)
* objects. This does not require the block to be in physical
* memory.
*/
-
+
GC_bool GC_block_empty(hdr *hhdr)
{
return (hhdr -> hb_n_marks == 0);
@@ -102,8 +102,8 @@ STATIC GC_bool GC_block_nearly_full(hdr *hhdr)
return (hhdr -> hb_n_marks > 7 * HBLK_OBJS(hhdr -> hb_sz)/8);
}
-/* FIXME: This should perhaps again be specialized for USE_MARK_BYTES */
-/* and USE_MARK_BITS cases. */
+/* FIXME: This should perhaps again be specialized for USE_MARK_BYTES */
+/* and USE_MARK_BITS cases. */
/*
* Restore unmarked small objects in h of size sz to the object
@@ -111,12 +111,12 @@ STATIC GC_bool GC_block_nearly_full(hdr *hhdr)
* Clears unmarked objects. Sz is in bytes.
*/
STATIC ptr_t GC_reclaim_clear(struct hblk *hbp, hdr *hhdr, size_t sz,
- ptr_t list, signed_word *count)
+ ptr_t list, signed_word *count)
{
word bit_no = 0;
word *p, *q, *plim;
signed_word n_bytes_found = 0;
-
+
GC_ASSERT(hhdr == GC_find_header((ptr_t)hbp));
GC_ASSERT(sz == hhdr -> hb_sz);
GC_ASSERT((sz & (BYTES_PER_WORD-1)) == 0);
@@ -124,61 +124,61 @@ STATIC ptr_t GC_reclaim_clear(struct hblk *hbp, hdr *hhdr, size_t sz,
plim = (word *)(hbp->hb_body + HBLKSIZE - sz);
/* go through all words in block */
- while( p <= plim ) {
- if( mark_bit_from_hdr(hhdr, bit_no) ) {
- p = (word *)((ptr_t)p + sz);
- } else {
- n_bytes_found += sz;
- /* object is available - put on list */
- obj_link(p) = list;
- list = ((ptr_t)p);
- /* Clear object, advance p to next object in the process */
- q = (word *)((ptr_t)p + sz);
-# ifdef USE_MARK_BYTES
- GC_ASSERT(!(sz & 1)
- && !((word)p & (2 * sizeof(word) - 1)));
- p[1] = 0;
+ while( p <= plim ) {
+ if( mark_bit_from_hdr(hhdr, bit_no) ) {
+ p = (word *)((ptr_t)p + sz);
+ } else {
+ n_bytes_found += sz;
+ /* object is available - put on list */
+ obj_link(p) = list;
+ list = ((ptr_t)p);
+ /* Clear object, advance p to next object in the process */
+ q = (word *)((ptr_t)p + sz);
+# ifdef USE_MARK_BYTES
+ GC_ASSERT(!(sz & 1)
+ && !((word)p & (2 * sizeof(word) - 1)));
+ p[1] = 0;
p += 2;
while (p < q) {
- CLEAR_DOUBLE(p);
- p += 2;
- }
-# else
+ CLEAR_DOUBLE(p);
+ p += 2;
+ }
+# else
p++; /* Skip link field */
while (p < q) {
- *p++ = 0;
- }
-# endif
- }
- bit_no += MARK_BIT_OFFSET(sz);
- }
+ *p++ = 0;
+ }
+# endif
+ }
+ bit_no += MARK_BIT_OFFSET(sz);
+ }
*count += n_bytes_found;
return(list);
}
/* The same thing, but don't clear objects: */
STATIC ptr_t GC_reclaim_uninit(struct hblk *hbp, hdr *hhdr, size_t sz,
- ptr_t list, signed_word *count)
+ ptr_t list, signed_word *count)
{
word bit_no = 0;
word *p, *plim;
signed_word n_bytes_found = 0;
-
+
GC_ASSERT(sz == hhdr -> hb_sz);
p = (word *)(hbp->hb_body);
plim = (word *)((ptr_t)hbp + HBLKSIZE - sz);
/* go through all words in block */
- while( p <= plim ) {
- if( !mark_bit_from_hdr(hhdr, bit_no) ) {
- n_bytes_found += sz;
- /* object is available - put on list */
- obj_link(p) = list;
- list = ((ptr_t)p);
- }
- p = (word *)((ptr_t)p + sz);
- bit_no += MARK_BIT_OFFSET(sz);
- }
+ while( p <= plim ) {
+ if( !mark_bit_from_hdr(hhdr, bit_no) ) {
+ n_bytes_found += sz;
+ /* object is available - put on list */
+ obj_link(p) = list;
+ list = ((ptr_t)p);
+ }
+ p = (word *)((ptr_t)p + sz);
+ bit_no += MARK_BIT_OFFSET(sz);
+ }
*count += n_bytes_found;
return(list);
}
@@ -188,19 +188,19 @@ STATIC void GC_reclaim_check(struct hblk *hbp, hdr *hhdr, word sz)
{
word bit_no = 0;
ptr_t p, plim;
-
+
GC_ASSERT(sz == hhdr -> hb_sz);
p = hbp->hb_body;
plim = p + HBLKSIZE - sz;
/* go through all words in block */
- while( p <= plim ) {
- if( !mark_bit_from_hdr(hhdr, bit_no) ) {
- GC_add_leaked(p);
- }
- p += sz;
- bit_no += MARK_BIT_OFFSET(sz);
- }
+ while( p <= plim ) {
+ if( !mark_bit_from_hdr(hhdr, bit_no) ) {
+ GC_add_leaked(p);
+ }
+ p += sz;
+ bit_no += MARK_BIT_OFFSET(sz);
+ }
}
@@ -210,7 +210,7 @@ STATIC void GC_reclaim_check(struct hblk *hbp, hdr *hhdr, word sz)
* Sz is now in bytes.
*/
ptr_t GC_reclaim_generic(struct hblk * hbp, hdr *hhdr, size_t sz,
- GC_bool init, ptr_t list, signed_word *count)
+ GC_bool init, ptr_t list, signed_word *count)
{
ptr_t result;
@@ -221,7 +221,7 @@ ptr_t GC_reclaim_generic(struct hblk * hbp, hdr *hhdr, size_t sz,
} else {
GC_ASSERT((hhdr)->hb_descr == 0 /* Pointer-free block */);
result = GC_reclaim_uninit(hbp, hhdr, sz, list, count);
- }
+ }
if (IS_UNCOLLECTABLE(hhdr -> hb_obj_kind)) GC_set_hdr_marks(hhdr);
return result;
}
@@ -233,22 +233,22 @@ ptr_t GC_reclaim_generic(struct hblk * hbp, hdr *hhdr, size_t sz,
* caller should perform that check.
*/
STATIC void GC_reclaim_small_nonempty_block(struct hblk *hbp,
- int report_if_found)
+ int report_if_found)
{
hdr *hhdr = HDR(hbp);
size_t sz = hhdr -> hb_sz;
int kind = hhdr -> hb_obj_kind;
struct obj_kind * ok = &GC_obj_kinds[kind];
void **flh = &(ok -> ok_freelist[BYTES_TO_GRANULES(sz)]);
-
+
hhdr -> hb_last_reclaimed = (unsigned short) GC_gc_no;
if (report_if_found) {
- GC_reclaim_check(hbp, hhdr, sz);
+ GC_reclaim_check(hbp, hhdr, sz);
} else {
*flh = GC_reclaim_generic(hbp, hhdr, sz,
- ok -> ok_init,
- *flh, &GC_bytes_found);
+ ok -> ok_init,
+ *flh, &GC_bytes_found);
}
}
@@ -263,49 +263,49 @@ STATIC void GC_reclaim_small_nonempty_block(struct hblk *hbp,
STATIC void GC_reclaim_block(struct hblk *hbp, word report_if_found)
{
hdr * hhdr = HDR(hbp);
- size_t sz = hhdr -> hb_sz; /* size of objects in current block */
+ size_t sz = hhdr -> hb_sz; /* size of objects in current block */
struct obj_kind * ok = &GC_obj_kinds[hhdr -> hb_obj_kind];
struct hblk ** rlh;
if( sz > MAXOBJBYTES ) { /* 1 big object */
if( !mark_bit_from_hdr(hhdr, 0) ) {
- if (report_if_found) {
- GC_add_leaked((ptr_t)hbp);
- } else {
- size_t blocks = OBJ_SZ_TO_BLOCKS(sz);
- if (blocks > 1) {
- GC_large_allocd_bytes -= blocks * HBLKSIZE;
- }
- GC_bytes_found += sz;
- GC_freehblk(hbp);
- }
- } else {
- if (hhdr -> hb_descr != 0) {
- GC_composite_in_use += sz;
- } else {
- GC_atomic_in_use += sz;
- }
- }
+ if (report_if_found) {
+ GC_add_leaked((ptr_t)hbp);
+ } else {
+ size_t blocks = OBJ_SZ_TO_BLOCKS(sz);
+ if (blocks > 1) {
+ GC_large_allocd_bytes -= blocks * HBLKSIZE;
+ }
+ GC_bytes_found += sz;
+ GC_freehblk(hbp);
+ }
+ } else {
+ if (hhdr -> hb_descr != 0) {
+ GC_composite_in_use += sz;
+ } else {
+ GC_atomic_in_use += sz;
+ }
+ }
} else {
GC_bool empty = GC_block_empty(hhdr);
-# ifdef PARALLEL_MARK
- /* Count can be low or one too high because we sometimes */
- /* have to ignore decrements. Objects can also potentially */
- /* be repeatedly marked by each marker. */
- /* Here we assume two markers, but this is extremely */
- /* unlikely to fail spuriously with more. And if it does, it */
- /* should be looked at. */
- GC_ASSERT(hhdr -> hb_n_marks <= 2 * (HBLKSIZE/sz + 1) + 16);
-# else
- GC_ASSERT(sz * hhdr -> hb_n_marks <= HBLKSIZE);
-# endif
- if (hhdr -> hb_descr != 0) {
- GC_composite_in_use += sz * hhdr -> hb_n_marks;
- } else {
- GC_atomic_in_use += sz * hhdr -> hb_n_marks;
- }
+# ifdef PARALLEL_MARK
+ /* Count can be low or one too high because we sometimes */
+ /* have to ignore decrements. Objects can also potentially */
+ /* be repeatedly marked by each marker. */
+ /* Here we assume two markers, but this is extremely */
+ /* unlikely to fail spuriously with more. And if it does, it */
+ /* should be looked at. */
+ GC_ASSERT(hhdr -> hb_n_marks <= 2 * (HBLKSIZE/sz + 1) + 16);
+# else
+ GC_ASSERT(sz * hhdr -> hb_n_marks <= HBLKSIZE);
+# endif
+ if (hhdr -> hb_descr != 0) {
+ GC_composite_in_use += sz * hhdr -> hb_n_marks;
+ } else {
+ GC_atomic_in_use += sz * hhdr -> hb_n_marks;
+ }
if (report_if_found) {
- GC_reclaim_small_nonempty_block(hbp, (int)report_if_found);
+ GC_reclaim_small_nonempty_block(hbp, (int)report_if_found);
} else if (empty) {
GC_bytes_found += HBLKSIZE;
GC_freehblk(hbp);
@@ -315,27 +315,27 @@ STATIC void GC_reclaim_block(struct hblk *hbp, word report_if_found)
hhdr -> hb_next = *rlh;
*rlh = hbp;
} /* else not worth salvaging. */
- /* We used to do the nearly_full check later, but we */
- /* already have the right cache context here. Also */
- /* doing it here avoids some silly lock contention in */
- /* GC_malloc_many. */
+ /* We used to do the nearly_full check later, but we */
+ /* already have the right cache context here. Also */
+ /* doing it here avoids some silly lock contention in */
+ /* GC_malloc_many. */
}
}
#if !defined(NO_DEBUGGING)
-/* Routines to gather and print heap block info */
-/* intended for debugging. Otherwise should be called */
-/* with lock. */
+/* Routines to gather and print heap block info */
+/* intended for debugging. Otherwise should be called */
+/* with lock. */
struct Print_stats
{
- size_t number_of_blocks;
- size_t total_bytes;
+ size_t number_of_blocks;
+ size_t total_bytes;
};
#ifdef USE_MARK_BYTES
-/* Return the number of set mark bits in the given header */
+/* Return the number of set mark bits in the given header */
STATIC int GC_n_set_marks(hdr *hhdr)
{
int result = 0;
@@ -353,20 +353,20 @@ STATIC int GC_n_set_marks(hdr *hhdr)
#else
-/* Number of set bits in a word. Not performance critical. */
+/* Number of set bits in a word. Not performance critical. */
static int set_bits(word n)
{
word m = n;
int result = 0;
-
+
while (m > 0) {
- if (m & 1) result++;
- m >>= 1;
+ if (m & 1) result++;
+ m >>= 1;
}
return(result);
}
-/* Return the number of set mark bits in the given header */
+/* Return the number of set mark bits in the given header */
STATIC int GC_n_set_marks(hdr *hhdr)
{
int result = 0;
@@ -374,7 +374,7 @@ STATIC int GC_n_set_marks(hdr *hhdr)
int n_mark_words;
# ifdef MARK_BIT_PER_OBJ
int n_objs = (int)HBLK_OBJS(hhdr -> hb_sz);
-
+
if (0 == n_objs) n_objs = 1;
n_mark_words = divWORDSZ(n_objs + WORDSZ - 1);
# else /* MARK_BIT_PER_GRANULE */
@@ -385,7 +385,7 @@ STATIC int GC_n_set_marks(hdr *hhdr)
}
# ifdef MARK_BIT_PER_OBJ
result += set_bits((hhdr -> hb_marks[n_mark_words - 1])
- << (n_mark_words * WORDSZ - n_objs));
+ << (n_mark_words * WORDSZ - n_objs));
# else
result += set_bits(hhdr -> hb_marks[n_mark_words - 1]);
# endif
@@ -395,19 +395,19 @@ STATIC int GC_n_set_marks(hdr *hhdr)
#endif /* !USE_MARK_BYTES */
STATIC void GC_print_block_descr(struct hblk *h,
- word /* struct PrintStats */ raw_ps)
+ word /* struct PrintStats */ raw_ps)
{
hdr * hhdr = HDR(h);
size_t bytes = hhdr -> hb_sz;
struct Print_stats *ps;
unsigned n_marks = GC_n_set_marks(hhdr);
-
+
if (hhdr -> hb_n_marks != n_marks) {
GC_printf("(%u:%u,%u!=%u)", hhdr -> hb_obj_kind, (unsigned)bytes,
- (unsigned)hhdr -> hb_n_marks, n_marks);
+ (unsigned)hhdr -> hb_n_marks, n_marks);
} else {
GC_printf("(%u:%u,%u)", hhdr -> hb_obj_kind,
- (unsigned)bytes, n_marks);
+ (unsigned)bytes, n_marks);
}
bytes += HBLKSIZE-1;
bytes &= ~(HBLKSIZE-1);
@@ -426,8 +426,8 @@ void GC_print_block_list(void)
pstats.total_bytes = 0;
GC_apply_to_all_blocks(GC_print_block_descr, (word)&pstats);
GC_printf("\nblocks = %lu, bytes = %lu\n",
- (unsigned long)pstats.number_of_blocks,
- (unsigned long)pstats.total_bytes);
+ (unsigned long)pstats.number_of_blocks,
+ (unsigned long)pstats.total_bytes);
}
/* Currently for debugger use only: */
@@ -476,7 +476,7 @@ STATIC void GC_clear_fl_links(void **flp)
void GC_start_reclaim(GC_bool report_if_found)
{
unsigned kind;
-
+
# if defined(PARALLEL_MARK)
GC_ASSERT(0 == GC_fl_builder_count);
# endif
@@ -490,42 +490,42 @@ void GC_start_reclaim(GC_bool report_if_found)
struct hblk ** rlp;
struct hblk ** rlim;
struct hblk ** rlist = GC_obj_kinds[kind].ok_reclaim_list;
- GC_bool should_clobber = (GC_obj_kinds[kind].ok_descriptor != 0);
-
- if (rlist == 0) continue; /* This kind not used. */
+ GC_bool should_clobber = (GC_obj_kinds[kind].ok_descriptor != 0);
+
+ if (rlist == 0) continue; /* This kind not used. */
if (!report_if_found) {
lim = &(GC_obj_kinds[kind].ok_freelist[MAXOBJGRANULES+1]);
- for( fop = GC_obj_kinds[kind].ok_freelist; fop < lim; fop++ ) {
- if (*fop != 0) {
- if (should_clobber) {
- GC_clear_fl_links(fop);
- } else {
- *fop = 0;
- }
- }
- }
- } /* otherwise free list objects are marked, */
- /* and its safe to leave them */
- rlim = rlist + MAXOBJGRANULES+1;
- for( rlp = rlist; rlp < rlim; rlp++ ) {
- *rlp = 0;
- }
+ for( fop = GC_obj_kinds[kind].ok_freelist; fop < lim; fop++ ) {
+ if (*fop != 0) {
+ if (should_clobber) {
+ GC_clear_fl_links(fop);
+ } else {
+ *fop = 0;
+ }
+ }
+ }
+ } /* otherwise free list objects are marked, */
+ /* and its safe to leave them */
+ rlim = rlist + MAXOBJGRANULES+1;
+ for( rlp = rlist; rlp < rlim; rlp++ ) {
+ *rlp = 0;
+ }
}
-
+
/* Go through all heap blocks (in hblklist) and reclaim unmarked objects */
- /* or enqueue the block for later processing. */
+ /* or enqueue the block for later processing. */
GC_apply_to_all_blocks(GC_reclaim_block, (word)report_if_found);
# ifdef EAGER_SWEEP
- /* This is a very stupid thing to do. We make it possible anyway, */
- /* so that you can convince yourself that it really is very stupid. */
+ /* This is a very stupid thing to do. We make it possible anyway, */
+ /* so that you can convince yourself that it really is very stupid. */
GC_reclaim_all((GC_stop_func)0, FALSE);
# endif
# if defined(PARALLEL_MARK)
GC_ASSERT(0 == GC_fl_builder_count);
# endif
-
+
}
/*
@@ -540,8 +540,8 @@ void GC_continue_reclaim(size_t sz /* granules */, int kind)
struct obj_kind * ok = &(GC_obj_kinds[kind]);
struct hblk ** rlh = ok -> ok_reclaim_list;
void **flh = &(ok -> ok_freelist[sz]);
-
- if (rlh == 0) return; /* No blocks of this kind. */
+
+ if (rlh == 0) return; /* No blocks of this kind. */
rlh += sz;
while ((hbp = *rlh) != 0) {
hhdr = HDR(hbp);
@@ -556,7 +556,7 @@ void GC_continue_reclaim(size_t sz /* granules */, int kind)
* Abort and return FALSE when/if (*stop_func)() returns TRUE.
* If this returns TRUE, then it's safe to restart the world
* with incorrectly cleared mark bits.
- * If ignore_old is TRUE, then reclaim only blocks that have been
+ * If ignore_old is TRUE, then reclaim only blocks that have been
* recently reclaimed, and discard the rest.
* Stop_func may be 0.
*/
@@ -572,37 +572,37 @@ GC_bool GC_reclaim_all(GC_stop_func stop_func, GC_bool ignore_old)
# ifndef SMALL_CONFIG
CLOCK_TYPE start_time = 0; /* initialized to prevent warning. */
CLOCK_TYPE done_time;
-
+
if (GC_print_stats == VERBOSE)
- GET_TIME(start_time);
+ GET_TIME(start_time);
# endif
-
+
for (kind = 0; kind < GC_n_kinds; kind++) {
- ok = &(GC_obj_kinds[kind]);
- rlp = ok -> ok_reclaim_list;
- if (rlp == 0) continue;
- for (sz = 1; sz <= MAXOBJGRANULES; sz++) {
- rlh = rlp + sz;
- while ((hbp = *rlh) != 0) {
- if (stop_func != (GC_stop_func)0 && (*stop_func)()) {
- return(FALSE);
- }
- hhdr = HDR(hbp);
- *rlh = hhdr -> hb_next;
- if (!ignore_old || hhdr -> hb_last_reclaimed == GC_gc_no - 1) {
- /* It's likely we'll need it this time, too */
- /* It's been touched recently, so this */
- /* shouldn't trigger paging. */
- GC_reclaim_small_nonempty_block(hbp, FALSE);
- }
+ ok = &(GC_obj_kinds[kind]);
+ rlp = ok -> ok_reclaim_list;
+ if (rlp == 0) continue;
+ for (sz = 1; sz <= MAXOBJGRANULES; sz++) {
+ rlh = rlp + sz;
+ while ((hbp = *rlh) != 0) {
+ if (stop_func != (GC_stop_func)0 && (*stop_func)()) {
+ return(FALSE);
+ }
+ hhdr = HDR(hbp);
+ *rlh = hhdr -> hb_next;
+ if (!ignore_old || hhdr -> hb_last_reclaimed == GC_gc_no - 1) {
+ /* It's likely we'll need it this time, too */
+ /* It's been touched recently, so this */
+ /* shouldn't trigger paging. */
+ GC_reclaim_small_nonempty_block(hbp, FALSE);
+ }
}
}
}
# ifndef SMALL_CONFIG
if (GC_print_stats == VERBOSE) {
- GET_TIME(done_time);
- GC_log_printf("Disposing of reclaim lists took %lu msecs\n",
- MS_TIME_DIFF(done_time,start_time));
+ GET_TIME(done_time);
+ GC_log_printf("Disposing of reclaim lists took %lu msecs\n",
+ MS_TIME_DIFF(done_time,start_time));
}
# endif
return(TRUE);