fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

src/mem.c: Skip dbg_*() if memory stats are disabled

Browse Source 
These functions only need to be compiled if calcurse is built with
"--enable-memory-debug". Tell the preprocessor to strip them if memory
debugging/stats are disabled.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2012-04-21 11:03:35 +02:00
parent 315b33540a
commit 674f398ee9
1 changed files with 48 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
src/mem.c
View File

@ -41,6 +41,8 @@
#include "calcurse.h" #include "calcurse.h"
#ifdef CALCURSE_MEMORY_DEBUG
enum { enum {
BLK_STATE, BLK_STATE,
BLK_SIZE, BLK_SIZE,
@ -67,49 +69,8 @@ struct mem_stats {
static struct mem_stats mstats; static struct mem_stats mstats;
#endif /* CALCURSE_MEMORY_DEBUG */
static unsigned
stats_add_blk (size_t size, const char *pos)
{
struct mem_blk *o, **i;
o = malloc (sizeof (*o));
EXIT_IF (o == NULL, _("could not allocate memory to store block info"));
mstats.ncall++;
o->pos = pos;
o->size = (unsigned)size;
o->next = 0;
for (i = &mstats.blk; *i; i = &(*i)->next)
;
o->id = mstats.ncall;
*i = o;
return o->id;
}
static void
stats_del_blk (unsigned id)
{
struct mem_blk *o, **i;
i = &mstats.blk;
for (o = mstats.blk; o; o = o->next)
{
if (o->id == id)
{
*i = o->next;
free (o);
return;
}
i = &o->next;
}
EXIT (_("Block not found"));
/* NOTREACHED */
}
void * void *
xmalloc (size_t size) xmalloc (size_t size)
@ -170,6 +131,51 @@ xfree (void *p)
free (p); free (p);
} }
#ifdef CALCURSE_MEMORY_DEBUG
static unsigned
stats_add_blk (size_t size, const char *pos)
{
struct mem_blk *o, **i;
o = malloc (sizeof (*o));
EXIT_IF (o == NULL, _("could not allocate memory to store block info"));
mstats.ncall++;
o->pos = pos;
o->size = (unsigned)size;
o->next = 0;
for (i = &mstats.blk; *i; i = &(*i)->next)
;
o->id = mstats.ncall;
*i = o;
return o->id;
}
static void
stats_del_blk (unsigned id)
{
struct mem_blk *o, **i;
i = &mstats.blk;
for (o = mstats.blk; o; o = o->next)
{
if (o->id == id)
{
*i = o->next;
free (o);
return;
}
i = &o->next;
}
EXIT (_("Block not found"));
/* NOTREACHED */
}
void * void *
dbg_malloc (size_t size, const char *pos) dbg_malloc (size_t size, const char *pos)
{ {
@ -278,9 +284,6 @@ dbg_free (void *ptr, const char *pos)
mstats.nfree += size; mstats.nfree += size;
} }
#ifdef CALCURSE_MEMORY_DEBUG
static void static void
dump_block_info (struct mem_blk *blk) dump_block_info (struct mem_blk *blk)
{ {