mirror of
https://gitlab.nic.cz/labs/bird.git
synced 2024-12-22 17:51:53 +00:00
If debugging, store a malloc circular log for easier debugging
This commit is contained in:
parent
ce1a8be9af
commit
31d5ffa4a9
@ -179,7 +179,7 @@ void resource_sys_init(void);
|
|||||||
#define xrealloc bird_xrealloc
|
#define xrealloc bird_xrealloc
|
||||||
void *xmalloc(unsigned);
|
void *xmalloc(unsigned);
|
||||||
void *xrealloc(void *, unsigned);
|
void *xrealloc(void *, unsigned);
|
||||||
#define xfree(x) free(x)
|
void xfree(void *);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -10,9 +10,25 @@
|
|||||||
|
|
||||||
#include "nest/bird.h"
|
#include "nest/bird.h"
|
||||||
#include "lib/resource.h"
|
#include "lib/resource.h"
|
||||||
|
#include "lib/timer.h"
|
||||||
|
|
||||||
#ifndef HAVE_LIBDMALLOC
|
#ifndef HAVE_LIBDMALLOC
|
||||||
|
|
||||||
|
#if DEBUGGING
|
||||||
|
struct minfo {
|
||||||
|
void *ptr;
|
||||||
|
uint size;
|
||||||
|
uint action;
|
||||||
|
uint thread_id;
|
||||||
|
btime time;
|
||||||
|
} minfo_block[65536];
|
||||||
|
_Atomic uint minfo_pos;
|
||||||
|
|
||||||
|
#define MINFO(p, s, a) minfo_block[atomic_fetch_add_explicit(&minfo_pos, 1, memory_order_acq_rel) % 65536] = (struct minfo) { .ptr = p, .size = s, .action = a, .thread_id = THIS_THREAD_ID, .time = current_time_now(), }
|
||||||
|
#else
|
||||||
|
#define MINFO(...)
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* xmalloc - malloc with checking
|
* xmalloc - malloc with checking
|
||||||
* @size: block size
|
* @size: block size
|
||||||
@ -26,7 +42,10 @@
|
|||||||
void *
|
void *
|
||||||
xmalloc(uint size)
|
xmalloc(uint size)
|
||||||
{
|
{
|
||||||
|
|
||||||
void *p = malloc(size);
|
void *p = malloc(size);
|
||||||
|
MINFO(p, size, 1);
|
||||||
|
|
||||||
if (p)
|
if (p)
|
||||||
return p;
|
return p;
|
||||||
die("Unable to allocate %d bytes of memory", size);
|
die("Unable to allocate %d bytes of memory", size);
|
||||||
@ -47,9 +66,19 @@ void *
|
|||||||
xrealloc(void *ptr, uint size)
|
xrealloc(void *ptr, uint size)
|
||||||
{
|
{
|
||||||
void *p = realloc(ptr, size);
|
void *p = realloc(ptr, size);
|
||||||
|
|
||||||
|
MINFO(ptr, 0, 2);
|
||||||
|
MINFO(p, size, 3);
|
||||||
|
|
||||||
if (p)
|
if (p)
|
||||||
return p;
|
return p;
|
||||||
die("Unable to allocate %d bytes of memory", size);
|
die("Unable to allocate %d bytes of memory", size);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void xfree(void *p)
|
||||||
|
{
|
||||||
|
MINFO(p, 0, 4);
|
||||||
|
free(p);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user