diff options
author | Ivan Maidanski <ivmai@mail.ru> | 2012-12-11 20:17:16 +0400 |
---|---|---|
committer | Ivan Maidanski <ivmai@mail.ru> | 2012-12-11 20:17:16 +0400 |
commit | 38d07c16736cd5a76bd40dccfc90d2cecdd13aaf (patch) | |
tree | b0b21b437b44b8fe9aee42b469623864c933915e | |
parent | 1c3d8e3f6a963c32c5365ff52a9ebc6d65c088ce (diff) | |
download | bdwgc-38d07c16736cd5a76bd40dccfc90d2cecdd13aaf.tar.gz |
Replace GC_COND_LOG_PRINTF calls with WARN for allocation failure messages
* alloc.c (GC_expand_hp_inner): Replace GC_COND_LOG_PRINTF call to
WARN() call (with WARN_PRIdPTR argument type format specifier) for the
message about failure.
* headers.c (GC_scratch_alloc): Likewise.
* mark.c (GC_mark_some, alloc_mark_stack): Likewise.
-rw-r--r-- | alloc.c | 3 | ||||
-rw-r--r-- | headers.c | 2 | ||||
-rw-r--r-- | mark.c | 7 |
3 files changed, 5 insertions, 7 deletions
@@ -1162,8 +1162,7 @@ GC_INNER GC_bool GC_expand_hp_inner(word n) space = GET_MEM(bytes); GC_add_to_our_memory((ptr_t)space, bytes); if (space == 0) { - GC_COND_LOG_PRINTF("Failed to expand heap by %lu bytes\n", - (unsigned long)bytes); + WARN("Failed to expand heap by %" WARN_PRIdPTR " bytes\n", bytes); return(FALSE); } GC_COND_LOG_PRINTF( @@ -144,7 +144,7 @@ GC_INNER ptr_t GC_scratch_alloc(size_t bytes) result = (ptr_t)GET_MEM(bytes_to_get); GC_add_to_our_memory(result, bytes_to_get); if (result == 0) { - GC_COND_LOG_PRINTF("Out of memory - trying to allocate less\n"); + WARN("Out of memory - trying to allocate less\n", 0); scratch_free_ptr -= bytes; bytes_to_get = bytes; # ifdef USE_MMAP @@ -565,8 +565,8 @@ static void alloc_mark_stack(size_t); handle_ex: /* Exception handler starts here for all cases. */ - GC_COND_LOG_PRINTF( - "Caught ACCESS_VIOLATION in marker; memory mapping disappeared\n"); + WARN("Caught ACCESS_VIOLATION in marker;" + " memory mapping disappeared\n", 0); /* We have bad roots on the stack. Discard mark stack. */ /* Rescan from marked objects. Redetermine roots. */ @@ -1221,8 +1221,7 @@ static void alloc_mark_stack(size_t n) GC_COND_LOG_PRINTF("Grew mark stack to %lu frames\n", (unsigned long)GC_mark_stack_size); } else { - GC_COND_LOG_PRINTF("Failed to grow mark stack to %lu frames\n", - (unsigned long)n); + WARN("Failed to grow mark stack to %" WARN_PRIdPTR " frames\n", n); } } else { if (new_stack == 0) { |