Skip to content

Commit

Permalink
OPS-6: QM_MALLOC is once again functional
Browse files Browse the repository at this point in the history
  • Loading branch information
@liviuchircu
liviuchircu committed Mar 13, 2019
1 parent c8804d2 commit af1f013
Show file tree
Hide file tree
Showing 5 changed files with 457 additions and 425 deletions.
9 changes: 1 addition & 8 deletions mem/f_malloc.h
View file
Expand Up @@ -129,24 +129,17 @@ unsigned long frag_size(void* p);
struct fm_block* fm_malloc_init(char* address, unsigned long size, char* name);

#ifdef DBG_MALLOC
#ifdef INLINE_ALLOC
void *fm_malloc(struct fm_block* qm, unsigned long size,
const char* file, const char* func, unsigned int line);
void fm_free(struct fm_block* qm, void* p, const char* file,
const char* func, unsigned int line);
void *fm_realloc(struct fm_block* qm, void* p, unsigned long size,
const char* file, const char* func, unsigned int line);
#else
void *fm_malloc(struct fm_block* qm, unsigned long size,
const char* file, const char* func, unsigned int line);
#ifndef INLINE_ALLOC
void *fm_malloc_dbg(struct fm_block* qm, unsigned long size,
const char* file, const char* func, unsigned int line);
void fm_free(struct fm_block* qm, void* p, const char* file,
const char* func, unsigned int line);
void fm_free_dbg(struct fm_block* qm, void* p, const char* file,
const char* func, unsigned int line);
void *fm_realloc(struct fm_block* qm, void* p, unsigned long size,
const char* file, const char* func, unsigned int line);
void *fm_realloc_dbg(struct fm_block* qm, void* p, unsigned long size,
const char* file, const char* func, unsigned int line);
#endif
Expand Down
79 changes: 36 additions & 43 deletions mem/f_malloc_dyn.h
View file
Expand Up @@ -19,7 +19,7 @@
*/

/*
* If you have to deal with this spaghetti, here are its requirements:
* If you have to deal with the ifdef spaghetti, here are its requirements:
* - be able to compile an inlined allocator (fm_split_frag short)
* - be able to compile an inlined, dbg allocator (fm_split_frag long)
* - be able to compile multiple allocators (fm_split_frag short)
Expand Down Expand Up @@ -184,11 +184,12 @@ void* fm_malloc(struct fm_block* qm, unsigned long size,

/*see if we'll use full frag, or we'll split it in 2*/

#ifdef DBG_MALLOC
#ifdef INLINE_ALLOC
fm_split_frag(qm, frag, size, file, "fm_malloc split frag", line);
#if !defined INLINE_ALLOC && defined DBG_MALLOC
fm_split_frag_dbg(qm, frag, size, file, "fm_malloc frag", line);
#elif !defined F_MALLOC_DYN && !defined DBG_MALLOC
fm_split_frag(qm, frag, size);
#else
fm_split_frag_dbg(qm, frag, size, file, "fm_malloc split frag", line);
fm_split_frag(qm, frag, size, file, "fm_malloc frag", line);
#endif

frag->file=file;
Expand Down Expand Up @@ -301,8 +302,8 @@ void* fm_realloc(struct fm_block* qm, void* p, unsigned long size,
void *ptr;

#ifdef DBG_MALLOC
LM_GEN1(memlog, "%s_realloc(%p, %lu->%lu), called from %s: %s(%d)\n", qm->name,
p, p ? FRAG_OF(p)->size : 0, size, file, func, line);
LM_GEN1(memlog, "%s_realloc(%p, %lu->%lu), called from %s: %s(%d)\n",
qm->name, p, p ? FRAG_OF(p)->size : 0, size, file, func, line);
if (p && (p > (void *)qm->last_frag || p < (void *)qm->first_frag)) {
LM_CRIT("bad pointer %p (out of memory block!) - aborting\n", p);
abort();
Expand All @@ -311,28 +312,24 @@ void* fm_realloc(struct fm_block* qm, void* p, unsigned long size,

if (size == 0) {
if (p)
#ifdef DBG_MALLOC
#ifdef INLINE_ALLOC
fm_free(qm, p, file, func, line);
#else
#if !defined INLINE_ALLOC && defined DBG_MALLOC
fm_free_dbg(qm, p, file, func, line);
#endif
#else
#elif !defined F_MALLOC_DYN && !defined DBG_MALLOC
fm_free(qm, p);
#else
fm_free(qm, p, file, func, line);
#endif
pkg_threshold_check();
return 0;
}

if (!p)
#ifdef DBG_MALLOC
#ifdef INLINE_ALLOC
return fm_malloc(qm, size, file, func, line);
#else
#if !defined INLINE_ALLOC && defined DBG_MALLOC
return fm_malloc_dbg(qm, size, file, func, line);
#endif
#else
#elif !defined F_MALLOC_DYN && !defined DBG_MALLOC
return fm_malloc(qm, size);
#else
return fm_malloc(qm, size, file, func, line);
#endif

f = FRAG_OF(p);
Expand All @@ -349,13 +346,14 @@ void* fm_realloc(struct fm_block* qm, void* p, unsigned long size,
/* shrink */
#ifdef DBG_MALLOC
LM_GEN1(memlog, "shrinking from %lu to %lu\n", f->size, size);
#ifdef INLINE_ALLOC
fm_split_frag(qm, f, size, file, "fm_realloc split frag", line);
#else
fm_split_frag_dbg(qm, f, size, file, "fm_realloc split frag", line);
#endif
#else

#if !defined INLINE_ALLOC && defined DBG_MALLOC
fm_split_frag_dbg(qm, f, size, file, "fm_realloc frag", line);
#elif !defined F_MALLOC_DYN && !defined DBG_MALLOC
fm_split_frag(qm, f, size);
#else
fm_split_frag(qm, f, size, file, "fm_realloc frag", line);
#endif

} else if (f->size < size) {
Expand All @@ -381,40 +379,35 @@ void* fm_realloc(struct fm_block* qm, void* p, unsigned long size,

/* split it if necessary */
if (f->size > size){
#ifdef DBG_MALLOC
#ifdef INLINE_ALLOC
fm_split_frag(qm, f, size, file, "fm_realloc split frag", line);
#else
fm_split_frag_dbg(qm, f, size, file, "fm_realloc split frag", line);
#endif
#else
#if !defined INLINE_ALLOC && defined DBG_MALLOC
fm_split_frag_dbg(qm, f, size, file, "fm_realloc frag", line);
#elif !defined F_MALLOC_DYN && !defined DBG_MALLOC
fm_split_frag(qm, f, size);
#else
fm_split_frag(qm, f, size, file, "fm_realloc frag", line);
#endif
}
} else {
/* could not join => realloc */

#ifdef DBG_MALLOC
#ifdef INLINE_ALLOC
ptr = fm_malloc(qm, size, file, func, line);
#else
#if !defined INLINE_ALLOC && defined DBG_MALLOC
ptr = fm_malloc_dbg(qm, size, file, func, line);
#endif
#else
#elif !defined F_MALLOC_DYN && !defined DBG_MALLOC
ptr = fm_malloc(qm, size);
#else
ptr = fm_malloc(qm, size, file, func, line);
#endif

if (ptr) {
/* copy, need by libssl */
memcpy(ptr, p, orig_size);
#ifdef DBG_MALLOC
#ifdef INLINE_ALLOC
fm_free(qm, p, file, func, line);
#else

#if !defined INLINE_ALLOC && defined DBG_MALLOC
fm_free_dbg(qm, p, file, func, line);
#endif
#else
#elif !defined F_MALLOC_DYN && !defined DBG_MALLOC
fm_free(qm, p);
#else
fm_free(qm, p, file, func, line);
#endif
}
p = ptr;
Expand Down

0 comments on commit af1f013

Please sign in to comment.