mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-09-01 06:55:30 +00:00
When ISC_MEM_TRACKLINES=1, don't calle {add,delete}_trace_entry()
for every alloc/free if neither ISC_MEM_DEBUGTRACE nor ISC_MEM_DEBUGRECORD is turned on. This removes my last objection to setting ISC_MEM_TRACKLINES=1 by default.
This commit is contained in:
@@ -15,7 +15,7 @@
|
|||||||
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* $Id: mem.c,v 1.101 2001/09/05 06:26:07 marka Exp $ */
|
/* $Id: mem.c,v 1.102 2001/09/06 23:03:01 gson Exp $ */
|
||||||
|
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
|
|
||||||
@@ -186,11 +186,14 @@ struct isc_mempool {
|
|||||||
#define DELETE_TRACE(a, b, c, d, e)
|
#define DELETE_TRACE(a, b, c, d, e)
|
||||||
#else
|
#else
|
||||||
#define ADD_TRACE(a, b, c, d, e) \
|
#define ADD_TRACE(a, b, c, d, e) \
|
||||||
do { if (b != NULL) add_trace_entry(a, b, c, d, e); } while (0)
|
do { \
|
||||||
|
if ((isc_mem_debugging & (ISC_MEM_DEBUGTRACE | \
|
||||||
|
ISC_MEM_DEBUGRECORD)) != 0 && \
|
||||||
|
b != NULL) \
|
||||||
|
add_trace_entry(a, b, c, d, e); \
|
||||||
|
} while (0)
|
||||||
#define DELETE_TRACE(a, b, c, d, e) delete_trace_entry(a, b, c, d, e)
|
#define DELETE_TRACE(a, b, c, d, e) delete_trace_entry(a, b, c, d, e)
|
||||||
|
|
||||||
#define MEM_TRACE ((isc_mem_debugging & ISC_MEM_DEBUGTRACE) != 0)
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
print_active(isc_mem_t *ctx, FILE *out);
|
print_active(isc_mem_t *ctx, FILE *out);
|
||||||
|
|
||||||
@@ -204,7 +207,7 @@ add_trace_entry(isc_mem_t *mctx, const void *ptr, unsigned int size
|
|||||||
debuglink_t *dl;
|
debuglink_t *dl;
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
|
||||||
if (MEM_TRACE)
|
if ((isc_mem_debugging & ISC_MEM_DEBUGTRACE) != 0)
|
||||||
fprintf(stderr, isc_msgcat_get(isc_msgcat, ISC_MSGSET_MEM,
|
fprintf(stderr, isc_msgcat_get(isc_msgcat, ISC_MSGSET_MEM,
|
||||||
ISC_MSG_ADDTRACE,
|
ISC_MSG_ADDTRACE,
|
||||||
"add %p size %u "
|
"add %p size %u "
|
||||||
@@ -259,7 +262,7 @@ delete_trace_entry(isc_mem_t *mctx, const void *ptr, unsigned int size,
|
|||||||
debuglink_t *dl;
|
debuglink_t *dl;
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
|
||||||
if (MEM_TRACE)
|
if ((isc_mem_debugging & ISC_MEM_DEBUGTRACE) != 0)
|
||||||
fprintf(stderr, isc_msgcat_get(isc_msgcat, ISC_MSGSET_MEM,
|
fprintf(stderr, isc_msgcat_get(isc_msgcat, ISC_MSGSET_MEM,
|
||||||
ISC_MSG_DELTRACE,
|
ISC_MSG_DELTRACE,
|
||||||
"del %p size %u "
|
"del %p size %u "
|
||||||
@@ -1231,7 +1234,6 @@ isc__mem_allocate(isc_mem_t *ctx, size_t size FLARG) {
|
|||||||
#endif /* ISC_MEM_USE_INTERNAL_MALLOC */
|
#endif /* ISC_MEM_USE_INTERNAL_MALLOC */
|
||||||
|
|
||||||
#if ISC_MEM_TRACKLINES
|
#if ISC_MEM_TRACKLINES
|
||||||
if (si != NULL)
|
|
||||||
ADD_TRACE(ctx, si, si[-1].u.size, file, line);
|
ADD_TRACE(ctx, si, si[-1].u.size, file, line);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user