[sr-dev] git:master:f3109d4d: core: qm malloc - wrapper to print execution file and line for qm_debug_frag()

Module: kamailio Branch: master Commit: f3109d4dcdc4ef810ccf4a8d17f28f7fce42271c URL: https://github.com/kamailio/kamailio/commit/f3109d4dcdc4ef810ccf4a8d17f28f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-23T18:43:22+02:00 core: qm malloc - wrapper to print execution file and line for qm_debug_frag() --- Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/f3109d4dcdc4ef810ccf4a8d17f28f7… Patch: https://github.com/kamailio/kamailio/commit/f3109d4dcdc4ef810ccf4a8d17f28f7… --- diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index 10abb86c43..0c3528544d 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -112,15 +112,18 @@ inline static unsigned long big_hash_idx(unsigned long s) #define END_CHECK_PATTERN2 0xabcdefed -static void qm_debug_frag(struct qm_block* qm, struct qm_frag* f, - const char* file, unsigned int line) +#define qm_debug_frag(qm, f, file, line) \ + qm_debug_check_frag((qm), (f), (file), (line), __FILE__, __LINE__) +static void qm_debug_check_frag(struct qm_block* qm, struct qm_frag* f, + const char* file, unsigned int line, + const char* efile, unsigned int eline) { if (f->check!=ST_CHECK_PATTERN){ LM_CRIT("BUG: qm: fragm. %p (address %p) " "beginning overwritten (%lx)! Memory allocator was called " - "from %s:%u. Fragment marked by %s:%lu.\n", + "from %s:%u. Fragment marked by %s:%lu. Exec from %s:%u.\n", f, (char*)f+sizeof(struct qm_frag), - f->check, file, line, f->file, f->line); + f->check, file, line, f->file, f->line, efile, eline); qm_status(qm); abort(); }; @@ -128,10 +131,10 @@ static void qm_debug_frag(struct qm_block* qm, struct qm_frag* f, (FRAG_END(f)->check2!=END_CHECK_PATTERN2)){ LM_CRIT("BUG: qm: fragm. %p (address %p) " "end overwritten (%lx, %lx)! Memory allocator was called " - "from %s:%u. Fragment marked by %s:%lu.\n", + "from %s:%u. Fragment marked by %s:%lu. Exec from %s:%u.\n", f, (char*)f+sizeof(struct qm_frag), FRAG_END(f)->check1, FRAG_END(f)->check2, - file, line, f->file, f->line); + file, line, f->file, f->line, efile, eline); qm_status(qm); abort(); } @@ -140,9 +143,10 @@ static void qm_debug_frag(struct qm_block* qm, struct qm_frag* f, (PREV_FRAG_END(f)->check2!=END_CHECK_PATTERN2) ) ){ LM_CRIT("BUG: qm: prev. fragm. tail overwritten(%lx, %lx)[%p:%p]! " "Memory allocator was called from %s:%u. Fragment marked by " - "%s:%lu.\n", + "%s:%lu. Exec from %s:%u.\n", PREV_FRAG_END(f)->check1, PREV_FRAG_END(f)->check2, f, - (char*)f+sizeof(struct qm_frag), file, line, f->file, f->line); + (char*)f+sizeof(struct qm_frag), file, line, f->file, f->line, + efile, eline); qm_status(qm); abort(); }