summaryrefslogtreecommitdiff
path: root/reclaim.c
diff options
context:
space:
mode:
authorIvan Maidanski <ivmai@mail.ru>2011-07-26 18:09:54 +0200
committerIvan Maidanski <ivmai@mail.ru>2011-07-26 18:09:54 +0200
commite35a4171fe47dfbf847e08988ea6cec4dfc8d124 (patch)
tree25f3501669fbf24a4b370c4f8b0c0701b1da4062 /reclaim.c
parentffa0c9ea38b3dd87e91b5ed2118c74002fed6782 (diff)
gc7.0alpha1 tarball importgc7_0alpha1
Diffstat (limited to 'reclaim.c')
-rw-r--r--reclaim.c793
1 files changed, 151 insertions, 642 deletions
diff --git a/reclaim.c b/reclaim.c
index 864c0ca..279b75b 100644
--- a/reclaim.c
+++ b/reclaim.c
@@ -2,7 +2,7 @@
* 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.
- * Copyright (c) 1999 by Hewlett-Packard Company. All rights reserved.
+ * Copyright (c) 1999-2004 Hewlett-Packard Development Company, L.P.
*
* THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
* OR IMPLIED. ANY USE IS AT YOUR OWN RISK.
@@ -17,8 +17,8 @@
#include <stdio.h>
#include "private/gc_priv.h"
-signed_word GC_mem_found = 0;
- /* Number of words of memory reclaimed */
+signed_word GC_bytes_found = 0;
+ /* Number of bytes of memory reclaimed */
#if defined(PARALLEL_MARK) || defined(THREAD_LOCAL_ALLOC)
word GC_fl_builder_count = 0;
@@ -36,8 +36,7 @@ unsigned GC_n_leaked = 0;
GC_bool GC_have_errors = FALSE;
-void GC_add_leaked(leaked)
-ptr_t leaked;
+void GC_add_leaked(ptr_t leaked)
{
if (GC_n_leaked < MAX_LEAKED) {
GC_have_errors = TRUE;
@@ -65,12 +64,12 @@ void GC_print_all_errors ()
for (i = 0; i < GC_n_leaked; ++i) {
ptr_t p = GC_leaked[i];
if (HDR(p) -> hb_obj_kind == PTRFREE) {
- GC_err_printf0("Leaked atomic object at ");
+ GC_err_printf("Leaked atomic object at ");
} else {
- GC_err_printf0("Leaked composite object at ");
+ GC_err_printf("Leaked composite object at ");
}
GC_print_heap_obj(p);
- GC_err_printf0("\n");
+ GC_err_printf("\n");
GC_free(p);
GC_leaked[i] = 0;
}
@@ -79,11 +78,6 @@ void GC_print_all_errors ()
}
-# define FOUND_FREE(hblk, word_no) \
- { \
- GC_add_leaked((ptr_t)hblk + WORDS_TO_BYTES(word_no)); \
- }
-
/*
* reclaim phase
*
@@ -96,245 +90,49 @@ void GC_print_all_errors ()
* memory.
*/
-GC_bool GC_block_empty(hhdr)
-register hdr * hhdr;
-{
- /* We treat hb_marks as an array of words here, even if it is */
- /* actually an array of bytes. Since we only check for zero, there */
- /* are no endian-ness issues. */
- register word *p = (word *)(&(hhdr -> hb_marks[0]));
- register word * plim =
- (word *)(&(hhdr -> hb_marks[MARK_BITS_SZ]));
- while (p < plim) {
- if (*p++) return(FALSE);
- }
- return(TRUE);
-}
-
-/* The following functions sometimes return a DONT_KNOW value. */
-#define DONT_KNOW 2
-
-#ifdef SMALL_CONFIG
-# define GC_block_nearly_full1(hhdr, pat1) DONT_KNOW
-# define GC_block_nearly_full3(hhdr, pat1, pat2) DONT_KNOW
-# define GC_block_nearly_full(hhdr) DONT_KNOW
-#endif
-
-#if !defined(SMALL_CONFIG) && defined(USE_MARK_BYTES)
-
-# define GC_block_nearly_full1(hhdr, pat1) GC_block_nearly_full(hhdr)
-# define GC_block_nearly_full3(hhdr, pat1, pat2) GC_block_nearly_full(hhdr)
-
-
-GC_bool GC_block_nearly_full(hhdr)
-register hdr * hhdr;
-{
- /* We again treat hb_marks as an array of words, even though it */
- /* isn't. We first sum up all the words, resulting in a word */
- /* containing 4 or 8 separate partial sums. */
- /* We then sum the bytes in the word of partial sums. */
- /* This is still endian independant. This fails if the partial */
- /* sums can overflow. */
-# if (BYTES_TO_WORDS(MARK_BITS_SZ)) >= 256
- --> potential overflow; fix the code
-# endif
- register word *p = (word *)(&(hhdr -> hb_marks[0]));
- register word * plim =
- (word *)(&(hhdr -> hb_marks[MARK_BITS_SZ]));
- word sum_vector = 0;
- unsigned sum;
- while (p < plim) {
- sum_vector += *p;
- ++p;
- }
- sum = 0;
- while (sum_vector > 0) {
- sum += sum_vector & 0xff;
- sum_vector >>= 8;
- }
- return (sum > BYTES_TO_WORDS(7*HBLKSIZE/8)/(hhdr -> hb_sz));
-}
-#endif /* USE_MARK_BYTES */
-
-#if !defined(SMALL_CONFIG) && !defined(USE_MARK_BYTES)
-
-/*
- * Test whether nearly all of the mark words consist of the same
- * repeating pattern.
- */
-#define FULL_THRESHOLD (MARK_BITS_SZ/16)
-
-GC_bool GC_block_nearly_full1(hhdr, pat1)
-hdr *hhdr;
-word pat1;
+GC_bool GC_block_empty(hdr *hhdr)
{
- unsigned i;
- unsigned misses = 0;
- GC_ASSERT((MARK_BITS_SZ & 1) == 0);
- for (i = 0; i < MARK_BITS_SZ; ++i) {
- if ((hhdr -> hb_marks[i] | ~pat1) != ONES) {
- if (++misses > FULL_THRESHOLD) return FALSE;
- }
- }
- return TRUE;
+ return (hhdr -> hb_n_marks == 0);
}
-/*
- * Test whether the same repeating 3 word pattern occurs in nearly
- * all the mark bit slots.
- * This is used as a heuristic, so we're a bit sloppy and ignore
- * the last one or two words.
- */
-GC_bool GC_block_nearly_full3(hhdr, pat1, pat2, pat3)
-hdr *hhdr;
-word pat1, pat2, pat3;
+GC_bool GC_block_nearly_full(hdr *hhdr)
{
- unsigned i;
- unsigned misses = 0;
-
- if (MARK_BITS_SZ < 4) {
- return DONT_KNOW;
- }
- for (i = 0; i < MARK_BITS_SZ - 2; i += 3) {
- if ((hhdr -> hb_marks[i] | ~pat1) != ONES) {
- if (++misses > FULL_THRESHOLD) return FALSE;
- }
- if ((hhdr -> hb_marks[i+1] | ~pat2) != ONES) {
- if (++misses > FULL_THRESHOLD) return FALSE;
- }
- if ((hhdr -> hb_marks[i+2] | ~pat3) != ONES) {
- if (++misses > FULL_THRESHOLD) return FALSE;
- }
- }
- return TRUE;
+ return (hhdr -> hb_n_marks > 7 * HBLK_OBJS(hhdr -> hb_sz)/8);
}
-/* Check whether a small object block is nearly full by looking at only */
-/* the mark bits. */
-/* We manually precomputed the mark bit patterns that need to be */
-/* checked for, and we give up on the ones that are unlikely to occur, */
-/* or have period > 3. */
-/* This would be a lot easier with a mark bit per object instead of per */
-/* word, but that would rewuire computing object numbers in the mark */
-/* loop, which would require different data structures ... */
-GC_bool GC_block_nearly_full(hhdr)
-hdr *hhdr;
-{
- int sz = hhdr -> hb_sz;
-
-# if CPP_WORDSZ != 32 && CPP_WORDSZ != 64
- return DONT_KNOW; /* Shouldn't be used in any standard config. */
-# endif
-# if CPP_WORDSZ == 32
- switch(sz) {
- case 1:
- return GC_block_nearly_full1(hhdr, 0xffffffffl);
- case 2:
- return GC_block_nearly_full1(hhdr, 0x55555555l);
- case 4:
- return GC_block_nearly_full1(hhdr, 0x11111111l);
- case 6:
- return GC_block_nearly_full3(hhdr, 0x41041041l,
- 0x10410410l,
- 0x04104104l);
- case 8:
- return GC_block_nearly_full1(hhdr, 0x01010101l);
- case 12:
- return GC_block_nearly_full3(hhdr, 0x01001001l,
- 0x10010010l,
- 0x00100100l);
- case 16:
- return GC_block_nearly_full1(hhdr, 0x00010001l);
- case 32:
- return GC_block_nearly_full1(hhdr, 0x00000001l);
- default:
- return DONT_KNOW;
- }
-# endif
-# if CPP_WORDSZ == 64
- switch(sz) {
- case 1:
- return GC_block_nearly_full1(hhdr, 0xffffffffffffffffl);
- case 2:
- return GC_block_nearly_full1(hhdr, 0x5555555555555555l);
- case 4:
- return GC_block_nearly_full1(hhdr, 0x1111111111111111l);
- case 6:
- return GC_block_nearly_full3(hhdr, 0x1041041041041041l,
- 0x4104104104104104l,
- 0x0410410410410410l);
- case 8:
- return GC_block_nearly_full1(hhdr, 0x0101010101010101l);
- case 12:
- return GC_block_nearly_full3(hhdr, 0x1001001001001001l,
- 0x0100100100100100l,
- 0x0010010010010010l);
- case 16:
- return GC_block_nearly_full1(hhdr, 0x0001000100010001l);
- case 32:
- return GC_block_nearly_full1(hhdr, 0x0000000100000001l);
- default:
- return DONT_KNOW;
- }
-# endif
-}
-#endif /* !SMALL_CONFIG && !USE_MARK_BYTES */
+/* FIXME: This should perhaps again be specialized for USE_MARK_BYTES */
+/* and USE_MARK_BITS cases. */
-/* We keep track of reclaimed memory if we are either asked to, or */
-/* we are using the parallel marker. In the latter case, we assume */
-/* that most allocation goes through GC_malloc_many for scalability. */
-/* GC_malloc_many needs the count anyway. */
-# if defined(GATHERSTATS) || defined(PARALLEL_MARK)
-# define INCR_WORDS(sz) n_words_found += (sz)
-# define COUNT_PARAM , count
-# define COUNT_ARG , count
-# define COUNT_DECL signed_word * count;
-# define NWORDS_DECL signed_word n_words_found = 0;
-# define COUNT_UPDATE *count += n_words_found;
-# define MEM_FOUND_ADDR , &GC_mem_found
-# else
-# define INCR_WORDS(sz)
-# define COUNT_PARAM
-# define COUNT_ARG
-# define COUNT_DECL
-# define NWORDS_DECL
-# define COUNT_UPDATE
-# define MEM_FOUND_ADDR
-# endif
/*
* Restore unmarked small objects in h of size sz to the object
* free list. Returns the new list.
- * Clears unmarked objects.
+ * Clears unmarked objects. Sz is in bytes.
*/
/*ARGSUSED*/
-ptr_t GC_reclaim_clear(hbp, hhdr, sz, list COUNT_PARAM)
-register struct hblk *hbp; /* ptr to current heap block */
-register hdr * hhdr;
-register ptr_t list;
-register word sz;
-COUNT_DECL
+ptr_t GC_reclaim_clear(struct hblk *hbp, hdr *hhdr, size_t sz,
+ ptr_t list, signed_word *count)
{
- register int word_no;
- register word *p, *q, *plim;
- NWORDS_DECL
+ int 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);
p = (word *)(hbp->hb_body);
- word_no = 0;
- plim = (word *)((((word)hbp) + HBLKSIZE)
- - WORDS_TO_BYTES(sz));
+ plim = (word *)(hbp->hb_body + HBLKSIZE - sz);
/* go through all words in block */
while( p <= plim ) {
- if( mark_bit_from_hdr(hhdr, word_no) ) {
- p += sz;
+ if( mark_bit_from_hdr(hhdr, bit_no) ) {
+ p = (word *)((ptr_t)p + sz);
} else {
- INCR_WORDS(sz);
+ 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 = p + sz;
+ q = (word *)((ptr_t)p + sz);
# ifdef USE_MARK_BYTES
GC_ASSERT(!(sz & 1)
&& !((word)p & (2 * sizeof(word) - 1)));
@@ -351,362 +149,79 @@ COUNT_DECL
}
# endif
}
- word_no += sz;
- }
- COUNT_UPDATE
- return(list);
-}
-
-#if !defined(SMALL_CONFIG) && !defined(USE_MARK_BYTES)
-
-/*
- * A special case for 2 word composite objects (e.g. cons cells):
- */
-/*ARGSUSED*/
-ptr_t GC_reclaim_clear2(hbp, hhdr, list COUNT_PARAM)
-register struct hblk *hbp; /* ptr to current heap block */
-hdr * hhdr;
-register ptr_t list;
-COUNT_DECL
-{
- register word * mark_word_addr = &(hhdr->hb_marks[0]);
- register word *p, *plim;
- register word mark_word;
- register int i;
- NWORDS_DECL
-# define DO_OBJ(start_displ) \
- if (!(mark_word & ((word)1 << start_displ))) { \
- p[start_displ] = (word)list; \
- list = (ptr_t)(p+start_displ); \
- p[start_displ+1] = 0; \
- INCR_WORDS(2); \
+ bit_no += MARK_BIT_OFFSET(sz);
}
-
- p = (word *)(hbp->hb_body);
- plim = (word *)(((word)hbp) + HBLKSIZE);
-
- /* go through all words in block */
- while( p < plim ) {
- mark_word = *mark_word_addr++;
- for (i = 0; i < WORDSZ; i += 8) {
- DO_OBJ(0);
- DO_OBJ(2);
- DO_OBJ(4);
- DO_OBJ(6);
- p += 8;
- mark_word >>= 8;
- }
- }
- COUNT_UPDATE
+ *count += n_bytes_found;
return(list);
-# undef DO_OBJ
}
-/*
- * Another special case for 4 word composite objects:
- */
-/*ARGSUSED*/
-ptr_t GC_reclaim_clear4(hbp, hhdr, list COUNT_PARAM)
-register struct hblk *hbp; /* ptr to current heap block */
-hdr * hhdr;
-register ptr_t list;
-COUNT_DECL
-{
- register word * mark_word_addr = &(hhdr->hb_marks[0]);
- register word *p, *plim;
- register word mark_word;
- NWORDS_DECL
-# define DO_OBJ(start_displ) \
- if (!(mark_word & ((word)1 << start_displ))) { \
- p[start_displ] = (word)list; \
- list = (ptr_t)(p+start_displ); \
- p[start_displ+1] = 0; \
- CLEAR_DOUBLE(p + start_displ + 2); \
- INCR_WORDS(4); \
- }
-
- p = (word *)(hbp->hb_body);
- plim = (word *)(((word)hbp) + HBLKSIZE);
-
- /* go through all words in block */
- while( p < plim ) {
- mark_word = *mark_word_addr++;
- DO_OBJ(0);
- DO_OBJ(4);
- DO_OBJ(8);
- DO_OBJ(12);
- DO_OBJ(16);
- DO_OBJ(20);
- DO_OBJ(24);
- DO_OBJ(28);
-# if CPP_WORDSZ == 64
- DO_OBJ(32);
- DO_OBJ(36);
- DO_OBJ(40);
- DO_OBJ(44);
- DO_OBJ(48);
- DO_OBJ(52);
- DO_OBJ(56);
- DO_OBJ(60);
-# endif
- p += WORDSZ;
- }
- COUNT_UPDATE
- return(list);
-# undef DO_OBJ
-}
-
-#endif /* !SMALL_CONFIG && !USE_MARK_BYTES */
-
/* The same thing, but don't clear objects: */
/*ARGSUSED*/
-ptr_t GC_reclaim_uninit(hbp, hhdr, sz, list COUNT_PARAM)
-register struct hblk *hbp; /* ptr to current heap block */
-register hdr * hhdr;
-register ptr_t list;
-register word sz;
-COUNT_DECL
+ptr_t GC_reclaim_uninit(struct hblk *hbp, hdr *hhdr, size_t sz,
+ ptr_t list, signed_word *count)
{
- register int word_no = 0;
- register word *p, *plim;
- NWORDS_DECL
+ int 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 *)((((word)hbp) + HBLKSIZE)
- - WORDS_TO_BYTES(sz));
+ plim = (word *)((ptr_t)hbp + HBLKSIZE - sz);
/* go through all words in block */
while( p <= plim ) {
- if( !mark_bit_from_hdr(hhdr, word_no) ) {
- INCR_WORDS(sz);
+ 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 += sz;
- word_no += sz;
+ p = (word *)((ptr_t)p + sz);
+ bit_no += MARK_BIT_OFFSET(sz);
}
- COUNT_UPDATE
+ *count += n_bytes_found;
return(list);
}
/* Don't really reclaim objects, just check for unmarked ones: */
/*ARGSUSED*/
-void GC_reclaim_check(hbp, hhdr, sz)
-register struct hblk *hbp; /* ptr to current heap block */
-register hdr * hhdr;
-register word sz;
+void GC_reclaim_check(struct hblk *hbp, hdr *hhdr, word sz)
{
- register int word_no = 0;
- register word *p, *plim;
-# ifdef GATHERSTATS
- register int n_words_found = 0;
-# endif
+ int bit_no = 0;
+ ptr_t p, plim;
- p = (word *)(hbp->hb_body);
- plim = (word *)((((word)hbp) + HBLKSIZE)
- - WORDS_TO_BYTES(sz));
+ 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, word_no) ) {
- FOUND_FREE(hbp, word_no);
+ if( !mark_bit_from_hdr(hhdr, bit_no) ) {
+ GC_add_leaked(p);
}
p += sz;
- word_no += sz;
+ bit_no += MARK_BIT_OFFSET(sz);
}
}
-#if !defined(SMALL_CONFIG) && !defined(USE_MARK_BYTES)
-/*
- * Another special case for 2 word atomic objects:
- */
-/*ARGSUSED*/
-ptr_t GC_reclaim_uninit2(hbp, hhdr, list COUNT_PARAM)
-register struct hblk *hbp; /* ptr to current heap block */
-hdr * hhdr;
-register ptr_t list;
-COUNT_DECL
-{
- register word * mark_word_addr = &(hhdr->hb_marks[0]);
- register word *p, *plim;
- register word mark_word;
- register int i;
- NWORDS_DECL
-# define DO_OBJ(start_displ) \
- if (!(mark_word & ((word)1 << start_displ))) { \
- p[start_displ] = (word)list; \
- list = (ptr_t)(p+start_displ); \
- INCR_WORDS(2); \
- }
-
- p = (word *)(hbp->hb_body);
- plim = (word *)(((word)hbp) + HBLKSIZE);
-
- /* go through all words in block */
- while( p < plim ) {
- mark_word = *mark_word_addr++;
- for (i = 0; i < WORDSZ; i += 8) {
- DO_OBJ(0);
- DO_OBJ(2);
- DO_OBJ(4);
- DO_OBJ(6);
- p += 8;
- mark_word >>= 8;
- }
- }
- COUNT_UPDATE
- return(list);
-# undef DO_OBJ
-}
-
-/*
- * Another special case for 4 word atomic objects:
- */
-/*ARGSUSED*/
-ptr_t GC_reclaim_uninit4(hbp, hhdr, list COUNT_PARAM)
-register struct hblk *hbp; /* ptr to current heap block */
-hdr * hhdr;
-register ptr_t list;
-COUNT_DECL
-{
- register word * mark_word_addr = &(hhdr->hb_marks[0]);
- register word *p, *plim;
- register word mark_word;
- NWORDS_DECL
-# define DO_OBJ(start_displ) \
- if (!(mark_word & ((word)1 << start_displ))) { \
- p[start_displ] = (word)list; \
- list = (ptr_t)(p+start_displ); \
- INCR_WORDS(4); \
- }
-
- p = (word *)(hbp->hb_body);
- plim = (word *)(((word)hbp) + HBLKSIZE);
-
- /* go through all words in block */
- while( p < plim ) {
- mark_word = *mark_word_addr++;
- DO_OBJ(0);
- DO_OBJ(4);
- DO_OBJ(8);
- DO_OBJ(12);
- DO_OBJ(16);
- DO_OBJ(20);
- DO_OBJ(24);
- DO_OBJ(28);
-# if CPP_WORDSZ == 64
- DO_OBJ(32);
- DO_OBJ(36);
- DO_OBJ(40);
- DO_OBJ(44);
- DO_OBJ(48);
- DO_OBJ(52);
- DO_OBJ(56);
- DO_OBJ(60);
-# endif
- p += WORDSZ;
- }
- COUNT_UPDATE
- return(list);
-# undef DO_OBJ
-}
-
-/* Finally the one word case, which never requires any clearing: */
-/*ARGSUSED*/
-ptr_t GC_reclaim1(hbp, hhdr, list COUNT_PARAM)
-register struct hblk *hbp; /* ptr to current heap block */
-hdr * hhdr;
-register ptr_t list;
-COUNT_DECL
-{
- register word * mark_word_addr = &(hhdr->hb_marks[0]);
- register word *p, *plim;
- register word mark_word;
- register int i;
- NWORDS_DECL
-# define DO_OBJ(start_displ) \
- if (!(mark_word & ((word)1 << start_displ))) { \
- p[start_displ] = (word)list; \
- list = (ptr_t)(p+start_displ); \
- INCR_WORDS(1); \
- }
-
- p = (word *)(hbp->hb_body);
- plim = (word *)(((word)hbp) + HBLKSIZE);
-
- /* go through all words in block */
- while( p < plim ) {
- mark_word = *mark_word_addr++;
- for (i = 0; i < WORDSZ; i += 4) {
- DO_OBJ(0);
- DO_OBJ(1);
- DO_OBJ(2);
- DO_OBJ(3);
- p += 4;
- mark_word >>= 4;
- }
- }
- COUNT_UPDATE
- return(list);
-# undef DO_OBJ
-}
-
-#endif /* !SMALL_CONFIG && !USE_MARK_BYTES */
/*
* Generic procedure to rebuild a free list in hbp.
* Also called directly from GC_malloc_many.
+ * Sz is now in bytes.
*/
-ptr_t GC_reclaim_generic(hbp, hhdr, sz, init, list COUNT_PARAM)
-struct hblk *hbp; /* ptr to current heap block */
-hdr * hhdr;
-GC_bool init;
-ptr_t list;
-word sz;
-COUNT_DECL
+ptr_t GC_reclaim_generic(struct hblk * hbp, hdr *hhdr, size_t sz,
+ GC_bool init, ptr_t list, signed_word *count)
{
ptr_t result = list;
GC_ASSERT(GC_find_header((ptr_t)hbp) == hhdr);
GC_remove_protection(hbp, 1, (hhdr)->hb_descr == 0 /* Pointer-free? */);
if (init) {
- switch(sz) {
-# if !defined(SMALL_CONFIG) && !defined(USE_MARK_BYTES)
- case 1:
- /* We now issue the hint even if GC_nearly_full returned */
- /* DONT_KNOW. */
- result = GC_reclaim1(hbp, hhdr, list COUNT_ARG);
- break;
- case 2:
- result = GC_reclaim_clear2(hbp, hhdr, list COUNT_ARG);
- break;
- case 4:
- result = GC_reclaim_clear4(hbp, hhdr, list COUNT_ARG);
- break;
-# endif /* !SMALL_CONFIG && !USE_MARK_BYTES */
- default:
- result = GC_reclaim_clear(hbp, hhdr, sz, list COUNT_ARG);
- break;
- }
+ result = GC_reclaim_clear(hbp, hhdr, sz, list, count);
} else {
GC_ASSERT((hhdr)->hb_descr == 0 /* Pointer-free block */);
- switch(sz) {
-# if !defined(SMALL_CONFIG) && !defined(USE_MARK_BYTES)
- case 1:
- result = GC_reclaim1(hbp, hhdr, list COUNT_ARG);
- break;
- case 2:
- result = GC_reclaim_uninit2(hbp, hhdr, list COUNT_ARG);
- break;
- case 4:
- result = GC_reclaim_uninit4(hbp, hhdr, list COUNT_ARG);
- break;
-# endif /* !SMALL_CONFIG && !USE_MARK_BYTES */
- default:
- result = GC_reclaim_uninit(hbp, hhdr, sz, list COUNT_ARG);
- break;
- }
+ result = GC_reclaim_uninit(hbp, hhdr, sz, list, count);
}
if (IS_UNCOLLECTABLE(hhdr -> hb_obj_kind)) GC_set_hdr_marks(hhdr);
return result;
@@ -718,16 +233,14 @@ COUNT_DECL
* If entirely empty blocks are to be completely deallocated, then
* caller should perform that check.
*/
-void GC_reclaim_small_nonempty_block(hbp, report_if_found COUNT_PARAM)
-register struct hblk *hbp; /* ptr to current heap block */
-int report_if_found; /* Abort if a reclaimable object is found */
-COUNT_DECL
+void GC_reclaim_small_nonempty_block(struct hblk *hbp,
+ int report_if_found, signed_word *count)
{
hdr *hhdr = HDR(hbp);
- word sz = hhdr -> hb_sz;
+ size_t sz = hhdr -> hb_sz;
int kind = hhdr -> hb_obj_kind;
struct obj_kind * ok = &GC_obj_kinds[kind];
- ptr_t * flh = &(ok -> ok_freelist[sz]);
+ void **flh = &(ok -> ok_freelist[BYTES_TO_GRANULES(sz)]);
hhdr -> hb_last_reclaimed = (unsigned short) GC_gc_no;
@@ -736,7 +249,7 @@ COUNT_DECL
} else {
*flh = GC_reclaim_generic(hbp, hhdr, sz,
(ok -> ok_init || GC_debugging_started),
- *flh MEM_FOUND_ADDR);
+ *flh, &GC_bytes_found);
}
}
@@ -748,51 +261,49 @@ COUNT_DECL
* If report_if_found is TRUE, then process any block immediately, and
* simply report free objects; do not actually reclaim them.
*/
-# if defined(__STDC__) || defined(__cplusplus)
- void GC_reclaim_block(register struct hblk *hbp, word report_if_found)
-# else
- void GC_reclaim_block(hbp, report_if_found)
- register struct hblk *hbp; /* ptr to current heap block */
- word report_if_found; /* Abort if a reclaimable object is found */
-# endif
+void GC_reclaim_block(struct hblk *hbp, word report_if_found)
{
- register hdr * hhdr;
- register word sz; /* size of objects in current block */
- register struct obj_kind * ok;
+ hdr * hhdr = HDR(hbp);
+ 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;
- hhdr = HDR(hbp);
- sz = hhdr -> hb_sz;
- ok = &GC_obj_kinds[hhdr -> hb_obj_kind];
-
- if( sz > MAXOBJSZ ) { /* 1 big object */
+ if( sz > MAXOBJBYTES ) { /* 1 big object */
if( !mark_bit_from_hdr(hhdr, 0) ) {
if (report_if_found) {
- FOUND_FREE(hbp, 0);
+ GC_add_leaked((ptr_t)hbp);
} else {
- word blocks = OBJ_SZ_TO_BLOCKS(sz);
+ size_t blocks = OBJ_SZ_TO_BLOCKS(sz);
if (blocks > 1) {
GC_large_allocd_bytes -= blocks * HBLKSIZE;
}
-# ifdef GATHERSTATS
- GC_mem_found += sz;
-# endif
+ 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);
+ GC_ASSERT(sz * hhdr -> hb_n_marks <= HBLKSIZE);
+ 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
- MEM_FOUND_ADDR);
+ GC_reclaim_small_nonempty_block(hbp, (int)report_if_found,
+ &GC_bytes_found);
} else if (empty) {
-# ifdef GATHERSTATS
- GC_mem_found += BYTES_TO_WORDS(HBLKSIZE);
-# endif
+ GC_bytes_found += HBLKSIZE;
GC_freehblk(hbp);
} else if (TRUE != GC_block_nearly_full(hhdr)){
/* group of smaller objects, enqueue the real work */
- rlh = &(ok -> ok_reclaim_list[sz]);
+ rlh = &(ok -> ok_reclaim_list[BYTES_TO_GRANULES(sz)]);
hhdr -> hb_next = *rlh;
*rlh = hbp;
} /* else not worth salvaging. */
@@ -817,26 +328,27 @@ struct Print_stats
#ifdef USE_MARK_BYTES
/* Return the number of set mark bits in the given header */
-int GC_n_set_marks(hhdr)
-hdr * hhdr;
+int GC_n_set_marks(hdr *hhdr)
{
- register int result = 0;
- register int i;
+ int result = 0;
+ int i;
+ int n_objs = HBLK_OBJS(hhdr -> hb_sz);
- for (i = 0; i < MARK_BITS_SZ; i++) {
+ if (0 == n_objs) n_objs = 1;
+ for (i = 0; i < n_objs; i++) {
result += hhdr -> hb_marks[i];
}
+ GC_ASSERT(hhdr -> hb_marks[n_objs]);
return(result);
}
#else
/* Number of set bits in a word. Not performance critical. */
-static int set_bits(n)
-word n;
+static int set_bits(word n)
{
- register word m = n;
- register int result = 0;
+ word m = n;
+ int result = 0;
while (m > 0) {
if (m & 1) result++;
@@ -846,36 +358,41 @@ word n;
}
/* Return the number of set mark bits in the given header */
-int GC_n_set_marks(hhdr)
-hdr * hhdr;
+int GC_n_set_marks(hdr *hhdr)
{
- register int result = 0;
- register int i;
+ int result = 0;
+ int i;
+ int n_objs = HBLK_OBJS(hhdr -> hb_sz);
+ int n_mark_words;
- for (i = 0; i < MARK_BITS_SZ; i++) {
+ if (0 == n_objs) n_objs = 1;
+ n_mark_words = divWORDSZ(n_objs + WORDSZ - 1);
+ for (i = 0; i < n_mark_words - 1; i++) {
result += set_bits(hhdr -> hb_marks[i]);
}
- return(result);
+ result += set_bits((hhdr -> hb_marks[n_mark_words])
+ << (n_mark_words * WORDSZ - n_objs));
+ return(result - 1);
}
#endif /* !USE_MARK_BYTES */
/*ARGSUSED*/
-# if defined(__STDC__) || defined(__cplusplus)
- void GC_print_block_descr(struct hblk *h, word dummy)
-# else
- void GC_print_block_descr(h, dummy)
- struct hblk *h;
- word dummy;
-# endif
+void GC_print_block_descr(struct hblk *h, word dummy)
{
- register hdr * hhdr = HDR(h);
- register size_t bytes = WORDS_TO_BYTES(hhdr -> hb_sz);
+ hdr * hhdr = HDR(h);
+ unsigned bytes = hhdr -> hb_sz;
struct Print_stats *ps;
+ unsigned n_marks = GC_n_set_marks(hhdr);
- GC_printf3("(%lu:%lu,%lu)", (unsigned long)(hhdr -> hb_obj_kind),
- (unsigned long)bytes,
- (unsigned long)(GC_n_set_marks(hhdr)));
+ if (hhdr -> hb_n_marks != n_marks) {
+ GC_printf("(%u:%u,%u!=%u)", hhdr -> hb_obj_kind,
+ bytes,
+ hhdr -> hb_n_marks, n_marks);
+ } else {
+ GC_printf("(%u:%u,%u)", hhdr -> hb_obj_kind,
+ bytes, n_marks);
+ }
bytes += HBLKSIZE-1;
bytes &= ~(HBLKSIZE-1);
@@ -888,13 +405,13 @@ void GC_print_block_list()
{
struct Print_stats pstats;
- GC_printf1("(kind(0=ptrfree,1=normal,2=unc.,%lu=stubborn):size_in_bytes, #_marks_set)\n", STUBBORN);
+ GC_printf("(kind(0=ptrfree,1=normal,2=unc.,3=stubborn):size_in_bytes, #_marks_set)\n");
pstats.number_of_blocks = 0;
pstats.total_bytes = 0;
GC_apply_to_all_blocks(GC_print_block_descr, (word)&pstats);
- GC_printf2("\nblocks = %lu, bytes = %lu\n",
- (unsigned long)pstats.number_of_blocks,
- (unsigned long)pstats.total_bytes);
+ GC_printf("\nblocks = %lu, bytes = %lu\n",
+ (unsigned long)pstats.number_of_blocks,
+ (unsigned long)pstats.total_bytes);
}
#endif /* NO_DEBUGGING */
@@ -906,10 +423,9 @@ void GC_print_block_list()
* since may otherwise end up with dangling "descriptor" pointers.
* It may help for other pointer-containing objects.
*/
-void GC_clear_fl_links(flp)
-ptr_t *flp;
+void GC_clear_fl_links(void **flp)
{
- ptr_t next = *flp;
+ void *next = *flp;
while (0 != next) {
*flp = 0;
@@ -922,18 +438,20 @@ ptr_t *flp;
* Perform GC_reclaim_block on the entire heap, after first clearing
* small object free lists (if we are not just looking for leaks).
*/
-void GC_start_reclaim(report_if_found)
-int report_if_found; /* Abort if a GC_reclaimable object is found */
+void GC_start_reclaim(GC_bool report_if_found)
{
int kind;
# if defined(PARALLEL_MARK) || defined(THREAD_LOCAL_ALLOC)
GC_ASSERT(0 == GC_fl_builder_count);
# endif
+ /* Reset in use counters. GC_reclaim_block recomputes them. */
+ GC_composite_in_use = 0;
+ GC_atomic_in_use = 0;
/* Clear reclaim- and free-lists */
for (kind = 0; kind < GC_n_kinds; kind++) {
- ptr_t *fop;
- ptr_t *lim;
+ void **fop;
+ void **lim;
struct hblk ** rlp;
struct hblk ** rlim;
struct hblk ** rlist = GC_obj_kinds[kind].ok_reclaim_list;
@@ -941,7 +459,7 @@ int report_if_found; /* Abort if a GC_reclaimable object is found */
if (rlist == 0) continue; /* This kind not used. */
if (!report_if_found) {
- lim = &(GC_obj_kinds[kind].ok_freelist[MAXOBJSZ+1]);
+ 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) {
@@ -953,16 +471,12 @@ int report_if_found; /* Abort if a GC_reclaimable object is found */
}
} /* otherwise free list objects are marked, */
/* and its safe to leave them */
- rlim = rlist + MAXOBJSZ+1;
+ rlim = rlist + MAXOBJGRANULES+1;
for( rlp = rlist; rlp < rlim; rlp++ ) {
*rlp = 0;
}
}
-# ifdef PRINTBLOCKS
- GC_printf0("GC_reclaim: current block sizes:\n");
- GC_print_block_list();
-# endif
/* Go through all heap blocks (in hblklist) and reclaim unmarked objects */
/* or enqueue the block for later processing. */
@@ -984,22 +498,20 @@ int report_if_found; /* Abort if a GC_reclaimable object is found */
* appropriate free list is nonempty, or there are no more blocks to
* sweep.
*/
-void GC_continue_reclaim(sz, kind)
-word sz; /* words */
-int kind;
+void GC_continue_reclaim(size_t sz /* granules */, int kind)
{
- register hdr * hhdr;
- register struct hblk * hbp;
- register struct obj_kind * ok = &(GC_obj_kinds[kind]);
+ hdr * hhdr;
+ struct hblk * hbp;
+ struct obj_kind * ok = &(GC_obj_kinds[kind]);
struct hblk ** rlh = ok -> ok_reclaim_list;
- ptr_t *flh = &(ok -> ok_freelist[sz]);
+ void **flh = &(ok -> ok_freelist[sz]);
if (rlh == 0) return; /* No blocks of this kind. */
rlh += sz;
while ((hbp = *rlh) != 0) {
hhdr = HDR(hbp);
*rlh = hhdr -> hb_next;
- GC_reclaim_small_nonempty_block(hbp, FALSE MEM_FOUND_ADDR);
+ GC_reclaim_small_nonempty_block(hbp, FALSE, &GC_bytes_found);
if (*flh != 0) break;
}
}
@@ -1013,29 +525,26 @@ int kind;
* recently reclaimed, and discard the rest.
* Stop_func may be 0.
*/
-GC_bool GC_reclaim_all(stop_func, ignore_old)
-GC_stop_func stop_func;
-GC_bool ignore_old;
+GC_bool GC_reclaim_all(GC_stop_func stop_func, GC_bool ignore_old)
{
- register word sz;
- register int kind;
- register hdr * hhdr;
- register struct hblk * hbp;
- register struct obj_kind * ok;
+ word sz;
+ int kind;
+ hdr * hhdr;
+ struct hblk * hbp;
+ struct obj_kind * ok;
struct hblk ** rlp;
struct hblk ** rlh;
-# ifdef PRINTTIMES
- CLOCK_TYPE start_time;
- CLOCK_TYPE done_time;
+ CLOCK_TYPE start_time;
+ CLOCK_TYPE done_time;
+ if (GC_print_stats == VERBOSE)
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 <= MAXOBJSZ; sz++) {
+ for (sz = 1; sz <= MAXOBJGRANULES; sz++) {
rlh = rlp + sz;
while ((hbp = *rlh) != 0) {
if (stop_func != (GC_stop_func)0 && (*stop_func)()) {
@@ -1047,15 +556,15 @@ GC_bool ignore_old;
/* 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 MEM_FOUND_ADDR);
+ GC_reclaim_small_nonempty_block(hbp, FALSE, &GC_bytes_found);
}
}
}
}
-# ifdef PRINTTIMES
+ if (GC_print_stats == VERBOSE) {
GET_TIME(done_time);
- GC_printf1("Disposing of reclaim lists took %lu msecs\n",
- MS_TIME_DIFF(done_time,start_time));
-# endif
+ GC_log_printf("Disposing of reclaim lists took %lu msecs\n",
+ MS_TIME_DIFF(done_time,start_time));
+ }
return(TRUE);
}