boostorg/container
1
0
Fork 1
mirror of https://github.com/boostorg/container.git synced 2025-08-02 22:14:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added NO_MALLINFO and NO_MALLOC_STATS defines to dlmalloc to avoid dependencies. Implemented boost_cont_allocated_memory based on internal_mallinfo

Browse Source
This commit is contained in:
Ion Gaztañaga
2014-08-14 00:27:22 +02:00
parent d92b97e2c8
commit d51ef9db46
2 changed files with 239 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/dlmalloc_ext_2_8_6.c
View File

@@ -19,7 +19,9 @@
#endif #endif
#define USE_LOCKS 1 #define USE_LOCKS 1
#define MSPACES 1 #define MSPACES 1
#define NO_MALLINFO 0 #define NO_MALLINFO 1
#define NO_MALLOC_STATS 1
#if !defined(NDEBUG) #if !defined(NDEBUG)
#if !defined(DEBUG) #if !defined(DEBUG)
@@ -1179,12 +1181,47 @@ BOOST_CONTAINER_DECL size_t boost_cont_footprint()
BOOST_CONTAINER_DECL size_t boost_cont_allocated_memory() BOOST_CONTAINER_DECL size_t boost_cont_allocated_memory()
{ {
struct mallinfo info = mspace_mallinfo(gm); size_t alloc_mem = 0;
mstate m = (mstate)gm;
ensure_initialization(); ensure_initialization();
if(info.ordblks) if (!ok_magic(ms)) {
return (size_t)(info.uordblks - (info.ordblks-1)*TOP_FOOT_SIZE); USAGE_ERROR_ACTION(ms,ms);
}
if (!PREACTION(m)) {
check_malloc_state(m);
if (is_initialized(m)) {
size_t nfree = SIZE_T_ONE; /* top always free */
size_t mfree = m->topsize + TOP_FOOT_SIZE;
size_t sum = mfree;
msegmentptr s = &m->seg;
while (s != 0) {
mchunkptr q = align_as_chunk(s->base);
while (segment_holds(s, q) &&
q != m->top && q->head != FENCEPOST_HEAD) {
size_t sz = chunksize(q);
sum += sz;
if (!is_inuse(q)) {
mfree += sz;
++nfree;
}
q = next_chunk(q);
}
s = s->next;
}
{
size_t uordblks = m->footprint - mfree;
if(nfree)
alloc_mem = (size_t)(uordblks - (nfree-1)*TOP_FOOT_SIZE);
else else
return info.uordblks; alloc_mem = uordblks;
}
}
POSTACTION(m);
}
return alloc_mem;
} }
BOOST_CONTAINER_DECL size_t boost_cont_chunksize(const void *p) BOOST_CONTAINER_DECL size_t boost_cont_chunksize(const void *p)