sr-dev August 2015

sr-dev@lists.kamailio.org

30 participants
191 discussions

git:4.2:b399bb34: dtrie: Set child to NULL when run out of SHM

by Stefan Mititelu

Module: kamailio Branch: 4.2 Commit: b399bb34cebdb1002d27bb0cf554f2d2e683c40d URL: https://github.com/kamailio/kamailio/commit/b399bb34cebdb1002d27bb0cf554f2d… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-08-11T15:49:07+03:00 dtrie: Set child to NULL when run out of SHM The stop condition in dtrie_delete is node==NULL. Suppose the case when there is no SHM memory left when trying to dtrie_insert(). The memory gets freed by shm_free() but the pointer still points to it. This leads to segfault when dtrie_delete tries to access that memory zone, in the given case. GDB says: "Cannot access memory at address 0x1130000001d" (cherry picked from commit 60ffee9cf54ff362026497036935746c9dbe62e5) --- Modified: lib/trie/dtrie.c --- Diff: https://github.com/kamailio/kamailio/commit/b399bb34cebdb1002d27bb0cf554f2d… Patch: https://github.com/kamailio/kamailio/commit/b399bb34cebdb1002d27bb0cf554f2d… --- diff --git a/lib/trie/dtrie.c b/lib/trie/dtrie.c index a57f85d..2883829 100644 --- a/lib/trie/dtrie.c +++ b/lib/trie/dtrie.c @@ -152,6 +152,7 @@ int dtrie_insert(struct dtrie_node_t *root, const char *number, const unsigned i if(node->child[digit]->child == NULL){ SHM_MEM_ERROR; shm_free(node->child[digit]); + node->child[digit] = NULL; return -1; } LM_DBG("allocate %lu bytes for %d root children pointer at %p\n",

8 years, 9 months

git:4.1:0e550eec: dtrie: Set child to NULL when run out of SHM

by Stefan Mititelu

Module: kamailio Branch: 4.1 Commit: 0e550eec214f9bfea1e87519e6c842230a552e50 URL: https://github.com/kamailio/kamailio/commit/0e550eec214f9bfea1e87519e6c8422… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-08-11T15:42:56+03:00 dtrie: Set child to NULL when run out of SHM The stop condition in dtrie_delete is node==NULL. Suppose the case when there is no SHM memory left when trying to dtrie_insert(). The memory gets freed by shm_free() but the pointer still points to it. This leads to segfault when dtrie_delete tries to access that memory zone, in the given case. GDB says: "Cannot access memory at address 0x1130000001d" (cherry picked from commit 60ffee9cf54ff362026497036935746c9dbe62e5) --- Modified: lib/trie/dtrie.c --- Diff: https://github.com/kamailio/kamailio/commit/0e550eec214f9bfea1e87519e6c8422… Patch: https://github.com/kamailio/kamailio/commit/0e550eec214f9bfea1e87519e6c8422… --- diff --git a/lib/trie/dtrie.c b/lib/trie/dtrie.c index 90cb52f..783f6e7 100644 --- a/lib/trie/dtrie.c +++ b/lib/trie/dtrie.c @@ -152,6 +152,7 @@ int dtrie_insert(struct dtrie_node_t *root, const char *number, const unsigned i if(node->child[digit]->child == NULL){ SHM_MEM_ERROR; shm_free(node->child[digit]); + node->child[digit] = NULL; return -1; } LM_DBG("allocate %lu bytes for %d root children pointer at %p\n",

8 years, 9 months

git:master:60ffee9c: dtrie: Set child to NULL when run out of SHM

by Stefan Mititelu

Module: kamailio Branch: master Commit: 60ffee9cf54ff362026497036935746c9dbe62e5 URL: https://github.com/kamailio/kamailio/commit/60ffee9cf54ff362026497036935746… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-08-11T15:40:12+03:00 dtrie: Set child to NULL when run out of SHM The stop condition in dtrie_delete is node==NULL. Suppose the case when there is no SHM memory left when trying to dtrie_insert(). The memory gets freed by shm_free() but the pointer still points to it. This leads to segfault when dtrie_delete tries to access that memory zone, in the given case. GDB says: "Cannot access memory at address 0x1130000001d" --- Modified: lib/trie/dtrie.c --- Diff: https://github.com/kamailio/kamailio/commit/60ffee9cf54ff362026497036935746… Patch: https://github.com/kamailio/kamailio/commit/60ffee9cf54ff362026497036935746… --- diff --git a/lib/trie/dtrie.c b/lib/trie/dtrie.c index a57f85d..2883829 100644 --- a/lib/trie/dtrie.c +++ b/lib/trie/dtrie.c @@ -152,6 +152,7 @@ int dtrie_insert(struct dtrie_node_t *root, const char *number, const unsigned i if(node->child[digit]->child == NULL){ SHM_MEM_ERROR; shm_free(node->child[digit]); + node->child[digit] = NULL; return -1; } LM_DBG("allocate %lu bytes for %d root children pointer at %p\n",

8 years, 9 months

git:master:8695be4c: mem: fix compilation warning in TLSF

by Camille Oudot

Module: kamailio Branch: master Commit: 8695be4cb188397cd7bba2ad348e6f29a0158aa6 URL: https://github.com/kamailio/kamailio/commit/8695be4cb188397cd7bba2ad348e6f2… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-08-11T13:25:52+02:00 mem: fix compilation warning in TLSF --- Modified: mem/tlsf.c --- Diff: https://github.com/kamailio/kamailio/commit/8695be4cb188397cd7bba2ad348e6f2… Patch: https://github.com/kamailio/kamailio/commit/8695be4cb188397cd7bba2ad348e6f2… --- diff --git a/mem/tlsf.c b/mem/tlsf.c index 3b92f68..96b9abd 100644 --- a/mem/tlsf.c +++ b/mem/tlsf.c @@ -1034,7 +1034,7 @@ void tlsf_free(tlsf_t tlsf, void* ptr) block_insert(control, block); } else { #ifdef DBG_TLSF_MALLOC - LOG(L_WARN, "tlsf_free: free(0) called from %s: %s(%d)\n", file, function, line); + LOG(L_WARN, "tlsf_free: free(0) called from %s: %s(%lu)\n", file, function, line); #else LOG(L_WARN, "tlsf_free: free(0) called\n"); #endif

8 years, 9 months

git:master:7683e1a9: Merge pull request #281 from jnewmano/master

by Victor Seva

Module: kamailio Branch: master Commit: 7683e1a903765c64cbc3b5d6c200120114c96c72 URL: https://github.com/kamailio/kamailio/commit/7683e1a903765c64cbc3b5d6c200120… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-08-11T08:16:04+02:00 Merge pull request #281 from jnewmano/master janssonrpc-c: correct jansson_get parameter order in examples --- Modified: modules/janssonrpc-c/README Modified: modules/janssonrpc-c/doc/janssonrpc-c_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7683e1a903765c64cbc3b5d6c200120… Patch: https://github.com/kamailio/kamailio/commit/7683e1a903765c64cbc3b5d6c200120… --- diff --git a/modules/janssonrpc-c/README b/modules/janssonrpc-c/README index d585e05..53c3ca2 100644 --- a/modules/janssonrpc-c/README +++ b/modules/janssonrpc-c/README @@ -308,12 +308,12 @@ E;retry=1"); } route[RESPONSE] { - if(jansson_get($var(jsrpc_result), "internal_error", "$var(internal)")) + if(jansson_get("internal_error", $var(jsrpc_result), "$var(internal)")) { route(INTERNAL); - } else if(jansson_get($var(jsrpc_result), "error", "$var(error)")) { + } else if(jansson_get("error", $var(jsrpc_result), "$var(error)")) { route(ERROR); - } else if(jansson_get($var(jsrpc_result), "result", "$var(result)")) { + } else if(jansson_get("result", $var(jsrpc_result), "$var(result)")) { route(RESULT); } t_reply("200", "OK"); @@ -326,15 +326,15 @@ route[RESULT] { route[ERROR] { xlog("There was an error\n"); - if(jansson_get($var(error), "code", "$var(c)")) { + if(jansson_get("code", $var(error), "$var(c)")) { xlog("code is $var(c)\n"); } - if(jansson_get($var(error), "message", "$var(r)")) { + if(jansson_get("message", $var(error), "$var(r)")) { xlog("error is $var(r)\n"); } - if(jansson_get($var(error), "data", "$var(d)")) { + if(jansson_get("data", $var(error), "$var(d)")) { xlog("data is $var(d)\n"); } } @@ -342,13 +342,13 @@ route[ERROR] { route[INTERNAL] { xlog("There was an internal error\n"); - jansson_get($var(internal), "code", "$var(c)"); + jansson_get("code", $var(internal), "$var(c)"); xlog("code is $var(c)\n"); - jansson_get($var(internal), "message", "$var(r)"); + jansson_get("message", $var(internal), "$var(r)"); xlog("error is $var(r)\n"); - if(jansson_get($var(internal), "data", "$var(d)")) { + if(jansson_get("data", $var(internal), "$var(d)")) { xlog("request is $var(d)\n"); } } diff --git a/modules/janssonrpc-c/doc/janssonrpc-c_admin.xml b/modules/janssonrpc-c/doc/janssonrpc-c_admin.xml index 27f0f45..4ae65c0 100644 --- a/modules/janssonrpc-c/doc/janssonrpc-c_admin.xml +++ b/modules/janssonrpc-c/doc/janssonrpc-c_admin.xml @@ -356,11 +356,11 @@ route { } route[RESPONSE] { - if(jansson_get($var(jsrpc_result), "internal_error", "$var(internal)")) { + if(jansson_get("internal_error", $var(jsrpc_result), "$var(internal)")) { route(INTERNAL); - } else if(jansson_get($var(jsrpc_result), "error", "$var(error)")) { + } else if(jansson_get("error", $var(jsrpc_result), "$var(error)")) { route(ERROR); - } else if(jansson_get($var(jsrpc_result), "result", "$var(result)")) { + } else if(jansson_get("result", $var(jsrpc_result), "$var(result)")) { route(RESULT); } t_reply("200", "OK"); @@ -373,15 +373,15 @@ route[RESULT] { route[ERROR] { xlog("There was an error\n"); - if(jansson_get($var(error), "code", "$var(c)")) { + if(jansson_get("code", $var(error), "$var(c)")) { xlog("code is $var(c)\n"); } - if(jansson_get($var(error), "message", "$var(r)")) { + if(jansson_get("message", $var(error), "$var(r)")) { xlog("error is $var(r)\n"); } - if(jansson_get($var(error), "data", "$var(d)")) { + if(jansson_get("data", $var(error), "$var(d)")) { xlog("data is $var(d)\n"); } } @@ -389,13 +389,13 @@ route[ERROR] { route[INTERNAL] { xlog("There was an internal error\n"); - jansson_get($var(internal), "code", "$var(c)"); + jansson_get("code", $var(internal), "$var(c)"); xlog("code is $var(c)\n"); - jansson_get($var(internal), "message", "$var(r)"); + jansson_get("message", $var(internal), "$var(r)"); xlog("error is $var(r)\n"); - if(jansson_get($var(internal), "data", "$var(d)")) { + if(jansson_get("data", $var(internal), "$var(d)")) { xlog("request is $var(d)\n"); } }

8 years, 9 months

git:master:3cefc76a: janssonrpc-c: correct jansson_get parameter order in examples

by Jason Newman

Module: kamailio Branch: master Commit: 3cefc76ade4046962962f112beafe939d5ff2ed0 URL: https://github.com/kamailio/kamailio/commit/3cefc76ade4046962962f112beafe93… Author: Jason Newman <jason(a)getweave.com> Committer: Jason Newman <jason(a)getweave.com> Date: 2015-08-10T17:20:26-06:00 janssonrpc-c: correct jansson_get parameter order in examples parameter order should be jansson_get(key/path, src, dst) and not jansson_get(src, key/path, dst) --- Modified: modules/janssonrpc-c/README Modified: modules/janssonrpc-c/doc/janssonrpc-c_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3cefc76ade4046962962f112beafe93… Patch: https://github.com/kamailio/kamailio/commit/3cefc76ade4046962962f112beafe93… --- diff --git a/modules/janssonrpc-c/README b/modules/janssonrpc-c/README index d585e05..53c3ca2 100644 --- a/modules/janssonrpc-c/README +++ b/modules/janssonrpc-c/README @@ -308,12 +308,12 @@ E;retry=1"); } route[RESPONSE] { - if(jansson_get($var(jsrpc_result), "internal_error", "$var(internal)")) + if(jansson_get("internal_error", $var(jsrpc_result), "$var(internal)")) { route(INTERNAL); - } else if(jansson_get($var(jsrpc_result), "error", "$var(error)")) { + } else if(jansson_get("error", $var(jsrpc_result), "$var(error)")) { route(ERROR); - } else if(jansson_get($var(jsrpc_result), "result", "$var(result)")) { + } else if(jansson_get("result", $var(jsrpc_result), "$var(result)")) { route(RESULT); } t_reply("200", "OK"); @@ -326,15 +326,15 @@ route[RESULT] { route[ERROR] { xlog("There was an error\n"); - if(jansson_get($var(error), "code", "$var(c)")) { + if(jansson_get("code", $var(error), "$var(c)")) { xlog("code is $var(c)\n"); } - if(jansson_get($var(error), "message", "$var(r)")) { + if(jansson_get("message", $var(error), "$var(r)")) { xlog("error is $var(r)\n"); } - if(jansson_get($var(error), "data", "$var(d)")) { + if(jansson_get("data", $var(error), "$var(d)")) { xlog("data is $var(d)\n"); } } @@ -342,13 +342,13 @@ route[ERROR] { route[INTERNAL] { xlog("There was an internal error\n"); - jansson_get($var(internal), "code", "$var(c)"); + jansson_get("code", $var(internal), "$var(c)"); xlog("code is $var(c)\n"); - jansson_get($var(internal), "message", "$var(r)"); + jansson_get("message", $var(internal), "$var(r)"); xlog("error is $var(r)\n"); - if(jansson_get($var(internal), "data", "$var(d)")) { + if(jansson_get("data", $var(internal), "$var(d)")) { xlog("request is $var(d)\n"); } } diff --git a/modules/janssonrpc-c/doc/janssonrpc-c_admin.xml b/modules/janssonrpc-c/doc/janssonrpc-c_admin.xml index 27f0f45..4ae65c0 100644 --- a/modules/janssonrpc-c/doc/janssonrpc-c_admin.xml +++ b/modules/janssonrpc-c/doc/janssonrpc-c_admin.xml @@ -356,11 +356,11 @@ route { } route[RESPONSE] { - if(jansson_get($var(jsrpc_result), "internal_error", "$var(internal)")) { + if(jansson_get("internal_error", $var(jsrpc_result), "$var(internal)")) { route(INTERNAL); - } else if(jansson_get($var(jsrpc_result), "error", "$var(error)")) { + } else if(jansson_get("error", $var(jsrpc_result), "$var(error)")) { route(ERROR); - } else if(jansson_get($var(jsrpc_result), "result", "$var(result)")) { + } else if(jansson_get("result", $var(jsrpc_result), "$var(result)")) { route(RESULT); } t_reply("200", "OK"); @@ -373,15 +373,15 @@ route[RESULT] { route[ERROR] { xlog("There was an error\n"); - if(jansson_get($var(error), "code", "$var(c)")) { + if(jansson_get("code", $var(error), "$var(c)")) { xlog("code is $var(c)\n"); } - if(jansson_get($var(error), "message", "$var(r)")) { + if(jansson_get("message", $var(error), "$var(r)")) { xlog("error is $var(r)\n"); } - if(jansson_get($var(error), "data", "$var(d)")) { + if(jansson_get("data", $var(error), "$var(d)")) { xlog("data is $var(d)\n"); } } @@ -389,13 +389,13 @@ route[ERROR] { route[INTERNAL] { xlog("There was an internal error\n"); - jansson_get($var(internal), "code", "$var(c)"); + jansson_get("code", $var(internal), "$var(c)"); xlog("code is $var(c)\n"); - jansson_get($var(internal), "message", "$var(r)"); + jansson_get("message", $var(internal), "$var(r)"); xlog("error is $var(r)\n"); - if(jansson_get($var(internal), "data", "$var(d)")) { + if(jansson_get("data", $var(internal), "$var(d)")) { xlog("request is $var(d)\n"); } }

8 years, 9 months

[kamailio] janssonrpc-c: correct jansson_get parameter order in examples (#281)

by Jason Newman

parameter order should be jansson_get(key/path, src, dst) and not jansson_get(src, key/path, dst) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/281 -- Commit Summary -- * janssonrpc-c: correct jansson_get parameter order in examples -- File Changes -- M modules/janssonrpc-c/README (18) M modules/janssonrpc-c/doc/janssonrpc-c_admin.xml (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/281.patch https://github.com/kamailio/kamailio/pull/281.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/281

8 years, 9 months

git:master:02f4d74c: mem: add TLSF malloc() and free() memory debug log

by Camille Oudot

Module: kamailio Branch: master Commit: 02f4d74c0c853300fabc434e054cb28324ace876 URL: https://github.com/kamailio/kamailio/commit/02f4d74c0c853300fabc434e054cb28… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-08-10T19:46:44+02:00 mem: add TLSF malloc() and free() memory debug log --- Modified: mem/tlsf.c --- Diff: https://github.com/kamailio/kamailio/commit/02f4d74c0c853300fabc434e054cb28… Patch: https://github.com/kamailio/kamailio/commit/02f4d74c0c853300fabc434e054cb28… --- diff --git a/mem/tlsf.c b/mem/tlsf.c index ea6b31e..3b92f68 100644 --- a/mem/tlsf.c +++ b/mem/tlsf.c @@ -10,6 +10,7 @@ #include "src_loc.h" #include "../dprint.h" #include "../cfg/cfg.h" +#include "memdbg.h" /* ** Constants. @@ -972,7 +973,13 @@ void* tlsf_malloc(tlsf_t tlsf, size_t size) const size_t adjust = adjust_request_size(size, ALIGN_SIZE); block_header_t* block = block_locate_free(control, adjust); #ifdef DBG_TLSF_MALLOC - return block_prepare_used(control, block, adjust, file, function, line); + void *ptr; + + MDBG("tlsf_malloc(%p, %zu) called from %s: %s(%lu)\n", tlsf, size, file, function, line); + ptr = block_prepare_used(control, block, adjust, file, function, line); + MDBG("tlsf_malloc(%p, %zu) returns address %p \n", tlsf, size, + ptr); + return ptr; #else return block_prepare_used(control, block, adjust); #endif @@ -985,12 +992,31 @@ void tlsf_free(tlsf_t tlsf, void* ptr, void tlsf_free(tlsf_t tlsf, void* ptr) #endif { +#ifdef DBG_TLSF_MALLOC + MDBG("tlsf_free(%p, %p), called from %s: %s(%lu)\n", tlsf, ptr, file, function, line); +#endif /* Don't attempt to free a NULL pointer. */ if (ptr) { control_t* control = tlsf_cast(control_t*, tlsf); block_header_t* block = block_from_ptr(ptr); - tlsf_assert(!block_is_free(block) && "block already marked as free"); + if (block_is_free(block)) { + LOG(L_CRIT, "BUG: tlsf_free: freeing already freed pointer (%p)" +#ifdef DBG_TLSF_MALLOC + ", called from %s: %s(%lu)" + ", first free %s: %s(%lu)\n", + ptr, file, function, line, + block->alloc_info.file, block->alloc_info.func, block->alloc_info.line); +#else + "\n", ptr); +#endif + if(likely(cfg_get(core, core_cfg, mem_safety)==0)) { + abort(); + } else { + return; + } + + } #if defined TLSF_STATS control->allocated -= block_size(block); control->real_used -= (block_size(block) + (ptr - (void *)block @@ -1006,6 +1032,12 @@ void tlsf_free(tlsf_t tlsf, void* ptr) block = block_merge_prev(control, block); block = block_merge_next(control, block); block_insert(control, block); + } else { +#ifdef DBG_TLSF_MALLOC + LOG(L_WARN, "tlsf_free: free(0) called from %s: %s(%d)\n", file, function, line); +#else + LOG(L_WARN, "tlsf_free: free(0) called\n"); +#endif } }

8 years, 9 months

git:master:8b7061a8: core: add TLSF in version flags string

by Camille Oudot

Module: kamailio Branch: master Commit: 8b7061a81c84955ec0bae77998f5cf79b1112f49 URL: https://github.com/kamailio/kamailio/commit/8b7061a81c84955ec0bae77998f5cf7… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-08-10T15:51:24+02:00 core: add TLSF in version flags string --- Modified: ver_defs.h --- Diff: https://github.com/kamailio/kamailio/commit/8b7061a81c84955ec0bae77998f5cf7… Patch: https://github.com/kamailio/kamailio/commit/8b7061a81c84955ec0bae77998f5cf7… --- diff --git a/ver_defs.h b/ver_defs.h index 7c9d209..a0717ae 100644 --- a/ver_defs.h +++ b/ver_defs.h @@ -153,6 +153,12 @@ #define LL_MALLOC_STR "" #endif +#ifdef TLSF_MALLOC +#define TLSF_MALLOC_STR ", TLSF_MALLOC" +#else +#define TLSF_MALLOC_STR "" +#endif + #ifdef USE_SHM_MEM #define USE_SHM_MEM_STR ", USE_SHM_MEM" #else @@ -189,6 +195,12 @@ #define DBG_LL_MALLOC_STR "" #endif +#ifdef DBG_TLSF_MALLOC +#define DBG_TLSF_MALLOC_STR ", DBG_TLSF_MALLOC" +#else +#define DBG_TLSF_MALLOC_STR "" +#endif + #ifdef TIMER_DEBUG #define TIMER_DEBUG_STR ", TIMER_DEBUG" #else @@ -323,10 +335,10 @@ USE_SCTP_STR CORE_TLS_STR TLS_HOOKS_STR USE_RAW_SOCKS_STR \ DISABLE_NAGLE_STR USE_MCAST_STR NO_DEBUG_STR NO_LOG_STR \ NO_SIG_DEBUG_STR DNS_IP_HACK_STR SHM_MEM_STR SHM_MMAP_STR PKG_MALLOC_STR \ - F_MALLOC_STR DL_MALLOC_STR SF_MALLOC_STR LL_MALLOC_STR \ + F_MALLOC_STR DL_MALLOC_STR SF_MALLOC_STR LL_MALLOC_STR TLSF_MALLOC_STR \ USE_SHM_MEM_STR \ DBG_QM_MALLOC_STR \ - DBG_F_MALLOC_STR DEBUG_DMALLOC_STR DBG_SF_MALLOC_STR DBG_LL_MALLOC_STR \ + DBG_F_MALLOC_STR DEBUG_DMALLOC_STR DBG_SF_MALLOC_STR DBG_LL_MALLOC_STR DBG_TLSF_MALLOC_STR \ TIMER_DEBUG_STR \ USE_FUTEX_STR \ FAST_LOCK_STR NOSMP_STR USE_PTHREAD_MUTEX_STR USE_POSIX_SEM_STR \

8 years, 9 months

git:master:d55ffbe4: mem: TLSF, fix real used memory count

by Camille Oudot

Module: kamailio Branch: master Commit: d55ffbe48973eac57a445ce4720393178a5dd65d URL: https://github.com/kamailio/kamailio/commit/d55ffbe48973eac57a445ce47203931… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-08-10T15:51:05+02:00 mem: TLSF, fix real used memory count --- Modified: mem/tlsf.c --- Diff: https://github.com/kamailio/kamailio/commit/d55ffbe48973eac57a445ce47203931… Patch: https://github.com/kamailio/kamailio/commit/d55ffbe48973eac57a445ce47203931… --- diff --git a/mem/tlsf.c b/mem/tlsf.c index 6060a41..ea6b31e 100644 --- a/mem/tlsf.c +++ b/mem/tlsf.c @@ -613,8 +613,10 @@ static void* block_prepare_used(control_t* control, block_header_t* block, size_ block_mark_as_used(block); p = block_to_ptr(block); #ifdef TLSF_STATS - TLSF_INCREASE_REAL_USED(control, block->size + (p - (void *)block)); - control->allocated += block->size; + TLSF_INCREASE_REAL_USED(control, block_size(block) + (p - (void *)block + /* prev_phys_block is melted in the previous block when the current block is used */ + + sizeof(block->prev_phys_block))); + control->allocated += block_size(block); #endif #ifdef DBG_TLSF_MALLOC block->alloc_info.file = file; @@ -847,7 +849,7 @@ pool_t tlsf_add_pool(tlsf_t tlsf, void* mem, size_t bytes) block_set_prev_used(block); block_insert(tlsf_cast(control_t*, tlsf), block); #ifdef TLSF_STATS - tlsf_cast(control_t*, tlsf)->total_size += block->size; + tlsf_cast(control_t*, tlsf)->total_size += block_size(block); #endif #ifdef DBG_TLSF_MALLOC block->alloc_info.file = _SRC_LOC_; @@ -877,7 +879,7 @@ void tlsf_remove_pool(tlsf_t tlsf, pool_t pool) mapping_insert(block_size(block), &fl, &sl); remove_free_block(control, block, fl, sl); #ifdef TLSF_STATS - tlsf_cast(control_t*, tlsf)->total_size -= block->size; + tlsf_cast(control_t*, tlsf)->total_size -= block_size(block); #endif } @@ -990,8 +992,10 @@ void tlsf_free(tlsf_t tlsf, void* ptr) block_header_t* block = block_from_ptr(ptr); tlsf_assert(!block_is_free(block) && "block already marked as free"); #if defined TLSF_STATS - control->allocated -= block->size; - control->real_used -= (block->size + (ptr - (void *)block)); + control->allocated -= block_size(block); + control->real_used -= (block_size(block) + (ptr - (void *)block + /* prev_phys_block is melted in the previous block when the current block is used */ + + sizeof(block->prev_phys_block))); #endif #ifdef DBG_TLSF_MALLOC block->alloc_info.file = file; @@ -1082,8 +1086,8 @@ void* tlsf_realloc(tlsf_t tlsf, void* ptr, size_t size) else { #ifdef TLSF_STATS - control->allocated -= block->size; - control->real_used -= block->size; + control->allocated -= block_size(block); + control->real_used -= block_size(block); #endif /* Do we need to expand to the next block? */ if (adjust > cursize) @@ -1096,8 +1100,8 @@ void* tlsf_realloc(tlsf_t tlsf, void* ptr, size_t size) block_trim_used(control, block, adjust); p = ptr; #ifdef TLSF_STATS - control->allocated += block->size; - TLSF_INCREASE_REAL_USED(control, block->size); + control->allocated +=block_size(block); + TLSF_INCREASE_REAL_USED(control, block_size(block)); #endif } }

8 years, 9 months

← Newer
1
...
13
14
15
16
17
18
19
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2015