sr-dev February 2017

sr-dev@lists.kamailio.org

29 participants
365 discussions

git:5.0:04e8f5e7: carrierroute: enclosed unused functions in ifdefs
by Daniel-Constantin Mierla 27 Feb '17

27 Feb '17

Module: kamailio Branch: 5.0 Commit: 04e8f5e732dbfd13f6e321d384134998443b739c URL: https://github.com/kamailio/kamailio/commit/04e8f5e732dbfd13f6e321d38413499… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-02-27T14:07:13+01:00 carrierroute: enclosed unused functions in ifdefs - they were used by mi commands and may be needed when re-introducing the equivalent in rpc commands - reported by GH #1010 (cherry picked from commit c62409bdd317f61df0e7cc16fbb8aa9ccebcefb5) --- Modified: src/modules/carrierroute/cr_fifo.c --- Diff: https://github.com/kamailio/kamailio/commit/04e8f5e732dbfd13f6e321d38413499… Patch: https://github.com/kamailio/kamailio/commit/04e8f5e732dbfd13f6e321d38413499… --- diff --git a/src/modules/carrierroute/cr_fifo.c b/src/modules/carrierroute/cr_fifo.c index 8789c9b..8ae0123 100644 --- a/src/modules/carrierroute/cr_fifo.c +++ b/src/modules/carrierroute/cr_fifo.c @@ -41,6 +41,7 @@ #include "cr_rule.h" +#ifdef MI_REMOVED /** * Defines the option set for the different fifo commands * Every line is for a command, @@ -54,6 +55,7 @@ static unsigned int opt_settings[5][3] = { {O_HOST|O_DOMAIN|O_PREFIX, O_PROB|O_NEW_TARGET, O_R_PREFIX|O_R_SUFFIX|O_H_INDEX}, {O_HOST|O_DOMAIN|O_PREFIX, O_PROB, O_R_PREFIX|O_R_SUFFIX|O_NEW_TARGET|O_H_INDEX} }; +#endif int fifo_err; @@ -456,6 +458,7 @@ static int dump_tree_recursor (struct mi_node* msg, struct dtrie_node_t *node, c } #endif +#ifdef MI_REMOVED /** * parses the command line argument for options * @@ -606,8 +609,10 @@ static int get_fifo_opts(str * buf, fifo_opt_t * opts, unsigned int opt_set[]) { } return 0; } +#endif +#ifdef MI_REMOVED /** * loads the config data into shared memory (but doesn't really * share it), updates the routing data and writes it to the config @@ -729,6 +734,7 @@ static int update_route_data(fifo_opt_t * opts) { clear_route_data(rd); return -1; } +#endif /**

1 0

[kamailio/kamailio] carrierroute: compiler warnings (#1010)
by Ovidiu Sas 27 Feb '17

27 Feb '17

The following warnings shows up while compiling the carrierroute module: ```` cr_fifo.c:50:21: warning: ‘opt_settings’ defined but not used [-Wunused-variable] static unsigned int opt_settings[5][3] = { ^ cr_fifo.c:470:12: warning: ‘get_fifo_opts’ defined but not used [-Wunused-function] static int get_fifo_opts(str * buf, fifo_opt_t * opts, unsigned int opt_set[]) { ^ cr_fifo.c:621:12: warning: ‘update_route_data’ defined but not used [-Wunused-function] static int update_route_data(fifo_opt_t * opts) { ^ ```` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1010

2 2

git:master:c62409bd: carrierroute: enclosed unused functions in ifdefs
by Daniel-Constantin Mierla 27 Feb '17

27 Feb '17

Module: kamailio Branch: master Commit: c62409bdd317f61df0e7cc16fbb8aa9ccebcefb5 URL: https://github.com/kamailio/kamailio/commit/c62409bdd317f61df0e7cc16fbb8aa9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-02-27T13:50:06+01:00 carrierroute: enclosed unused functions in ifdefs - they were used by mi commands and may be needed when re-introducing the equivalent in rpc commands - reported by GH #1010 --- Modified: src/modules/carrierroute/cr_fifo.c --- Diff: https://github.com/kamailio/kamailio/commit/c62409bdd317f61df0e7cc16fbb8aa9… Patch: https://github.com/kamailio/kamailio/commit/c62409bdd317f61df0e7cc16fbb8aa9… --- diff --git a/src/modules/carrierroute/cr_fifo.c b/src/modules/carrierroute/cr_fifo.c index 8789c9b..8ae0123 100644 --- a/src/modules/carrierroute/cr_fifo.c +++ b/src/modules/carrierroute/cr_fifo.c @@ -41,6 +41,7 @@ #include "cr_rule.h" +#ifdef MI_REMOVED /** * Defines the option set for the different fifo commands * Every line is for a command, @@ -54,6 +55,7 @@ static unsigned int opt_settings[5][3] = { {O_HOST|O_DOMAIN|O_PREFIX, O_PROB|O_NEW_TARGET, O_R_PREFIX|O_R_SUFFIX|O_H_INDEX}, {O_HOST|O_DOMAIN|O_PREFIX, O_PROB, O_R_PREFIX|O_R_SUFFIX|O_NEW_TARGET|O_H_INDEX} }; +#endif int fifo_err; @@ -456,6 +458,7 @@ static int dump_tree_recursor (struct mi_node* msg, struct dtrie_node_t *node, c } #endif +#ifdef MI_REMOVED /** * parses the command line argument for options * @@ -606,8 +609,10 @@ static int get_fifo_opts(str * buf, fifo_opt_t * opts, unsigned int opt_set[]) { } return 0; } +#endif +#ifdef MI_REMOVED /** * loads the config data into shared memory (but doesn't really * share it), updates the routing data and writes it to the config @@ -729,6 +734,7 @@ static int update_route_data(fifo_opt_t * opts) { clear_route_data(rd); return -1; } +#endif /**

1 0

git:5.0:69b81c85: pkg/kamailio/deb: version set to 5.0.0 [skip ci]
by Victor Seva 27 Feb '17

27 Feb '17

Module: kamailio Branch: 5.0 Commit: 69b81c8553f891179553897fadc57d000995327e URL: https://github.com/kamailio/kamailio/commit/69b81c8553f891179553897fadc57d0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-02-27T11:03:00+01:00 pkg/kamailio/deb: version set to 5.0.0 [skip ci] --- Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/69b81c8553f891179553897fadc57d0… Patch: https://github.com/kamailio/kamailio/commit/69b81c8553f891179553897fadc57d0… --- diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index 28de3b0..11e8940 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0) unstable; urgency=medium + + * version set to 5.0.0 + + -- Victor Seva <vseva(a)debian.org> Mon, 27 Feb 2017 11:01:52 +0100 + kamailio (5.0.0~rc1) unstable; urgency=medium * version set to 5.0.0-rc1 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index 28de3b0..11e8940 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0) unstable; urgency=medium + + * version set to 5.0.0 + + -- Victor Seva <vseva(a)debian.org> Mon, 27 Feb 2017 11:01:52 +0100 + kamailio (5.0.0~rc1) unstable; urgency=medium * version set to 5.0.0-rc1 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index 28de3b0..11e8940 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0) unstable; urgency=medium + + * version set to 5.0.0 + + -- Victor Seva <vseva(a)debian.org> Mon, 27 Feb 2017 11:01:52 +0100 + kamailio (5.0.0~rc1) unstable; urgency=medium * version set to 5.0.0-rc1 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index 28de3b0..11e8940 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0) unstable; urgency=medium + + * version set to 5.0.0 + + -- Victor Seva <vseva(a)debian.org> Mon, 27 Feb 2017 11:01:52 +0100 + kamailio (5.0.0~rc1) unstable; urgency=medium * version set to 5.0.0-rc1 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index 28de3b0..11e8940 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0) unstable; urgency=medium + + * version set to 5.0.0 + + -- Victor Seva <vseva(a)debian.org> Mon, 27 Feb 2017 11:01:52 +0100 + kamailio (5.0.0~rc1) unstable; urgency=medium * version set to 5.0.0-rc1 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index 28de3b0..11e8940 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0) unstable; urgency=medium + + * version set to 5.0.0 + + -- Victor Seva <vseva(a)debian.org> Mon, 27 Feb 2017 11:01:52 +0100 + kamailio (5.0.0~rc1) unstable; urgency=medium * version set to 5.0.0-rc1 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index 28de3b0..11e8940 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0) unstable; urgency=medium + + * version set to 5.0.0 + + -- Victor Seva <vseva(a)debian.org> Mon, 27 Feb 2017 11:01:52 +0100 + kamailio (5.0.0~rc1) unstable; urgency=medium * version set to 5.0.0-rc1 diff --git a/pkg/kamailio/deb/xenial/changelog b/pkg/kamailio/deb/xenial/changelog index 28de3b0..11e8940 100644 --- a/pkg/kamailio/deb/xenial/changelog +++ b/pkg/kamailio/deb/xenial/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0) unstable; urgency=medium + + * version set to 5.0.0 + + -- Victor Seva <vseva(a)debian.org> Mon, 27 Feb 2017 11:01:52 +0100 + kamailio (5.0.0~rc1) unstable; urgency=medium * version set to 5.0.0-rc1

1 0

Releasing Kamailio v5.0.0
by Daniel-Constantin Mierla 27 Feb '17

27 Feb '17

Hello, I am considering to release Kamailio v5.0.0 at the beginning of next week, depending how things evolve in the next days, either on Monday, Feb 27, or Tuesday, Feb 28. I haven't noticed any new issues specific for the new features added for 5.0 lately, so it looks pretty good so far. If you are aware of issues not reported to the bug tracker, register them as soon as possible at: - https://github.com/kamailio/kamailio/issues There are still some parts of documentation that have to be updated, I am planning to work on them during the next days, but help from others are very appreciated, especially details of what you had to do changes while upgrading from 4.4 to 5.0. Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Mar 6-8 (Europe) and Mar 20-22 (USA) - www.asipto.com Kamailio World Conference - May 8-10, 2017 - www.kamailioworld.com

1 1

[kamailio/kamailio] [uac] REGISTER source port alternates between 5060 and != 5060 (#936)
by Peter Colberg 26 Feb '17

26 Feb '17

When registering to an upstream provider using the uac module, the source port of REGISTER messages alternates seemingly randomly between either 5060 or the lowest available port, e.g., 1024, 1025, 1026. All SIP providers that I tested send subsequent INVITEs of incoming calls to the originating ip/port of the prior REGISTER, which is problematic when kamilio is running behind a firewall. I tested both the latest master (7c03340b4b486afaf00b14a6589c13b7165240a0) and 4.4 (df5ef6183350d99f77087dd83950ef35466e84a1) on Debian unstable/amd64. #### /etc/kamailio/kamailio.cfg ``` #!KAMAILIO debug=3 loadmodule "kex.so" loadmodule "corex.so" loadmodule "tm.so" loadmodule "tmx.so" loadmodule "sl.so" loadmodule "rr.so" loadmodule "pv.so" loadmodule "db_text.so" loadmodule "dialog.so" loadmodule "uac.so" #!define DBURL "text:///etc/kamailio/dbtext" modparam("rr", "append_fromtag", 1) modparam("dialog", "dlg_flag", 4) modparam("dialog", "track_cseq_updates", 1) modparam("uac", "restore_dlg", 1) modparam("uac", "reg_db_url", DBURL) modparam("uac", "reg_timer_interval", 60) modparam("uac", "reg_retry_interval", 60) modparam("uac", "reg_contact_addr", "1.2.3.4:5060") request_route { exit; } ``` #### /etc/kamailio/dbtext/uacreg ``` l_uuid(string) l_username(string) l_domain(string) r_username(string) r_domain(string) realm(string) auth_username(string) auth_password(string) auth_proxy(string) expires(int) flags(int) reg_delay(int) 12345678:user:domain.local:11111111:sip.example.org:sip.example.org:11111111:XXXXXXXXXXXXXXXX:sip\:sip.example.org:600:0:0 ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/936

2 10

git:master:bfdcc905: sca: use HDR_CALLINFO_T
by Victor Seva 24 Feb '17

24 Feb '17

Module: kamailio Branch: master Commit: bfdcc905dc9ee703cb5cc0c0fb482bf789f63fae URL: https://github.com/kamailio/kamailio/commit/bfdcc905dc9ee703cb5cc0c0fb482bf… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-02-24T19:56:42+01:00 sca: use HDR_CALLINFO_T --- Modified: src/modules/sca/sca_call_info.c Modified: src/modules/sca/sca_call_info.h Modified: src/modules/sca/sca_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/bfdcc905dc9ee703cb5cc0c0fb482bf… Patch: https://github.com/kamailio/kamailio/commit/bfdcc905dc9ee703cb5cc0c0fb482bf… --- diff --git a/src/modules/sca/sca_call_info.c b/src/modules/sca/sca_call_info.c index 58213b3..e42a200 100644 --- a/src/modules/sca/sca_call_info.c +++ b/src/modules/sca/sca_call_info.c @@ -308,23 +308,6 @@ int sca_call_info_append_header_for_appearance_index(sca_subscription *sub, return (-1); } -hdr_field_t *sca_call_info_header_find(hdr_field_t *msg_hdrs) -{ - hdr_field_t *hdr = NULL; - - for (hdr = msg_hdrs; hdr != NULL; hdr = hdr->next) { - if (hdr->type == HDR_OTHER_T - && hdr->name.len == SCA_CALL_INFO_HEADER_NAME.len) { - if (strncasecmp(hdr->name.s, SCA_CALL_INFO_HEADER_NAME.s, - SCA_CALL_INFO_HEADER_NAME.len) == 0) { - break; - } - } - } - - return (hdr); -} - int sca_call_info_body_parse(str *hdr_body, sca_call_info *call_info) { str s = STR_NULL; @@ -485,23 +468,10 @@ static int sca_call_info_header_remove(sip_msg_t *msg) LM_ERR("Failed to parse_headers\n"); return (-1); } - -#ifdef notdef - for (hdr = sca_call_info_header_find(msg->headers); hdr != NULL; - hdr = sca_call_info_header_find(hdr->next)) { -#endif // notdef - for (hdr = msg->headers; hdr; hdr = hdr->next) { - if (hdr->name.len != SCA_CALL_INFO_HEADER_NAME.len) { - continue; - } - if (memcmp(hdr->name.s, SCA_CALL_INFO_HEADER_NAME.s, hdr->name.len) - != 0) { - continue; - } - + for (hdr = get_hdr(msg, HDR_CALLINFO_T); hdr; hdr = next_sibling_hdr(hdr)) { // del_lump takes packet, offset, lump length, & hdr type ci_hdr_lump = del_lump(msg, hdr->name.s - msg->buf, hdr->len, - HDR_OTHER_T); + HDR_CALLINFO_T); if (ci_hdr_lump == NULL) { LM_ERR("Failed to del_lump Call-Info header\n"); rc = -1; @@ -1883,7 +1853,7 @@ int sca_call_info_update(sip_msg_t *msg, char *p1, str *uri_to, str *uri_from) } memset(&call_info, 0, sizeof(sca_call_info)); - call_info_hdr = sca_call_info_header_find(msg->headers); + call_info_hdr = get_hdr(msg, HDR_CALLINFO_T); if (!SCA_HEADER_EMPTY(call_info_hdr)) { // this needs to accomodate comma-separated appearance info if (sca_call_info_body_parse(&call_info_hdr->body, &call_info) < 0) { diff --git a/src/modules/sca/sca_call_info.h b/src/modules/sca/sca_call_info.h index 0a2f04b..10714ea 100644 --- a/src/modules/sca/sca_call_info.h +++ b/src/modules/sca/sca_call_info.h @@ -67,7 +67,6 @@ int sca_call_info_build_header(sca_mod *, sca_subscription *, char *, int); int sca_call_info_append_header_for_appearance_index(sca_subscription *, int, char *, int); -hdr_field_t *sca_call_info_header_find(hdr_field_t *); int sca_call_info_body_parse(str *, sca_call_info *); int sca_call_info_free(sca_call_info *); diff --git a/src/modules/sca/sca_subscribe.c b/src/modules/sca/sca_subscribe.c index e9fb461..48b0d58 100644 --- a/src/modules/sca/sca_subscribe.c +++ b/src/modules/sca/sca_subscribe.c @@ -1197,7 +1197,7 @@ int sca_handle_subscribe(sip_msg_t *msg, char *p1, char *p2) pkg_free(sub_key.s); if (req_sub.event == SCA_EVENT_TYPE_LINE_SEIZE) { - call_info_hdr = sca_call_info_header_find(msg->headers); + call_info_hdr = get_hdr(msg, HDR_CALLINFO_T); if (call_info_hdr) { if (sca_call_info_body_parse(&call_info_hdr->body, &call_info) < 0) {

1 0

git:master:7815c380: core: support for parsing the Call-Info header
by Victor Seva 24 Feb '17

24 Feb '17

Module: kamailio Branch: master Commit: 7815c3805692a049fb36951abd3c01edd546c2ae URL: https://github.com/kamailio/kamailio/commit/7815c3805692a049fb36951abd3c01e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-02-24T19:56:42+01:00 core: support for parsing the Call-Info header * extend parsing Call-ID due to _call_ is the token detected --- Added: src/core/parser/case_c_inf.h Modified: src/core/parser/case_call.h Modified: src/core/parser/hf.c Modified: src/core/parser/hf.h Modified: src/core/parser/keys.h Modified: src/core/parser/msg_parser.c Modified: src/core/sip_msg_clone.c --- Diff: https://github.com/kamailio/kamailio/commit/7815c3805692a049fb36951abd3c01e… Patch: https://github.com/kamailio/kamailio/commit/7815c3805692a049fb36951abd3c01e…

1 0

[kamailio/kamailio] Call-Info header support (#1009)
by Victor Seva 24 Feb '17

24 Feb '17

and use it on ``sca`` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1009 -- Commit Summary -- * core: support for parsing the Call-Info header * sca: use HDR_CALLINFO_T -- File Changes -- A src/core/parser/case_c_inf.h (41) M src/core/parser/case_call.h (3) M src/core/parser/hf.c (1) M src/core/parser/hf.h (2) M src/core/parser/keys.h (3) M src/core/parser/msg_parser.c (4) M src/core/sip_msg_clone.c (2) M src/modules/sca/sca_call_info.c (36) M src/modules/sca/sca_call_info.h (1) M src/modules/sca/sca_subscribe.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1009.patch https://github.com/kamailio/kamailio/pull/1009.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1009

2 3

git:tmp/valgrind:44f0830d: mem: add valgrind memcheck instrumentation
by Camille Oudot 24 Feb '17

24 Feb '17

Module: kamailio Branch: tmp/valgrind Commit: 44f0830d43955791fc4ee8bca9c1a7f427e74e41 URL: https://github.com/kamailio/kamailio/commit/44f0830d43955791fc4ee8bca9c1a7f… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2017-02-24T15:54:10+01:00 mem: add valgrind memcheck instrumentation --- Modified: src/Makefile.defs Modified: src/core/mem/q_malloc.c Modified: src/core/mem/q_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/44f0830d43955791fc4ee8bca9c1a7f… Patch: https://github.com/kamailio/kamailio/commit/44f0830d43955791fc4ee8bca9c1a7f… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 0226115..1eb4c8b 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -118,6 +118,10 @@ MEMMNG ?= 0 # 0 - off (no-debug mode) # 1 - on (debug mode) MEMDBG ?= 1 +# Valgrind memcheck support +# 0 - off +# 1 - on +MEMCHECK ?= 0 SER_VER = $(shell expr $(VERSION) \* 1000000 + $(PATCHLEVEL) \* 1000 + \ $(SUBLEVEL) ) @@ -694,7 +698,13 @@ C_DEFS+= -DTLSF_MALLOC ifeq ($(MEMDBG), 1) C_DEFS+= -DDBG_SR_MEMORY endif - +# FIXME: does not seem to work +ifeq ($(MEMCHECK), 1) + C_DEFS+= -DVALGRIND_MEMCHECK +endif +#### +C_DEFS+= -DVALGRIND_MEMCHECK +# /FIXME ifneq ($(PKG_MEM_SIZE),) C_DEFS+= -DPKG_MEM_SIZE=$(PKG_MEM_SIZE) endif diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index 0c24ef2..db42e09 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -162,6 +162,9 @@ static inline void qm_insert_free(struct qm_block* qm, struct qm_frag* frag) f=f->u.nxt_free){ if (frag->size <= f->size) break; } +#ifdef VALGRIND_MEMCHECK + VALGRIND_MEMPOOL_FREE(qm, (char*)frag + sizeof(struct qm_frag)); +#endif /* #ifdef VALGRIND_MEMCHECK */ /*insert it here*/ prev=FRAG_END(f)->prev_free; prev->u.nxt_free=frag; @@ -236,6 +239,15 @@ struct qm_block* qm_malloc_init(char* address, unsigned long size, int type) qm->free_hash[h].tail.size=0; } +#ifdef VALGRIND_MEMCHECK + VALGRIND_CREATE_MEMPOOL(qm, 0 /*sizeof(unsigned long)*/, 0); + VALGRIND_MEMPOOL_ALLOC(qm, qm->first_frag, sizeof(struct qm_frag)); + VALGRIND_MAKE_MEM_DEFINED(qm->first_frag, sizeof(struct qm_frag)); + VALGRIND_MEMPOOL_ALLOC(qm, FRAG_END(qm->first_frag), sizeof(struct qm_frag_end)); + VALGRIND_MAKE_MEM_DEFINED(FRAG_END(qm->first_frag), sizeof(struct qm_frag_end)); + VALGRIND_MEMPOOL_ALLOC(qm, (char*)qm->first_frag + sizeof(struct qm_frag), qm->first_frag->size); +#endif /* #ifdef VALGRIND_MEMCHECK */ + /* link initial fragment into the free list*/ qm_insert_free(qm, qm->first_frag); @@ -254,6 +266,9 @@ static inline void qm_detach_free(struct qm_block* qm, struct qm_frag* frag) { struct qm_frag *prev; struct qm_frag *next; +#ifdef VALGRIND_MEMCHECK + VALGRIND_MEMPOOL_ALLOC(qm, (char*)frag + sizeof(struct qm_frag), frag->size); +#endif /* #ifdef VALGRIND_MEMCHECK */ prev=FRAG_END(frag)->prev_free; next=frag->u.nxt_free; @@ -315,15 +330,28 @@ int split_frag(struct qm_block* qm, struct qm_frag* f, size_t new_size) #else if (rest>(FRAG_OVERHEAD+MIN_FRAG_SIZE)){ #endif +#ifdef VALGRIND_MEMCHECK + VALGRIND_MEMPOOL_CHANGE(qm, (char*)f + sizeof(struct qm_frag), (char*)f + sizeof(struct qm_frag), new_size); +#endif /* #ifdef VALGRIND_MEMCHECK */ f->size=new_size; /*split the fragment*/ end=FRAG_END(f); +#ifdef VALGRIND_MEMCHECK + VALGRIND_MEMPOOL_ALLOC(qm, end, sizeof(struct qm_frag_end)); +#endif /* #ifdef VALGRIND_MEMCHECK */ end->size=new_size; n=(struct qm_frag*)((char*)end+sizeof(struct qm_frag_end)); +#ifdef VALGRIND_MEMCHECK + VALGRIND_MEMPOOL_ALLOC(qm, n, sizeof(struct qm_frag)); +#endif /* #ifdef VALGRIND_MEMCHECK */ n->size=rest-FRAG_OVERHEAD; +#ifdef VALGRIND_MEMCHECK + VALGRIND_MEMPOOL_ALLOC(qm, (char *)n + sizeof(struct qm_frag), n->size); +#endif /* #ifdef VALGRIND_MEMCHECK */ FRAG_END(n)->size=n->size; FRAG_CLEAR_USED(n); /* never used */ qm->real_used+=FRAG_OVERHEAD; + #ifdef DBG_QM_MALLOC end->check1=END_CHECK_PATTERN1; end->check2=END_CHECK_PATTERN2; diff --git a/src/core/mem/q_malloc.h b/src/core/mem/q_malloc.h index 5d43900..a9e7704 100644 --- a/src/core/mem/q_malloc.h +++ b/src/core/mem/q_malloc.h @@ -28,6 +28,9 @@ #define q_malloc_h #include "meminfo.h" +#ifdef VALGRIND_MEMCHECK +#include <valgrind/memcheck.h> +#endif #ifdef DBG_SR_MEMORY #define DBG_QM_MALLOC

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
37
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2017