/* of the heap. */
/* This excludes the check as to whether the back pointer is */
/* odd, which is added by the GC_HAS_DEBUG_INFO macro. */
- /* Note that if DBG_HDRS_ALL is set, uncollectable objects */
+ /* Note that if DBG_HDRS_ALL is set, uncollectible objects */
/* on free lists may not have debug information set. Thus it's */
/* not always safe to return TRUE (1), even if the client does */
/* its part. Return -1 if the object with debug info has been */
}
#endif /* !SHORT_DBG_HDRS */
+#ifdef LINT2
+ long GC_random(void)
+ {
+ static unsigned seed = 1; /* not thread-safe */
+
+ /* Linear congruential pseudo-random numbers generator. */
+ seed = (seed * 1103515245U + 12345) & GC_RAND_MAX; /* overflow is ok */
+ return (long)seed;
+ }
+#endif
+
#ifdef KEEP_BACK_PTRS
+#ifdef LINT2
+# define RANDOM() GC_random()
+#else
# include <stdlib.h>
+# define GC_RAND_MAX RAND_MAX
# if defined(__GLIBC__) || defined(SOLARIS) \
|| defined(HPUX) || defined(IRIX5) || defined(OSF1)
# else
# define RANDOM() (long)rand()
# endif
+#endif /* !LINT2 */
/* Store back pointer to source in dest, if that appears to be possible. */
/* This is not completely safe, since we may mistakenly conclude that */
GC_INNER void GC_store_back_pointer(ptr_t source, ptr_t dest)
{
if (GC_HAS_DEBUG_INFO(dest)) {
- ((oh *)dest) -> oh_back_ptr = HIDE_BACK_PTR(source);
+# ifdef PARALLEL_MARK
+ AO_store((volatile AO_t *)&((oh *)dest)->oh_back_ptr,
+ (AO_t)HIDE_BACK_PTR(source));
+# else
+ ((oh *)dest) -> oh_back_ptr = HIDE_BACK_PTR(source);
+# endif
}
}
if (!hdr) ABORT("Invalid GC_get_back_ptr_info argument");
# endif
if (!GC_HAS_DEBUG_INFO((ptr_t) hdr)) return GC_NO_SPACE;
- bp = GC_REVEAL_POINTER(hdr -> oh_back_ptr);
+ bp = (ptr_t)GC_REVEAL_POINTER(hdr -> oh_back_ptr);
if (MARKED_FOR_FINALIZATION == bp) return GC_FINALIZER_REFD;
if (MARKED_FROM_REGISTER == bp) return GC_REFD_FROM_REG;
if (NOT_MARKED == bp) return GC_UNREFERENCED;
}
}
# endif
- bp_base = GC_base(bp);
- if (0 == bp_base) {
+ bp_base = (ptr_t)GC_base(bp);
+ if (NULL == bp_base) {
*base_p = bp;
*offset_p = 0;
return GC_REFD_FROM_ROOT;
GC_API void * GC_CALL GC_generate_random_heap_address(void)
{
size_t i;
- size_t size;
word heap_offset = RANDOM();
- if (GC_heapsize > RAND_MAX) {
- heap_offset *= RAND_MAX;
+ if (GC_heapsize > GC_RAND_MAX) {
+ heap_offset *= GC_RAND_MAX;
heap_offset += RANDOM();
}
heap_offset %= GC_heapsize;
/* e.g. RAND_MAX = 1.5* GC_heapsize. But for typical cases, */
/* it's not too bad. */
for (i = 0;; ++i) {
+ size_t size;
+
if (i >= GC_n_heap_sects)
ABORT("GC_generate_random_heap_address: size inconsistency");
ptr_t result;
ptr_t base;
do {
- result = GC_generate_random_heap_address();
- base = GC_base(result);
- } while (base == 0 || !GC_is_marked(base));
+ result = (ptr_t)GC_generate_random_heap_address();
+ base = (ptr_t)GC_base(result);
+ } while (NULL == base || !GC_is_marked(base));
return result;
}
size_t offset;
void *base;
- GC_print_heap_obj(GC_base(current));
- GC_err_printf("\n");
+ GC_print_heap_obj((ptr_t)GC_base(current));
+
for (i = 0; ; ++i) {
source = GC_get_back_ptr_info(current, &base, &offset);
if (GC_UNREFERENCED == source) {
case GC_REFD_FROM_HEAP:
GC_err_printf("offset %ld in object:\n", (long)offset);
/* Take GC_base(base) to get real base, i.e. header. */
- GC_print_heap_obj(GC_base(base));
- GC_err_printf("\n");
+ GC_print_heap_obj((ptr_t)GC_base(base));
break;
default:
GC_err_printf("INTERNAL ERROR: UNEXPECTED SOURCE!!!!\n");
out:;
}
- /* Force a garbage collection and generate a backtrace from a */
- /* random heap address. */
+ /* Force a garbage collection and generate/print a backtrace */
+ /* from a random heap address. */
GC_INNER void GC_generate_random_backtrace_no_gc(void)
{
void * current;
# define CROSSES_HBLK(p, sz) \
(((word)((p) + sizeof(oh) + (sz) - 1) ^ (word)(p)) >= HBLKSIZE)
-/* Store debugging info into p. Return displaced pointer. */
-/* This version assumes we do hold the allocation lock. */
-STATIC ptr_t GC_store_debug_info_inner(ptr_t p, word sz GC_ATTR_UNUSED,
- const char *string, int linenum)
+GC_INNER void *GC_store_debug_info_inner(void *p, word sz GC_ATTR_UNUSED,
+ const char *string, int linenum)
{
word * result = (word *)((oh *)p + 1);
+ GC_ASSERT(I_HOLD_LOCK());
GC_ASSERT(GC_size(p) >= sizeof(oh) + sz);
- GC_ASSERT(!(SMALL_OBJ(sz) && CROSSES_HBLK(p, sz)));
+ GC_ASSERT(!(SMALL_OBJ(sz) && CROSSES_HBLK((ptr_t)p, sz)));
# ifdef KEEP_BACK_PTRS
((oh *)p) -> oh_back_ptr = HIDE_BACK_PTR(NOT_MARKED);
# endif
((word *)p)[BYTES_TO_WORDS(GC_size(p))-1] =
result[SIMPLE_ROUNDED_UP_WORDS(sz)] = END_FLAG ^ (word)result;
# endif
- return((ptr_t)result);
+ return result;
}
-GC_INNER ptr_t GC_store_debug_info(ptr_t p, word sz, const char *string,
- int linenum)
+/* Check the allocation is successful, store debugging info into p, */
+/* start the debugging mode (if not yet), and return displaced pointer. */
+#ifdef GC_ADD_CALLER
+# define STORE_DEBUG_INFO(p, lb, fn) store_debug_info(p, lb, fn, ra, s, i)
+#else
+# define STORE_DEBUG_INFO(p, lb, fn) store_debug_info(p, lb, fn, s, i)
+#endif
+static void *store_debug_info(void *p, size_t lb,
+ const char *fn, GC_EXTRA_PARAMS)
{
- ptr_t result;
+ void *result;
DCL_LOCK_STATE;
+ if (NULL == p) {
+ GC_err_printf("%s(%lu) returning NULL (%s:%d)\n",
+ fn, (unsigned long)lb, s, i);
+ return NULL;
+ }
LOCK();
- result = GC_store_debug_info_inner(p, sz, string, linenum);
+ if (!GC_debugging_started)
+ GC_start_debugging_inner();
+ ADD_CALL_CHAIN(p, ra);
+ result = GC_store_debug_info_inner(p, (word)lb, s, i);
UNLOCK();
return result;
}
GC_describe_type_fns[kind] = fn;
}
-/* Print a type description for the object whose client-visible address */
-/* is p. */
-STATIC void GC_print_type(ptr_t p)
+#define GET_OH_LINENUM(ohdr) ((int)(ohdr)->oh_int)
+
+#ifndef SHORT_DBG_HDRS
+# define IF_NOT_SHORTDBG_HDRS(x) x
+# define COMMA_IFNOT_SHORTDBG_HDRS(x) /* comma */, x
+#else
+# define IF_NOT_SHORTDBG_HDRS(x) /* empty */
+# define COMMA_IFNOT_SHORTDBG_HDRS(x) /* empty */
+#endif
+
+/* Print a human-readable description of the object to stderr. */
+/* p points to somewhere inside an object with the debugging info. */
+STATIC void GC_print_obj(ptr_t p)
{
- hdr * hhdr = GC_find_header(p);
+ oh * ohdr = (oh *)GC_base(p);
+ ptr_t q;
+ hdr * hhdr;
+ int kind;
+ const char *kind_str;
char buffer[GC_TYPE_DESCR_LEN + 1];
- int kind = hhdr -> hb_obj_kind;
- if (0 != GC_describe_type_fns[kind] && GC_is_marked(GC_base(p))) {
+ GC_ASSERT(I_DONT_HOLD_LOCK());
+# ifdef LINT2
+ if (!ohdr) ABORT("Invalid GC_print_obj argument");
+# endif
+
+ q = (ptr_t)(ohdr + 1);
+ /* Print a type description for the object whose client-visible */
+ /* address is q. */
+ hhdr = GC_find_header(q);
+ kind = hhdr -> hb_obj_kind;
+ if (0 != GC_describe_type_fns[kind] && GC_is_marked(ohdr)) {
/* This should preclude free list objects except with */
/* thread-local allocation. */
buffer[GC_TYPE_DESCR_LEN] = 0;
- (GC_describe_type_fns[kind])(p, buffer);
+ (GC_describe_type_fns[kind])(q, buffer);
GC_ASSERT(buffer[GC_TYPE_DESCR_LEN] == 0);
- GC_err_puts(buffer);
+ kind_str = buffer;
} else {
switch(kind) {
case PTRFREE:
- GC_err_puts("PTRFREE");
+ kind_str = "PTRFREE";
break;
case NORMAL:
- GC_err_puts("NORMAL");
+ kind_str = "NORMAL";
break;
case UNCOLLECTABLE:
- GC_err_puts("UNCOLLECTABLE");
+ kind_str = "UNCOLLECTABLE";
break;
-# ifdef ATOMIC_UNCOLLECTABLE
+# ifdef GC_ATOMIC_UNCOLLECTABLE
case AUNCOLLECTABLE:
- GC_err_puts("ATOMIC UNCOLLECTABLE");
+ kind_str = "ATOMIC_UNCOLLECTABLE";
break;
# endif
case STUBBORN:
- GC_err_puts("STUBBORN");
+ kind_str = "STUBBORN";
break;
default:
- GC_err_printf("kind=%d descr=0x%lx", kind,
- (unsigned long)(hhdr -> hb_descr));
+ kind_str = NULL;
+ /* The alternative is to use snprintf(buffer) but it is */
+ /* not quite portable (see vsnprintf in misc.c). */
}
}
-}
-#define GET_OH_LINENUM(ohdr) ((int)(ohdr)->oh_int)
-
-/* Print a human-readable description of the object to stderr. p points */
-/* to somewhere inside an object with the debugging info. */
-STATIC void GC_print_obj(ptr_t p)
-{
- oh * ohdr = (oh *)GC_base(p);
-
- GC_ASSERT(I_DONT_HOLD_LOCK());
-# ifdef LINT2
- if (!ohdr) ABORT("Invalid GC_print_obj argument");
-# endif
- GC_err_printf("%p (", ((ptr_t)ohdr + sizeof(oh)));
- GC_err_puts(ohdr -> oh_string);
-# ifdef SHORT_DBG_HDRS
- GC_err_printf(":%d, ", GET_OH_LINENUM(ohdr));
-# else
- GC_err_printf(":%d, sz=%lu, ",
- GET_OH_LINENUM(ohdr), (unsigned long)(ohdr -> oh_sz));
-# endif
- GC_print_type((ptr_t)(ohdr + 1));
- GC_err_puts(")\n");
+ if (NULL != kind_str) {
+ GC_err_printf("%p (%s:%d," IF_NOT_SHORTDBG_HDRS(" sz=%lu,") " %s)\n",
+ (void *)((ptr_t)ohdr + sizeof(oh)),
+ ohdr->oh_string, GET_OH_LINENUM(ohdr) /*, */
+ COMMA_IFNOT_SHORTDBG_HDRS((unsigned long)ohdr->oh_sz),
+ kind_str);
+ } else {
+ GC_err_printf("%p (%s:%d," IF_NOT_SHORTDBG_HDRS(" sz=%lu,")
+ " kind=%d descr=0x%lx)\n",
+ (void *)((ptr_t)ohdr + sizeof(oh)),
+ ohdr->oh_string, GET_OH_LINENUM(ohdr) /*, */
+ COMMA_IFNOT_SHORTDBG_HDRS((unsigned long)ohdr->oh_sz),
+ kind, (unsigned long)hhdr->hb_descr);
+ }
PRINT_CALL_CHAIN(ohdr);
}
/* Use GC_err_printf and friends to print a description of the object */
/* whose client-visible address is p, and which was smashed at */
/* clobbered_addr. */
- STATIC void GC_print_smashed_obj(const char *msg, ptr_t p,
+ STATIC void GC_print_smashed_obj(const char *msg, void *p,
ptr_t clobbered_addr)
{
oh * ohdr = (oh *)GC_base(p);
|| ohdr -> oh_string == 0) {
GC_err_printf(
"%s %p in or near object at %p(<smashed>, appr. sz = %lu)\n",
- msg, clobbered_addr, p,
+ msg, (void *)clobbered_addr, p,
(unsigned long)(GC_size((ptr_t)ohdr) - DEBUG_BYTES));
} else {
GC_err_printf("%s %p in or near object at %p (%s:%d, sz=%lu)\n",
- msg, clobbered_addr, p,
+ msg, (void *)clobbered_addr, p,
(word)(ohdr -> oh_string) < HBLKSIZE ? "(smashed string)" :
ohdr -> oh_string[0] == '\0' ? "EMPTY(smashed?)" :
ohdr -> oh_string,
PRINT_CALL_CHAIN(ohdr);
}
}
-#endif
-#ifndef SHORT_DBG_HDRS
STATIC void GC_check_heap_proc (void);
STATIC void GC_print_all_smashed_proc (void);
#else
STATIC void GC_do_nothing(void) {}
#endif
-GC_INNER void GC_start_debugging(void)
+GC_INNER void GC_start_debugging_inner(void)
{
+ GC_ASSERT(I_HOLD_LOCK());
# ifndef SHORT_DBG_HDRS
GC_check_heap = GC_check_heap_proc;
GC_print_all_smashed = GC_print_all_smashed_proc;
# endif
GC_print_heap_obj = GC_debug_print_heap_obj_proc;
GC_debugging_started = TRUE;
- GC_register_displacement((word)sizeof(oh));
+ GC_register_displacement_inner((word)sizeof(oh));
}
size_t GC_debug_header_size = sizeof(oh);
GC_API void GC_CALL GC_debug_register_displacement(size_t offset)
{
- GC_register_displacement(offset);
- GC_register_displacement((word)sizeof(oh) + offset);
+ DCL_LOCK_STATE;
+
+ LOCK();
+ GC_register_displacement_inner(offset);
+ GC_register_displacement_inner((word)sizeof(oh) + offset);
+ UNLOCK();
}
-GC_API void * GC_CALL GC_debug_malloc(size_t lb, GC_EXTRA_PARAMS)
+#ifdef GC_ADD_CALLER
+# if defined(HAVE_DLADDR) && defined(GC_HAVE_RETURN_ADDR_PARENT)
+# include <dlfcn.h>
+
+ STATIC void GC_caller_func_offset(word ad, const char **symp, int *offp)
+ {
+ Dl_info caller;
+
+ if (ad && dladdr((void *)ad, &caller) && caller.dli_sname != NULL) {
+ *symp = caller.dli_sname;
+ *offp = (int)((char *)ad - (char *)caller.dli_saddr);
+ }
+ if (NULL == *symp) {
+ *symp = "unknown";
+ }
+ }
+# else
+# define GC_caller_func_offset(ad, symp, offp) (void)(*(symp) = "unknown")
+# endif
+#endif /* GC_ADD_CALLER */
+
+GC_API GC_ATTR_MALLOC void * GC_CALL GC_debug_malloc(size_t lb,
+ GC_EXTRA_PARAMS)
{
void * result;
+
/* Note that according to malloc() specification, if size is 0 then */
/* malloc() returns either NULL, or a unique pointer value that can */
/* later be successfully passed to free(). We always do the latter. */
- result = GC_malloc(lb + DEBUG_BYTES);
+ result = GC_malloc(SIZET_SAT_ADD(lb, DEBUG_BYTES));
+# ifdef GC_ADD_CALLER
+ if (s == NULL) {
+ GC_caller_func_offset(ra, &s, &i);
+ }
+# endif
+ return STORE_DEBUG_INFO(result, lb, "GC_debug_malloc");
+}
- if (result == 0) {
- GC_err_printf("GC_debug_malloc(%lu) returning NULL (",
- (unsigned long) lb);
- GC_err_puts(s);
- GC_err_printf(":%d)\n", i);
- return(0);
- }
- if (!GC_debugging_started) {
- GC_start_debugging();
- }
- ADD_CALL_CHAIN(result, ra);
- return (GC_store_debug_info(result, (word)lb, s, i));
+GC_API GC_ATTR_MALLOC void * GC_CALL
+ GC_debug_malloc_ignore_off_page(size_t lb, GC_EXTRA_PARAMS)
+{
+ void * result = GC_malloc_ignore_off_page(SIZET_SAT_ADD(lb, DEBUG_BYTES));
+
+ return STORE_DEBUG_INFO(result, lb, "GC_debug_malloc_ignore_off_page");
}
-GC_API void * GC_CALL GC_debug_malloc_ignore_off_page(size_t lb,
- GC_EXTRA_PARAMS)
+GC_API GC_ATTR_MALLOC void * GC_CALL
+ GC_debug_malloc_atomic_ignore_off_page(size_t lb, GC_EXTRA_PARAMS)
{
- void * result = GC_malloc_ignore_off_page(lb + DEBUG_BYTES);
+ void * result = GC_malloc_atomic_ignore_off_page(
+ SIZET_SAT_ADD(lb, DEBUG_BYTES));
- if (result == 0) {
- GC_err_printf("GC_debug_malloc_ignore_off_page(%lu) returning NULL (",
- (unsigned long) lb);
- GC_err_puts(s);
- GC_err_printf(":%d)\n", i);
- return(0);
- }
- if (!GC_debugging_started) {
- GC_start_debugging();
- }
- ADD_CALL_CHAIN(result, ra);
- return (GC_store_debug_info(result, (word)lb, s, i));
+ return STORE_DEBUG_INFO(result, lb,
+ "GC_debug_malloc_atomic_ignore_off_page");
}
-GC_API void * GC_CALL GC_debug_malloc_atomic_ignore_off_page(size_t lb,
- GC_EXTRA_PARAMS)
+STATIC void * GC_debug_generic_malloc(size_t lb, int knd, GC_EXTRA_PARAMS)
{
- void * result = GC_malloc_atomic_ignore_off_page(lb + DEBUG_BYTES);
+ void * result = GC_generic_malloc(SIZET_SAT_ADD(lb, DEBUG_BYTES), knd);
- if (result == 0) {
- GC_err_printf("GC_debug_malloc_atomic_ignore_off_page(%lu)"
- " returning NULL (", (unsigned long)lb);
- GC_err_puts(s);
- GC_err_printf(":%d)\n", i);
- return(0);
- }
- if (!GC_debugging_started) {
- GC_start_debugging();
- }
- ADD_CALL_CHAIN(result, ra);
- return (GC_store_debug_info(result, (word)lb, s, i));
+ return STORE_DEBUG_INFO(result, lb, "GC_debug_generic_malloc");
}
#ifdef DBG_HDRS_ALL
/* An allocation function for internal use. Normally internally */
/* allocated objects do not have debug information. But in this */
/* case, we need to make sure that all objects have debug headers. */
- /* We assume debugging was started in collector initialization, and */
- /* we already hold the GC lock. */
GC_INNER void * GC_debug_generic_malloc_inner(size_t lb, int k)
{
- void * result = GC_generic_malloc_inner(lb + DEBUG_BYTES, k);
+ void * result;
- if (result == 0) {
+ GC_ASSERT(I_HOLD_LOCK());
+ result = GC_generic_malloc_inner(SIZET_SAT_ADD(lb, DEBUG_BYTES), k);
+ if (NULL == result) {
GC_err_printf("GC internal allocation (%lu bytes) returning NULL\n",
(unsigned long) lb);
return(0);
}
if (!GC_debugging_started) {
- GC_start_debugging();
+ GC_start_debugging_inner();
}
ADD_CALL_CHAIN(result, GC_RETURN_ADDR);
return (GC_store_debug_info_inner(result, (word)lb, "INTERNAL", 0));
GC_INNER void * GC_debug_generic_malloc_inner_ignore_off_page(size_t lb,
int k)
{
- void * result = GC_generic_malloc_inner_ignore_off_page(
- lb + DEBUG_BYTES, k);
+ void * result;
- if (result == 0) {
+ GC_ASSERT(I_HOLD_LOCK());
+ result = GC_generic_malloc_inner_ignore_off_page(
+ SIZET_SAT_ADD(lb, DEBUG_BYTES), k);
+ if (NULL == result) {
GC_err_printf("GC internal allocation (%lu bytes) returning NULL\n",
(unsigned long) lb);
return(0);
}
if (!GC_debugging_started) {
- GC_start_debugging();
+ GC_start_debugging_inner();
}
ADD_CALL_CHAIN(result, GC_RETURN_ADDR);
return (GC_store_debug_info_inner(result, (word)lb, "INTERNAL", 0));
#endif /* DBG_HDRS_ALL */
#ifdef STUBBORN_ALLOC
- GC_API void * GC_CALL GC_debug_malloc_stubborn(size_t lb, GC_EXTRA_PARAMS)
+ GC_API GC_ATTR_MALLOC void * GC_CALL GC_debug_malloc_stubborn(size_t lb,
+ GC_EXTRA_PARAMS)
{
- void * result = GC_malloc_stubborn(lb + DEBUG_BYTES);
+ void * result = GC_malloc_stubborn(SIZET_SAT_ADD(lb, DEBUG_BYTES));
- if (result == 0) {
- GC_err_printf("GC_debug_malloc(%lu) returning NULL (",
- (unsigned long) lb);
- GC_err_puts(s);
- GC_err_printf(":%d)\n", i);
- return(0);
- }
- if (!GC_debugging_started) {
- GC_start_debugging();
- }
- ADD_CALL_CHAIN(result, ra);
- return (GC_store_debug_info(result, (word)lb, s, i));
+ return STORE_DEBUG_INFO(result, lb, "GC_debug_malloc_stubborn");
}
GC_API void GC_CALL GC_debug_change_stubborn(const void *p)
hdr * hhdr;
if (q == 0) {
- GC_err_printf("Bad argument: %p to GC_debug_change_stubborn\n", p);
- ABORT("GC_debug_change_stubborn: bad arg");
+ ABORT_ARG1("GC_debug_change_stubborn: bad arg", ": %p", p);
}
hhdr = HDR(q);
if (hhdr -> hb_obj_kind != STUBBORN) {
- GC_err_printf("GC_debug_change_stubborn arg not stubborn: %p\n", p);
- ABORT("GC_debug_change_stubborn: arg not stubborn");
+ ABORT_ARG1("GC_debug_change_stubborn: arg not stubborn", ": %p", p);
}
GC_change_stubborn(q);
}
hdr * hhdr;
if (q == 0) {
- GC_err_printf("Bad argument: %p to GC_debug_end_stubborn_change\n", p);
- ABORT("GC_debug_end_stubborn_change: bad arg");
+ ABORT_ARG1("GC_debug_end_stubborn_change: bad arg", ": %p", p);
}
hhdr = HDR(q);
if (hhdr -> hb_obj_kind != STUBBORN) {
- GC_err_printf("debug_end_stubborn_change arg not stubborn: %p\n", p);
- ABORT("GC_debug_end_stubborn_change: arg not stubborn");
+ ABORT_ARG1("GC_debug_end_stubborn_change: arg not stubborn",
+ ": %p", p);
}
GC_end_stubborn_change(q);
}
#else /* !STUBBORN_ALLOC */
- GC_API void * GC_CALL GC_debug_malloc_stubborn(size_t lb, GC_EXTRA_PARAMS)
+ GC_API GC_ATTR_MALLOC void * GC_CALL GC_debug_malloc_stubborn(size_t lb,
+ GC_EXTRA_PARAMS)
{
return GC_debug_malloc(lb, OPT_RA s, i);
}
const void * p GC_ATTR_UNUSED) {}
#endif /* !STUBBORN_ALLOC */
-GC_API void * GC_CALL GC_debug_malloc_atomic(size_t lb, GC_EXTRA_PARAMS)
+GC_API GC_ATTR_MALLOC void * GC_CALL GC_debug_malloc_atomic(size_t lb,
+ GC_EXTRA_PARAMS)
{
- void * result = GC_malloc_atomic(lb + DEBUG_BYTES);
+ void * result = GC_malloc_atomic(SIZET_SAT_ADD(lb, DEBUG_BYTES));
- if (result == 0) {
- GC_err_printf("GC_debug_malloc_atomic(%lu) returning NULL (",
- (unsigned long) lb);
- GC_err_puts(s);
- GC_err_printf(":%d)\n", i);
- return(0);
- }
- if (!GC_debugging_started) {
- GC_start_debugging();
- }
- ADD_CALL_CHAIN(result, ra);
- return (GC_store_debug_info(result, (word)lb, s, i));
+ return STORE_DEBUG_INFO(result, lb, "GC_debug_malloc_atomic");
}
-GC_API char * GC_CALL GC_debug_strdup(const char *str, GC_EXTRA_PARAMS)
+GC_API GC_ATTR_MALLOC char * GC_CALL GC_debug_strdup(const char *str,
+ GC_EXTRA_PARAMS)
{
char *copy;
size_t lb;
}
lb = strlen(str) + 1;
- copy = GC_debug_malloc_atomic(lb, OPT_RA s, i);
+ copy = (char *)GC_debug_malloc_atomic(lb, OPT_RA s, i);
if (copy == NULL) {
# ifndef MSWINCE
errno = ENOMEM;
return copy;
}
-GC_API char * GC_CALL GC_debug_strndup(const char *str, size_t size,
- GC_EXTRA_PARAMS)
+GC_API GC_ATTR_MALLOC char * GC_CALL GC_debug_strndup(const char *str,
+ size_t size, GC_EXTRA_PARAMS)
{
char *copy;
size_t len = strlen(str); /* str is expected to be non-NULL */
if (len > size)
len = size;
- copy = GC_debug_malloc_atomic(len + 1, OPT_RA s, i);
+ copy = (char *)GC_debug_malloc_atomic(len + 1, OPT_RA s, i);
if (copy == NULL) {
# ifndef MSWINCE
errno = ENOMEM;
# endif
return NULL;
}
- BCOPY(str, copy, len);
+ if (len > 0)
+ BCOPY(str, copy, len);
copy[len] = '\0';
return copy;
}
#ifdef GC_REQUIRE_WCSDUP
# include <wchar.h> /* for wcslen() */
- GC_API wchar_t * GC_CALL GC_debug_wcsdup(const wchar_t *str, GC_EXTRA_PARAMS)
+ GC_API GC_ATTR_MALLOC wchar_t * GC_CALL GC_debug_wcsdup(const wchar_t *str,
+ GC_EXTRA_PARAMS)
{
size_t lb = (wcslen(str) + 1) * sizeof(wchar_t);
- wchar_t *copy = GC_debug_malloc_atomic(lb, OPT_RA s, i);
+ wchar_t *copy = (wchar_t *)GC_debug_malloc_atomic(lb, OPT_RA s, i);
if (copy == NULL) {
# ifndef MSWINCE
errno = ENOMEM;
}
#endif /* GC_REQUIRE_WCSDUP */
-GC_API void * GC_CALL GC_debug_malloc_uncollectable(size_t lb,
- GC_EXTRA_PARAMS)
+GC_API GC_ATTR_MALLOC void * GC_CALL GC_debug_malloc_uncollectable(size_t lb,
+ GC_EXTRA_PARAMS)
{
- void * result = GC_malloc_uncollectable(lb + UNCOLLECTABLE_DEBUG_BYTES);
+ void * result = GC_malloc_uncollectable(
+ SIZET_SAT_ADD(lb, UNCOLLECTABLE_DEBUG_BYTES));
- if (result == 0) {
- GC_err_printf("GC_debug_malloc_uncollectable(%lu) returning NULL (",
- (unsigned long) lb);
- GC_err_puts(s);
- GC_err_printf(":%d)\n", i);
- return(0);
- }
- if (!GC_debugging_started) {
- GC_start_debugging();
- }
- ADD_CALL_CHAIN(result, ra);
- return (GC_store_debug_info(result, (word)lb, s, i));
+ return STORE_DEBUG_INFO(result, lb, "GC_debug_malloc_uncollectable");
}
-#ifdef ATOMIC_UNCOLLECTABLE
- GC_API void * GC_CALL GC_debug_malloc_atomic_uncollectable(size_t lb,
- GC_EXTRA_PARAMS)
+#ifdef GC_ATOMIC_UNCOLLECTABLE
+ GC_API GC_ATTR_MALLOC void * GC_CALL
+ GC_debug_malloc_atomic_uncollectable(size_t lb, GC_EXTRA_PARAMS)
{
- void * result =
- GC_malloc_atomic_uncollectable(lb + UNCOLLECTABLE_DEBUG_BYTES);
+ void * result = GC_malloc_atomic_uncollectable(
+ SIZET_SAT_ADD(lb, UNCOLLECTABLE_DEBUG_BYTES));
- if (result == 0) {
- GC_err_printf(
- "GC_debug_malloc_atomic_uncollectable(%lu) returning NULL (",
- (unsigned long) lb);
- GC_err_puts(s);
- GC_err_printf(":%d)\n", i);
- return(0);
- }
- if (!GC_debugging_started) {
- GC_start_debugging();
- }
- ADD_CALL_CHAIN(result, ra);
- return (GC_store_debug_info(result, (word)lb, s, i));
+ return STORE_DEBUG_INFO(result, lb,
+ "GC_debug_malloc_atomic_uncollectable");
}
-#endif /* ATOMIC_UNCOLLECTABLE */
+#endif /* GC_ATOMIC_UNCOLLECTABLE */
#ifndef GC_FREED_MEM_MARKER
# if CPP_WORDSZ == 32
ptr_t base;
if (0 == p) return;
- base = GC_base(p);
- if (base == 0) {
- GC_err_printf("Attempt to free invalid pointer %p\n", p);
- ABORT("Invalid pointer passed to free()");
+ base = (ptr_t)GC_base(p);
+ if (NULL == base) {
+# if defined(REDIRECT_MALLOC) \
+ && ((defined(NEED_CALLINFO) && defined(GC_HAVE_BUILTIN_BACKTRACE)) \
+ || defined(GC_LINUX_THREADS) || defined(GC_SOLARIS_THREADS) \
+ || defined(MSWIN32))
+ /* In some cases, we should ignore objects that do not belong */
+ /* to the GC heap. See the comment in GC_free. */
+ if (!GC_is_heap_ptr(p)) return;
+# endif
+ ABORT_ARG1("Invalid pointer passed to free()", ": %p", p);
}
if ((ptr_t)p - (ptr_t)base != sizeof(oh)) {
+# if defined(REDIRECT_FREE) && defined(USE_PROC_FOR_LIBRARIES)
+ /* TODO: Suppress the warning if free() caller is in libpthread */
+ /* or libdl. */
+# endif
GC_err_printf(
"GC_debug_free called on pointer %p w/o debugging info\n", p);
} else {
} else {
hdr * hhdr = HDR(p);
if (hhdr -> hb_obj_kind == UNCOLLECTABLE
-# ifdef ATOMIC_UNCOLLECTABLE
+# ifdef GC_ATOMIC_UNCOLLECTABLE
|| hhdr -> hb_obj_kind == AUNCOLLECTABLE
# endif
) {
GC_free(base);
} else {
- size_t i;
- size_t obj_sz = BYTES_TO_WORDS(hhdr -> hb_sz - sizeof(oh));
+ word i;
+ word obj_sz = BYTES_TO_WORDS(hhdr->hb_sz - sizeof(oh));
for (i = 0; i < obj_sz; ++i)
((word *)p)[i] = GC_FREED_MEM_MARKER;
/* Used internally; we assume it's called correctly. */
GC_INNER void GC_debug_free_inner(void * p)
{
- ptr_t base = GC_base(p);
+ ptr_t base = (ptr_t)GC_base(p);
GC_ASSERT((ptr_t)p - (ptr_t)base == sizeof(oh));
# ifdef LINT2
if (!base) ABORT("Invalid GC_debug_free_inner argument");
void * base;
void * result;
hdr * hhdr;
- if (p == 0)
- return(GC_debug_malloc(lb, OPT_RA s, i));
+ if (p == 0) {
+ return GC_debug_malloc(lb, OPT_RA s, i);
+ }
+ if (0 == lb) /* and p != NULL */ {
+ GC_debug_free(p);
+ return NULL;
+ }
+
+# ifdef GC_ADD_CALLER
+ if (s == NULL) {
+ GC_caller_func_offset(ra, &s, &i);
+ }
+# endif
base = GC_base(p);
if (base == 0) {
- GC_err_printf("Attempt to reallocate invalid pointer %p\n", p);
- ABORT("Invalid pointer passed to realloc()");
+ ABORT_ARG1("Invalid pointer passed to realloc()", ": %p", p);
}
if ((ptr_t)p - (ptr_t)base != sizeof(oh)) {
GC_err_printf(
case UNCOLLECTABLE:
result = GC_debug_malloc_uncollectable(lb, OPT_RA s, i);
break;
-# ifdef ATOMIC_UNCOLLECTABLE
+# ifdef GC_ATOMIC_UNCOLLECTABLE
case AUNCOLLECTABLE:
result = GC_debug_malloc_atomic_uncollectable(lb, OPT_RA s, i);
break;
# endif
default:
result = NULL; /* initialized to prevent warning. */
- GC_err_printf("GC_debug_realloc: encountered bad kind\n");
- ABORT_RET("Bad kind");
+ ABORT_RET("GC_debug_realloc: encountered bad kind");
}
if (result != NULL) {
# else
old_sz = ((oh *)base) -> oh_sz;
# endif
- BCOPY(p, result, old_sz < lb ? old_sz : lb);
+ if (old_sz > 0)
+ BCOPY(p, result, old_sz < lb ? old_sz : lb);
GC_debug_free(p);
}
return(result);
}
+GC_API GC_ATTR_MALLOC void * GC_CALL
+ GC_debug_generic_or_special_malloc(size_t lb, int knd, GC_EXTRA_PARAMS)
+{
+ switch (knd) {
+# ifdef STUBBORN_ALLOC
+ case STUBBORN:
+ return GC_debug_malloc_stubborn(lb, OPT_RA s, i);
+# endif
+ case PTRFREE:
+ return GC_debug_malloc_atomic(lb, OPT_RA s, i);
+ case NORMAL:
+ return GC_debug_malloc(lb, OPT_RA s, i);
+ case UNCOLLECTABLE:
+ return GC_debug_malloc_uncollectable(lb, OPT_RA s, i);
+# ifdef GC_ATOMIC_UNCOLLECTABLE
+ case AUNCOLLECTABLE:
+ return GC_debug_malloc_atomic_uncollectable(lb, OPT_RA s, i);
+# endif
+ default:
+ return GC_debug_generic_malloc(lb, knd, OPT_RA s, i);
+ }
+}
+
#ifndef SHORT_DBG_HDRS
/* List of smashed (clobbered) locations. We defer printing these, */
GC_ASSERT(I_DONT_HOLD_LOCK());
if (GC_n_smashed == 0) return;
- GC_err_printf("GC_check_heap_block: found smashed heap objects:\n");
+ GC_err_printf("GC_check_heap_block: found %u smashed heap objects:\n",
+ GC_n_smashed);
for (i = 0; i < GC_n_smashed; ++i) {
- GC_print_smashed_obj("", (ptr_t)GC_base(GC_smashed[i]) + sizeof(oh),
- GC_smashed[i]);
+ ptr_t base = (ptr_t)GC_base(GC_smashed[i]);
+
+# ifdef LINT2
+ if (!base) ABORT("Invalid GC_smashed element");
+# endif
+ GC_print_smashed_obj("", base + sizeof(oh), GC_smashed[i]);
GC_smashed[i] = 0;
}
GC_n_smashed = 0;
- GC_err_printf("\n");
}
/* Check all marked objects in the given block for validity */
STATIC void GC_check_heap_block(struct hblk *hbp, word dummy GC_ATTR_UNUSED)
{
struct hblkhdr * hhdr = HDR(hbp);
- size_t sz = hhdr -> hb_sz;
- size_t bit_no;
+ word sz = hhdr -> hb_sz;
+ word bit_no;
char *p, *plim;
p = hbp->hb_body;
GC_INNER GC_bool GC_check_leaked(ptr_t base)
{
- size_t i;
- size_t obj_sz;
+ word i;
+ word obj_sz;
word *p;
if (
}
/* Special finalizer_proc value to detect GC_register_finalizer() failure. */
-#define OFN_UNSET (GC_finalization_proc)(signed_word)-1
+#define OFN_UNSET ((GC_finalization_proc)~(signed_word)0)
/* Set ofn and ocd to reflect the values we got back. */
static void store_old(void *obj, GC_finalization_proc my_old_fn,
{
GC_finalization_proc my_old_fn = OFN_UNSET;
void * my_old_cd;
- ptr_t base = GC_base(obj);
- if (0 == base) {
+ ptr_t base = (ptr_t)GC_base(obj);
+ if (NULL == base) {
/* We won't collect it, hence finalizer wouldn't be run. */
if (ocd) *ocd = 0;
if (ofn) *ofn = 0;
return;
}
if ((ptr_t)obj - base != sizeof(oh)) {
- GC_err_printf(
- "GC_debug_register_finalizer called with non-base-pointer %p\n",
- obj);
+ GC_err_printf("GC_debug_register_finalizer called with"
+ " non-base-pointer %p\n", obj);
}
if (0 == fn) {
GC_register_finalizer(base, 0, 0, &my_old_fn, &my_old_cd);
{
GC_finalization_proc my_old_fn = OFN_UNSET;
void * my_old_cd;
- ptr_t base = GC_base(obj);
- if (0 == base) {
+ ptr_t base = (ptr_t)GC_base(obj);
+ if (NULL == base) {
/* We won't collect it, hence finalizer wouldn't be run. */
if (ocd) *ocd = 0;
if (ofn) *ofn = 0;
return;
}
if ((ptr_t)obj - base != sizeof(oh)) {
- GC_err_printf(
- "GC_debug_register_finalizer_no_order called with "
- "non-base-pointer %p\n",
- obj);
+ GC_err_printf("GC_debug_register_finalizer_no_order called with"
+ " non-base-pointer %p\n", obj);
}
if (0 == fn) {
GC_register_finalizer_no_order(base, 0, 0, &my_old_fn, &my_old_cd);
{
GC_finalization_proc my_old_fn = OFN_UNSET;
void * my_old_cd;
- ptr_t base = GC_base(obj);
- if (0 == base) {
+ ptr_t base = (ptr_t)GC_base(obj);
+ if (NULL == base) {
/* We won't collect it, hence finalizer wouldn't be run. */
if (ocd) *ocd = 0;
if (ofn) *ofn = 0;
return;
}
if ((ptr_t)obj - base != sizeof(oh)) {
- GC_err_printf(
- "GC_debug_register_finalizer_unreachable called with "
- "non-base-pointer %p\n",
- obj);
+ GC_err_printf("GC_debug_register_finalizer_unreachable called with"
+ " non-base-pointer %p\n", obj);
}
if (0 == fn) {
GC_register_finalizer_unreachable(base, 0, 0, &my_old_fn, &my_old_cd);
{
GC_finalization_proc my_old_fn = OFN_UNSET;
void * my_old_cd;
- ptr_t base = GC_base(obj);
- if (0 == base) {
+ ptr_t base = (ptr_t)GC_base(obj);
+ if (NULL == base) {
/* We won't collect it, hence finalizer wouldn't be run. */
if (ocd) *ocd = 0;
if (ofn) *ofn = 0;
return;
}
if ((ptr_t)obj - base != sizeof(oh)) {
- GC_err_printf(
- "GC_debug_register_finalizer_ignore_self called with "
- "non-base-pointer %p\n", obj);
+ GC_err_printf("GC_debug_register_finalizer_ignore_self called with"
+ " non-base-pointer %p\n", obj);
}
if (0 == fn) {
GC_register_finalizer_ignore_self(base, 0, 0, &my_old_fn, &my_old_cd);
#endif /* !GC_NO_FINALIZATION */
-GC_API void * GC_CALL GC_debug_malloc_replacement(size_t lb)
+GC_API GC_ATTR_MALLOC void * GC_CALL GC_debug_malloc_replacement(size_t lb)
{
- return GC_debug_malloc(lb, GC_DBG_RA "unknown", 0);
+ return GC_debug_malloc(lb, GC_DBG_EXTRAS);
}
GC_API void * GC_CALL GC_debug_realloc_replacement(void *p, size_t lb)
{
- return GC_debug_realloc(p, lb, GC_DBG_RA "unknown", 0);
+ return GC_debug_realloc(p, lb, GC_DBG_EXTRAS);
}
projects / platform / upstream / libgc.git / blobdiff