mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-09-02 15:25:48 +00:00
Code Issues Releases Wiki Activity

- In reference count history, remember the address where the reference

Browse Source 
is stored as well as the address of the thing referenced.
This commit is contained in:
Ted Lemon
2000-01-27 22:20:29 +00:00
parent 00ceebd919
commit b4f786d47e
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
includes/omapip/alloc.h
View File

@@ -56,19 +56,20 @@ struct rc_history_entry {
int refcnt; int refcnt;
}; };
#define rc_register(x, l, y, z) do { \ #define rc_register(x, l, r, y, z) do { \
rc_history [rc_history_index].file = (x); \ rc_history [rc_history_index].file = (x); \
rc_history [rc_history_index].line = (l); \ rc_history [rc_history_index].line = (l); \
rc_history [rc_history_index].reference = (r); \
rc_history [rc_history_index].addr = (y); \ rc_history [rc_history_index].addr = (y); \
rc_history [rc_history_index].refcnt = (z); \ rc_history [rc_history_index].refcnt = (z); \
if (++rc_history_index == RC_HISTORY_MAX) \ if (++rc_history_index == RC_HISTORY_MAX) \
rc_history_index = 0;\ rc_history_index = 0;\
} while (0) } while (0)
#define rc_register_mdl(y, z) \ #define rc_register_mdl(r, y, z) \
rc_register (__FILE__, __LINE__, y, z) rc_register (__FILE__, __LINE__, r, y, z)
#else #else
#define rc_register(file, line, addr, refcnt) #define rc_register(file, line, reference, addr, refcnt)
#define rc_register_mdl(addr, refcnt) #define rc_register_mdl(reference, addr, refcnt)
#endif #endif
#if defined (DEBUG_MEMORY_LEAKAGE) || defined (DEBUG_MALLOC_POOL) #if defined (DEBUG_MEMORY_LEAKAGE) || defined (DEBUG_MALLOC_POOL)

25
omapip/alloc.c
View File

@@ -276,8 +276,9 @@ void dump_rc_history ()
i = rc_history_index; i = rc_history_index;
do { do {
log_info (" referenced by %s(%d): addr = %lx refcnt = %x\n", log_info (" referenced by %s(%d)[%lx]: addr = %lx refcnt = %x",
rc_history [i].file, rc_history [i].line, rc_history [i].file, rc_history [i].line,
(unsigned long)rc_history [i].reference,
(unsigned long)rc_history [i].addr, (unsigned long)rc_history [i].addr,
rc_history [i].refcnt); rc_history [i].refcnt);
++i; ++i;
@@ -304,7 +305,7 @@ isc_result_t omapi_object_reference (omapi_object_t **r,
} }
*r = h; *r = h;
h -> refcnt++; h -> refcnt++;
rc_register (file, line, h, h -> refcnt); rc_register (file, line, r, h, h -> refcnt);
dmalloc_reuse (h, file, line, 1); dmalloc_reuse (h, file, line, 1);
return ISC_R_SUCCESS; return ISC_R_SUCCESS;
} }
@@ -397,14 +398,14 @@ isc_result_t omapi_object_dereference (omapi_object_t **h,
if (outer_reference) if (outer_reference)
omapi_object_dereference omapi_object_dereference
(&(*h) -> outer -> inner, file, line); (&(*h) -> outer -> inner, file, line);
rc_register (file, line, *h, 0); rc_register (file, line, h, *h, 0);
if ((*h) -> type -> destroy) if ((*h) -> type -> destroy)
(*((*h) -> type -> destroy)) (*h, file, line); (*((*h) -> type -> destroy)) (*h, file, line);
dfree (*h, file, line); dfree (*h, file, line);
} }
} else { } else {
(*h) -> refcnt--; (*h) -> refcnt--;
rc_register (file, line, *h, (*h) -> refcnt); rc_register (file, line, h, *h, (*h) -> refcnt);
} }
*h = 0; *h = 0;
return ISC_R_SUCCESS; return ISC_R_SUCCESS;
@@ -443,7 +444,7 @@ isc_result_t omapi_buffer_reference (omapi_buffer_t **r,
} }
*r = h; *r = h;
h -> refcnt++; h -> refcnt++;
rc_register (file, line, h, h -> refcnt); rc_register (file, line, r, h, h -> refcnt);
dmalloc_reuse (h, file, line, 1); dmalloc_reuse (h, file, line, 1);
return ISC_R_SUCCESS; return ISC_R_SUCCESS;
} }
@@ -471,7 +472,7 @@ isc_result_t omapi_buffer_dereference (omapi_buffer_t **h,
#endif #endif
} }
--(*h) -> refcnt; --(*h) -> refcnt;
rc_register (file, line, h, (*h) -> refcnt); rc_register (file, line, h, *h, (*h) -> refcnt);
if ((*h) -> refcnt == 0) if ((*h) -> refcnt == 0)
dfree (*h, file, line); dfree (*h, file, line);
*h = 0; *h = 0;
@@ -561,7 +562,7 @@ isc_result_t omapi_typed_data_reference (omapi_typed_data_t **r,
} }
*r = h; *r = h;
h -> refcnt++; h -> refcnt++;
rc_register (file, line, h, h -> refcnt); rc_register (file, line, r, h, h -> refcnt);
dmalloc_reuse (h, file, line, 1); dmalloc_reuse (h, file, line, 1);
return ISC_R_SUCCESS; return ISC_R_SUCCESS;
} }
@@ -590,7 +591,7 @@ isc_result_t omapi_typed_data_dereference (omapi_typed_data_t **h,
} }
--((*h) -> refcnt); --((*h) -> refcnt);
rc_register (file, line, *h, (*h) -> refcnt); rc_register (file, line, h, *h, (*h) -> refcnt);
if ((*h) -> refcnt <= 0 ) { if ((*h) -> refcnt <= 0 ) {
switch ((*h) -> type) { switch ((*h) -> type) {
case omapi_datatype_int: case omapi_datatype_int:
@@ -638,7 +639,7 @@ isc_result_t omapi_data_string_reference (omapi_data_string_t **r,
} }
*r = h; *r = h;
h -> refcnt++; h -> refcnt++;
rc_register (file, line, h, h -> refcnt); rc_register (file, line, r, h, h -> refcnt);
dmalloc_reuse (h, file, line, 1); dmalloc_reuse (h, file, line, 1);
return ISC_R_SUCCESS; return ISC_R_SUCCESS;
} }
@@ -667,7 +668,7 @@ isc_result_t omapi_data_string_dereference (omapi_data_string_t **h,
} }
--((*h) -> refcnt); --((*h) -> refcnt);
rc_register (file, line, h, (*h) -> refcnt); rc_register (file, line, h, *h, (*h) -> refcnt);
if ((*h) -> refcnt <= 0 ) { if ((*h) -> refcnt <= 0 ) {
dfree (*h, file, line); dfree (*h, file, line);
} }
@@ -704,7 +705,7 @@ isc_result_t omapi_value_reference (omapi_value_t **r,
} }
*r = h; *r = h;
h -> refcnt++; h -> refcnt++;
rc_register (file, line, h, h -> refcnt); rc_register (file, line, r, h, h -> refcnt);
dmalloc_reuse (h, file, line, 1); dmalloc_reuse (h, file, line, 1);
return ISC_R_SUCCESS; return ISC_R_SUCCESS;
} }
@@ -733,7 +734,7 @@ isc_result_t omapi_value_dereference (omapi_value_t **h,
} }
--((*h) -> refcnt); --((*h) -> refcnt);
rc_register (file, line, h, (*h) -> refcnt); rc_register (file, line, h, *h, (*h) -> refcnt);
if ((*h) -> refcnt <= 0 ) { if ((*h) -> refcnt <= 0 ) {
if ((*h) -> name) if ((*h) -> name)
omapi_data_string_dereference (&(*h) -> name, omapi_data_string_dereference (&(*h) -> name,