mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[not part of build] added GC_mark_object, added verbose parameter to GC_trace_object to limit sheer volume of data generated, massive removal of hard tabs.

This commit is contained in:
beard%netscape.com 2000-09-02 03:38:39 +00:00
Родитель 21567a7d55
Коммит c256497045
1 изменённых файлов: 159 добавлений и 145 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

304
gc/boehm/dbg_mlc.c
Просмотреть файл

@ -17,30 +17,30 @@
void GC_default_print_heap_obj_proc();
GC_API void GC_register_finalizer_no_order
GC_PROTO((GC_PTR obj, GC_finalization_proc fn, GC_PTR cd,
GC_finalization_proc *ofn, GC_PTR *ocd));
GC_PROTO((GC_PTR obj, GC_finalization_proc fn, GC_PTR cd,
GC_finalization_proc *ofn, GC_PTR *ocd));
/* Do we want to and know how to save the call stack at the time of */
/* an allocation? How much space do we want to use in each object? */
/* Do we want to and know how to save the call stack at the time of */
/* an allocation? How much space do we want to use in each object? */
# define START_FLAG ((word)0xfedcedcb)
# define END_FLAG ((word)0xbcdecdef)
/* Stored both one past the end of user object, and one before */
/* the end of the object as seen by the allocator. */
/* Stored both one past the end of user object, and one before */
/* the end of the object as seen by the allocator. */
/* Object header */
typedef struct {
char * oh_string; /* object descriptor string */
word oh_int; /* object descriptor integers */
char * oh_string; /* object descriptor string */
word oh_int; /* object descriptor integers */
# ifdef NEED_CALLINFO
struct callinfo oh_ci[NFRAMES];
# endif
word oh_sz; /* Original malloc arg. */
word oh_sf; /* start flag */
word oh_sz; /* Original malloc arg. */
word oh_sf; /* start flag */
} oh;
/* The size of the above structure is assumed not to dealign things, */
/* and to be a multiple of the word length. */
/* The size of the above structure is assumed not to dealign things, */
/* and to be a multiple of the word length. */
#define DEBUG_BYTES (sizeof (oh) + sizeof (word))
#undef ROUNDED_UP_WORDS
@ -60,9 +60,9 @@ typedef struct {
# endif
#endif
/* Check whether object with base pointer p has debugging info */
/* p is assumed to point to a legitimate object in our part */
/* of the heap. */
/* Check whether object with base pointer p has debugging info */
/* p is assumed to point to a legitimate object in our part */
/* of the heap. */
GC_bool GC_has_debug_info(p)
ptr_t p;
{
@ -75,8 +75,8 @@ ptr_t p;
return(FALSE);
}
if (ohdr -> oh_sz == sz) {
/* Object may have had debug info, but has been deallocated */
return(FALSE);
/* Object may have had debug info, but has been deallocated */
return(FALSE);
}
if (ohdr -> oh_sf == (START_FLAG ^ (word)body)) return(TRUE);
if (((word *)ohdr)[BYTES_TO_WORDS(sz)-1] == (END_FLAG ^ (word)body)) {
@ -86,10 +86,10 @@ ptr_t p;
}
/* Store debugging info into p. Return displaced pointer. */
/* Assumes we don't hold allocation lock. */
/* Assumes we don't hold allocation lock. */
ptr_t GC_store_debug_info(p, sz, string, integer)
register ptr_t p; /* base pointer */
word sz; /* bytes */
register ptr_t p; /* base pointer */
word sz; /* bytes */
char * string;
word integer;
{
@ -97,9 +97,9 @@ word integer;
register word * result = (word *)(ohdr + 1);
DCL_LOCK_STATE;
/* There is some argument that we should dissble signals here. */
/* But that's expensive. And this way things should only appear */
/* inconsistent while we're in the handler. */
/* There is some argument that we should dissble signals here. */
/* But that's expensive. And this way things should only appear */
/* inconsistent while we're in the handler. */
LOCK();
ohdr -> oh_string = string;
ohdr -> oh_int = integer;
@ -111,9 +111,9 @@ word integer;
return((ptr_t)result);
}
/* Check the object with debugging info at p */
/* return NIL if it's OK. Else return clobbered */
/* address. */
/* Check the object with debugging info at p */
/* return NIL if it's OK. Else return clobbered */
/* address. */
ptr_t GC_check_annotated_obj(ohdr)
register oh * ohdr;
{
@ -159,62 +159,76 @@ ptr_t p;
#define NEXT_OBJECT(ohdr) (*(oh**)&ohdr->oh_ci[1].ci_pc)
#define IS_PLAUSIBLE_POINTER(p) ((p >= GC_least_plausible_heap_addr) && (p < GC_greatest_plausible_heap_addr))
void GC_mark_object(ptr_t p, word mark)
{
p = GC_base(p);
if (p && GC_has_debug_info(p)) {
oh *ohdr = (oh *)p;
NEXT_WORD(ohdr) = mark;
}
}
/**
* Note: this can be made completely iterative, using the mark
* field as a link to the next object to be scanned.
* Starting from specified object, traces through the entire graph of reachable objects.
* Uses extra word stored in debugging header for alignment purposes.
*/
void GC_trace_object(ptr_t p)
void GC_trace_object(ptr_t p, int verbose)
{
register oh *head, *scan, *tail;
register word *wp, *wend;
word total = 0;
DCL_LOCK_STATE;
DISABLE_SIGNALS();
LOCK();
STOP_WORLD();
head = scan = tail = (oh *)GC_base(p);
if (head) {
/* invariant: end of list always marked with value 1. */
NEXT_WORD(tail) = 1;
for (;;) {
wp = (word*)((unsigned long)scan + sizeof(oh));
p = GC_base(p);
if (p && GC_has_debug_info(p)) {
head = scan = tail = (oh *)p;
GC_err_printf3("\n0x%08lX <%s> (%ld)\n", wp, getTypeName(wp),
(unsigned long)(scan->oh_sz));
/* invariant: end of list always marked with value 1. */
NEXT_WORD(tail) = 1;
/* trace through every object reachable from this starting point. */
for (;;) {
/* print ADDRESS <type> (size) for each object. */
wp = (word*)((unsigned long)scan + sizeof(oh));
GC_err_printf3("0x%08lX <%s> (%ld)\n", wp, getTypeName(wp), scan->oh_sz);
total += scan->oh_sz;
/* print all potential references held by this object. */
wend = (word*)((unsigned long)wp + scan->oh_sz);
while (wp < wend) {
p = (ptr_t) *wp++;
GC_err_printf1("\t0x%08lX\n", p);
if (IS_PLAUSIBLE_POINTER(p)) {
oh* header = (oh *)GC_base(p);
if (header && GC_has_debug_info(header)) {
if(NEXT_WORD(header) == 0) {
NEXT_OBJECT(tail) = header;
tail = header;
/* scan/print all plausible references held by this object. */
wend = (word*)((word)wp + scan->oh_sz);
while (wp < wend) {
p = (ptr_t) *wp++;
if (verbose) GC_err_printf1("\t0x%08lX\n", p);
if (IS_PLAUSIBLE_POINTER(p)) {
p = GC_base(p);
if (p && GC_has_debug_info(p)) {
oh *ohdr = (oh *)p;
if (NEXT_WORD(ohdr) == 0) {
NEXT_OBJECT(tail) = ohdr;
tail = ohdr;
NEXT_WORD(tail) = 1;
}
}
}
}
PRINT_CALL_CHAIN(scan);
if (NEXT_WORD(scan) == 1)
break;
scan = NEXT_OBJECT(scan);
}
}
if (verbose) PRINT_CALL_CHAIN(scan);
if (NEXT_WORD(scan) == 1)
break;
scan = NEXT_OBJECT(scan);
}
GC_printf1("GC_trace_object: total = %ld\n", total);
/* clear all marks. */
scan = head;
NEXT_WORD(tail) = 0;
while (scan) {
tail = NEXT_OBJECT(scan);
NEXT_WORD(scan) = 0;
scan = tail;
}
/* clear all marks. */
scan = head;
NEXT_WORD(tail) = 0;
while (scan) {
tail = NEXT_OBJECT(scan);
NEXT_WORD(scan) = 0;
scan = tail;
}
}
START_WORLD();
@ -226,9 +240,9 @@ void GC_debug_print_heap_obj_proc(p)
ptr_t p;
{
if (GC_has_debug_info(p)) {
GC_print_obj(p);
GC_print_obj(p);
} else {
GC_default_print_heap_obj_proc(p);
GC_default_print_heap_obj_proc(p);
}
}
@ -238,11 +252,11 @@ ptr_t p, clobbered_addr;
register oh * ohdr = (oh *)GC_base(p);
GC_err_printf2("0x%lx in object at 0x%lx(", (unsigned long)clobbered_addr,
(unsigned long)p);
(unsigned long)p);
if (clobbered_addr <= (ptr_t)(&(ohdr -> oh_sz))
|| ohdr -> oh_string == 0) {
GC_err_printf1("<smashed>, appr. sz = %ld)\n",
(GC_size((ptr_t)ohdr) - DEBUG_BYTES));
(GC_size((ptr_t)ohdr) - DEBUG_BYTES));
} else {
if (ohdr -> oh_string[0] == '\0') {
GC_err_puts("EMPTY(smashed?)");
@ -250,7 +264,7 @@ ptr_t p, clobbered_addr;
GC_err_puts(ohdr -> oh_string);
}
GC_err_printf2(":%ld, sz=%ld)\n", (unsigned long)(ohdr -> oh_int),
(unsigned long)(ohdr -> oh_sz));
(unsigned long)(ohdr -> oh_sz));
PRINT_CALL_CHAIN(ohdr);
}
}
@ -292,7 +306,7 @@ void GC_start_debugging()
char * s;
int i;
# ifdef GC_ADD_CALLER
--> GC_ADD_CALLER not implemented for K&R C
--> GC_ADD_CALLER not implemented for K&R C
# endif
# endif
{
@ -300,13 +314,13 @@ void GC_start_debugging()
if (result == 0) {
GC_err_printf1("GC_debug_malloc(%ld) returning NIL (",
(unsigned long) lb);
(unsigned long) lb);
GC_err_puts(s);
GC_err_printf1(":%ld)\n", (unsigned long)i);
return(0);
}
if (!GC_debugging_started) {
GC_start_debugging();
GC_start_debugging();
}
ADD_CALL_CHAIN(result, ra);
return (GC_store_debug_info(result, (word)lb, s, (word)i));
@ -326,13 +340,13 @@ void GC_start_debugging()
if (result == 0) {
GC_err_printf1("GC_debug_malloc(%ld) returning NIL (",
(unsigned long) lb);
(unsigned long) lb);
GC_err_puts(s);
GC_err_printf1(":%ld)\n", (unsigned long)i);
return(0);
}
if (!GC_debugging_started) {
GC_start_debugging();
GC_start_debugging();
}
ADD_CALL_CHAIN(result, ra);
return (GC_store_debug_info(result, (word)lb, s, (word)i));
@ -346,13 +360,13 @@ GC_PTR p;
if (q == 0) {
GC_err_printf1("Bad argument: 0x%lx to GC_debug_change_stubborn\n",
(unsigned long) p);
(unsigned long) p);
ABORT("GC_debug_change_stubborn: bad arg");
}
hhdr = HDR(q);
if (hhdr -> hb_obj_kind != STUBBORN) {
GC_err_printf1("GC_debug_change_stubborn arg not stubborn: 0x%lx\n",
(unsigned long) p);
(unsigned long) p);
ABORT("GC_debug_change_stubborn: arg not stubborn");
}
GC_change_stubborn(q);
@ -366,13 +380,13 @@ GC_PTR p;
if (q == 0) {
GC_err_printf1("Bad argument: 0x%lx to GC_debug_end_stubborn_change\n",
(unsigned long) p);
(unsigned long) p);
ABORT("GC_debug_end_stubborn_change: bad arg");
}
hhdr = HDR(q);
if (hhdr -> hb_obj_kind != STUBBORN) {
GC_err_printf1("debug_end_stubborn_change arg not stubborn: 0x%lx\n",
(unsigned long) p);
(unsigned long) p);
ABORT("GC_debug_end_stubborn_change: arg not stubborn");
}
GC_end_stubborn_change(q);
@ -393,7 +407,7 @@ GC_PTR p;
if (result == 0) {
GC_err_printf1("GC_debug_malloc_atomic(%ld) returning NIL (",
(unsigned long) lb);
(unsigned long) lb);
GC_err_puts(s);
GC_err_printf1(":%ld)\n", (unsigned long)i);
return(0);
@ -418,7 +432,7 @@ GC_PTR p;
if (result == 0) {
GC_err_printf1("GC_debug_malloc_uncollectable(%ld) returning NIL (",
(unsigned long) lb);
(unsigned long) lb);
GC_err_puts(s);
GC_err_printf1(":%ld)\n", (unsigned long)i);
return(0);
@ -444,7 +458,7 @@ GC_PTR p;
if (result == 0) {
GC_err_printf1(
"GC_debug_malloc_atomic_uncollectable(%ld) returning NIL (",
"GC_debug_malloc_atomic_uncollectable(%ld) returning NIL (",
(unsigned long) lb);
GC_err_puts(s);
GC_err_printf1(":%ld)\n", (unsigned long)i);
@ -474,13 +488,13 @@ GC_PTR p;
if (base == 0) {
GC_err_printf1("Attempt to free invalid pointer %lx\n",
(unsigned long)p);
(unsigned long)p);
if (p != 0) ABORT("free(invalid pointer)");
}
if ((ptr_t)p - (ptr_t)base != sizeof(oh)) {
GC_err_printf1(
"GC_debug_free called on pointer %lx wo debugging info\n",
(unsigned long)p);
"GC_debug_free called on pointer %lx wo debugging info\n",
(unsigned long)p);
} else {
oh * ohdr = (oh *)base;
clobbered = GC_check_annotated_obj(ohdr);
@ -499,20 +513,20 @@ GC_PTR p;
# ifdef FIND_LEAK
GC_free(base);
# else
{
register hdr * hhdr = HDR(p);
GC_bool uncollectable = FALSE;
{
register hdr * hhdr = HDR(p);
GC_bool uncollectable = FALSE;
if (hhdr -> hb_obj_kind == UNCOLLECTABLE) {
uncollectable = TRUE;
}
# ifdef ATOMIC_UNCOLLECTABLE
if (hhdr -> hb_obj_kind == AUNCOLLECTABLE) {
uncollectable = TRUE;
}
# endif
if (uncollectable) GC_free(base);
}
if (hhdr -> hb_obj_kind == UNCOLLECTABLE) {
uncollectable = TRUE;
}
# ifdef ATOMIC_UNCOLLECTABLE
if (hhdr -> hb_obj_kind == AUNCOLLECTABLE) {
uncollectable = TRUE;
}
# endif
if (uncollectable) GC_free(base);
}
# endif
}
@ -541,8 +555,8 @@ GC_PTR p;
}
if ((ptr_t)p - (ptr_t)base != sizeof(oh)) {
GC_err_printf1(
"GC_debug_realloc called on pointer %lx wo debugging info\n",
(unsigned long)p);
"GC_debug_realloc called on pointer %lx wo debugging info\n",
(unsigned long)p);
return(GC_realloc(p, lb));
}
hhdr = HDR(base);
@ -559,12 +573,12 @@ GC_PTR p;
result = GC_debug_malloc_atomic(lb, OPT_RA s, i);
break;
case UNCOLLECTABLE:
result = GC_debug_malloc_uncollectable(lb, OPT_RA s, i);
break;
result = GC_debug_malloc_uncollectable(lb, OPT_RA s, i);
break;
# ifdef ATOMIC_UNCOLLECTABLE
case AUNCOLLECTABLE:
result = GC_debug_malloc_atomic_uncollectable(lb, OPT_RA s, i);
break;
result = GC_debug_malloc_atomic_uncollectable(lb, OPT_RA s, i);
break;
# endif
default:
GC_err_printf0("GC_debug_realloc: encountered bad kind\n");
@ -586,7 +600,7 @@ GC_PTR p;
/* Check all marked objects in the given block for validity */
/*ARGSUSED*/
void GC_check_heap_block(hbp, dummy)
register struct hblk *hbp; /* ptr to current heap block */
register struct hblk *hbp; /* ptr to current heap block */
word dummy;
{
register struct hblkhdr * hhdr = HDR(hbp);
@ -597,36 +611,36 @@ word dummy;
p = (word *)(hbp->hb_body);
word_no = HDR_WORDS;
if (sz > MAXOBJSZ) {
plim = p;
plim = p;
} else {
plim = (word *)((((word)hbp) + HBLKSIZE) - WORDS_TO_BYTES(sz));
plim = (word *)((((word)hbp) + HBLKSIZE) - WORDS_TO_BYTES(sz));
}
/* go through all words in block */
while( p <= plim ) {
if( mark_bit_from_hdr(hhdr, word_no)
&& GC_has_debug_info((ptr_t)p)) {
ptr_t clobbered = GC_check_annotated_obj((oh *)p);
if (clobbered != 0) {
GC_err_printf0(
"GC_check_heap_block: found smashed object at ");
GC_print_smashed_obj((ptr_t)p, clobbered);
}
}
word_no += sz;
p += sz;
}
while( p <= plim ) {
if( mark_bit_from_hdr(hhdr, word_no)
&& GC_has_debug_info((ptr_t)p)) {
ptr_t clobbered = GC_check_annotated_obj((oh *)p);
if (clobbered != 0) {
GC_err_printf0(
"GC_check_heap_block: found smashed object at ");
GC_print_smashed_obj((ptr_t)p, clobbered);
}
}
word_no += sz;
p += sz;
}
}
/* This assumes that all accessible objects are marked, and that */
/* I hold the allocation lock. Normally called by collector. */
/* This assumes that all accessible objects are marked, and that */
/* I hold the allocation lock. Normally called by collector. */
void GC_check_heap_proc()
{
# ifndef SMALL_CONFIG
if (sizeof(oh) & (2 * sizeof(word) - 1) != 0) {
ABORT("Alignment problem: object header has inappropriate size\n");
}
if (sizeof(oh) & (2 * sizeof(word) - 1) != 0) {
ABORT("Alignment problem: object header has inappropriate size\n");
}
# endif
GC_apply_to_all_blocks(GC_check_heap_block, (word)0);
}
@ -645,7 +659,7 @@ struct closure {
# endif
{
struct closure * result =
(struct closure *) GC_malloc(sizeof (struct closure));
(struct closure *) GC_malloc(sizeof (struct closure));
result -> cl_fn = fn;
result -> cl_data = data;
@ -668,8 +682,8 @@ struct closure {
# ifdef __STDC__
void GC_debug_register_finalizer(GC_PTR obj, GC_finalization_proc fn,
GC_PTR cd, GC_finalization_proc *ofn,
GC_PTR *ocd)
GC_PTR cd, GC_finalization_proc *ofn,
GC_PTR *ocd)
# else
void GC_debug_register_finalizer(obj, fn, cd, ofn, ocd)
GC_PTR obj;
@ -682,21 +696,21 @@ struct closure {
ptr_t base = GC_base(obj);
if (0 == base || (ptr_t)obj - base != sizeof(oh)) {
GC_err_printf1(
"GC_register_finalizer called with non-base-pointer 0x%lx\n",
obj);
"GC_register_finalizer called with non-base-pointer 0x%lx\n",
obj);
}
GC_register_finalizer(base, GC_debug_invoke_finalizer,
GC_make_closure(fn,cd), ofn, ocd);
GC_make_closure(fn,cd), ofn, ocd);
}
# ifdef __STDC__
void GC_debug_register_finalizer_no_order
(GC_PTR obj, GC_finalization_proc fn,
GC_PTR cd, GC_finalization_proc *ofn,
GC_PTR *ocd)
(GC_PTR obj, GC_finalization_proc fn,
GC_PTR cd, GC_finalization_proc *ofn,
GC_PTR *ocd)
# else
void GC_debug_register_finalizer_no_order
(obj, fn, cd, ofn, ocd)
(obj, fn, cd, ofn, ocd)
GC_PTR obj;
GC_finalization_proc fn;
GC_PTR cd;
@ -707,21 +721,21 @@ struct closure {
ptr_t base = GC_base(obj);
if (0 == base || (ptr_t)obj - base != sizeof(oh)) {
GC_err_printf1(
"GC_register_finalizer_no_order called with non-base-pointer 0x%lx\n",
obj);
"GC_register_finalizer_no_order called with non-base-pointer 0x%lx\n",
obj);
}
GC_register_finalizer_no_order(base, GC_debug_invoke_finalizer,
GC_make_closure(fn,cd), ofn, ocd);
GC_make_closure(fn,cd), ofn, ocd);
}
# ifdef __STDC__
void GC_debug_register_finalizer_ignore_self
(GC_PTR obj, GC_finalization_proc fn,
GC_PTR cd, GC_finalization_proc *ofn,
GC_PTR *ocd)
(GC_PTR obj, GC_finalization_proc fn,
GC_PTR cd, GC_finalization_proc *ofn,
GC_PTR *ocd)
# else
void GC_debug_register_finalizer_ignore_self
(obj, fn, cd, ofn, ocd)
(obj, fn, cd, ofn, ocd)
GC_PTR obj;
GC_finalization_proc fn;
GC_PTR cd;
@ -732,9 +746,9 @@ struct closure {
ptr_t base = GC_base(obj);
if (0 == base || (ptr_t)obj - base != sizeof(oh)) {
GC_err_printf1(
"GC_register_finalizer_ignore_self called with non-base-pointer 0x%lx\n",
obj);
"GC_register_finalizer_ignore_self called with non-base-pointer 0x%lx\n",
obj);
}
GC_register_finalizer_ignore_self(base, GC_debug_invoke_finalizer,
GC_make_closure(fn,cd), ofn, ocd);
GC_make_closure(fn,cd), ofn, ocd);
}