Changeset 8310

Show
Ignore:
Timestamp:
20/12/11 12:55:42 (5 months ago)
Author:
westram
Message:
  • revert part of [8309] to fix TRACE_ALLOCS
Location:
trunk
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • trunk/ARBDB/Makefile

    r8103 r8310  
    577577admalloc.o: gb_storage.h 
    578578admalloc.o: gb_tune.h 
     579admalloc.o: $(ARBHOME)/INCLUDE/arb_backtrace.h 
    579580admalloc.o: $(ARBHOME)/INCLUDE/arb_core.h 
    580581admalloc.o: $(ARBHOME)/INCLUDE/arb_error.h 

  • trunk/ARBDB/admalloc.cxx

    r7337 r8310  
    1717#include <set> 
    1818 
     19#include <arb_backtrace.h> 
    1920#include "gb_storage.h" 
    2021 

  • trunk/CORE/arb_msg.cxx

    r8309 r8310  
    373373//      Backtracing 
    374374 
    375 static class BackTraceInfo *GBK_get_backtrace(size_t skipFramesAtBottom) { 
     375class BackTraceInfo *GBK_get_backtrace(size_t skipFramesAtBottom) { // only used ifdef TRACE_ALLOCS 
    376376    return new BackTraceInfo(skipFramesAtBottom); 
    377377} 
    378 static void GBK_dump_former_backtrace(class BackTraceInfo *trace, FILE *out, const char *message) { 
     378void GBK_dump_former_backtrace(class BackTraceInfo *trace, FILE *out, const char *message) { // only used ifdef TRACE_ALLOCS 
    379379    demangle_backtrace(*trace, out, message); 
    380380} 
    381381 
    382 static void GBK_free_backtrace(class BackTraceInfo *trace) { 
     382void GBK_free_backtrace(class BackTraceInfo *trace) { // only used ifdef TRACE_ALLOCS 
    383383    delete trace; 
    384384} 

  • trunk/CORE/arb_msg.h

    r8309 r8310  
    3939GB_ERROR GB_failedTo_error(const char *do_something, const char *special, GB_ERROR error); 
    4040GB_ERROR GB_append_exportedError(GB_ERROR error); 
     41class BackTraceInfo *GBK_get_backtrace(size_t skipFramesAtBottom); 
     42void GBK_dump_former_backtrace(class BackTraceInfo *trace, FILE *out, const char *message); 
     43void GBK_free_backtrace(class BackTraceInfo *trace); 
    4144void GBK_dump_backtrace(FILE *out, const char *message); 
    4245void GB_internal_error(const char *message);