sr-dev December 2010

sr-dev@lists.kamailio.org

16 participants
115 discussions

[ openser-Feature Requests-1875757 ] Add "Reason" header as tm parameter for CANCEL when forking
by SourceForge.net 22 Dec '10

22 Dec '10

Feature Requests item #1875757, was opened at 2008-01-20 14:01 Message generated for change (Comment added) made by ibc_sf You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743023&aid=1875757&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: modules Group: None >Status: Closed >Resolution: Fixed Priority: 5 Private: No Submitted By: Iñaki Baz Castillo (ibc_sf) Assigned to: Nobody/Anonymous (nobody) Summary: Add "Reason" header as tm parameter for CANCEL when forking Initial Comment: Hi, according to RFC 3326 [1] (Reason Header): 3.1 Call Completed Elsewhere A proxy forks an INVITE request and one of the branches returns a 200 (OK). The forking proxy includes this status code in a Reason header field in the CANCEL request that it sends to the rest of the branches. Reason: SIP ;cause=200 ;text="Call completed elsewhere" With this behaviour, if an AoR is registered in two phones and one of them answers a call, that call will not appear as MISSED in the other phone (if the phone supports "Reason" headers). This could be implemented as new "tm" parameters: modparam("tm", "add_reason_200_flag", 26) modparam("tm", "add_reason_200_text", "Call completed elsewhere") modparam("tm", "add_reason_200_text_avp", "$avp(i:26)") The last parameter would be an AVP containing the text to send in CANCEL "Reason" header if the call has been replied with 200 in other branch. If not set, default value ("add_reason_200_text") would be used. To add "Reason" header, flag(26) should be set before transaction creation: lookup("location"); switch($rc) { case 1: setflag(26); # Add "Reason" header in CANCELLED branches. $avp(i:26)="Call answered in other phone"; t_relay(); exit; } [1] RFC 3326 - The Reason Header Field: http://www.faqs.org/rfcs/rfc3326.html ---------------------------------------------------------------------- >Comment By: Iñaki Baz Castillo (ibc_sf) Date: 2010-12-22 15:03 Message: Hi aregr, this feature is already implemented in Kamailio/SIp-Router 3.X. ---------------------------------------------------------------------- Comment By: aregr (aregr) Date: 2010-12-22 12:23 Message: This would be a very useful feature indeed for all those with forking setups. Also seems that we have a steady growing number of phone manufacturers supporting this feature as well. Who could fix this? -Should not be too difficult to implement? ---------------------------------------------------------------------- Comment By: Olle E. Johansson (oej) Date: 2008-06-30 22:09 Message: Logged In: YES user_id=7341 Originator: NO I added this to Asterisk a short while ago. I think it would be very useful in OpenSER too. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743023&aid=1875757&group_…

1 0

git:master: kex: updated pkg.stats documentation
by Daniel-Constantin Mierla 22 Dec '10

22 Dec '10

Module: sip-router Branch: master Commit: a2d6730df7210084310d01c20b4ba2f3bcb883fb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a2d6730… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 22 13:07:33 2010 +0100 kex: updated pkg.stats documentation --- modules_k/kex/README | 15 +++++++++++---- modules_k/kex/doc/kex_admin.xml | 31 +++++++++++++++++++++++++++---- 2 files changed, 38 insertions(+), 8 deletions(-) diff --git a/modules_k/kex/README b/modules_k/kex/README index c04cdb2..f81977a 100644 --- a/modules_k/kex/README +++ b/modules_k/kex/README @@ -438,11 +438,18 @@ if(is_myself("$fu")) { 5.1. pkg.stats - Print private memory (pkg) usage statistics per process. It can take an - optinal parameter that specifies the pid of process to print statistics - for. If pid parameter is not give, it prints statistics for all + Print private memory (pkg) usage statistics per process. It can take + optinally a filter to print statistics only for a specific process or + set of processes. If no filter is given, it prints statistics for all processes. + The filter can be: + * pid value - print statistics for specific process pid. + * rank value - print statistics for specific process rank. + * index value - print statistics for specific index in process table. + Examples: sercmd pkg.stats - sercmd pkg.stats 1234 + sercmd pkg.stats pid 1234 + sercmd pkg.stats rank 1 + sercmd pkg.stats index 10 diff --git a/modules_k/kex/doc/kex_admin.xml b/modules_k/kex/doc/kex_admin.xml index da61349..6c65586 100644 --- a/modules_k/kex/doc/kex_admin.xml +++ b/modules_k/kex/doc/kex_admin.xml @@ -535,16 +535,39 @@ if(is_myself("$fu")) { </title> <para> Print private memory (pkg) usage statistics per process. It - can take an optinal parameter that specifies the pid of process - to print statistics for. If pid parameter is not give, it prints - statistics for all processes. + can take optinally a filter to print statistics only for a + specific process or set of processes. If no filter is given, + it prints statistics for all processes. </para> + <para>The filter can be:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>pid value</emphasis> - print statistics for + specific process pid. + </para> + </listitem> + <listitem> + <para> + <emphasis>rank value</emphasis> - print statistics for + specific process rank. + </para> + </listitem> + <listitem> + <para> + <emphasis>index value</emphasis> - print statistics for + specific index in process table. + </para> + </listitem> + </itemizedlist> <para> Examples: </para> <programlisting format="linespecific"> sercmd pkg.stats - sercmd pkg.stats 1234 + sercmd pkg.stats pid 1234 + sercmd pkg.stats rank 1 + sercmd pkg.stats index 10 </programlisting> </section> </section>

1 0

git:master: kex: pkg.stats command extended
by Daniel-Constantin Mierla 22 Dec '10

22 Dec '10

Module: sip-router Branch: master Commit: b6ae8ad5695eb6c4ec330f8ca44725a36172b8d4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b6ae8ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 22 12:59:00 2010 +0100 kex: pkg.stats command extended - it can take optionally a filter for which process to print pkg stats. It can be: - pid value - print by process pid - rank value - print by process rank - index value - print by index in process table --- modules_k/kex/pkg_stats.c | 71 +++++++++++++++++++++++++++++++------------- 1 files changed, 50 insertions(+), 21 deletions(-) diff --git a/modules_k/kex/pkg_stats.c b/modules_k/kex/pkg_stats.c index 7a8d9c3..2a04e3d 100644 --- a/modules_k/kex/pkg_stats.c +++ b/modules_k/kex/pkg_stats.c @@ -182,8 +182,10 @@ static void rpc_pkg_stats(rpc_t* rpc, void* ctx) { int i; int limit; - int lpid; + int cval; + str cname; void* th; + int mode; if(_pkg_proc_stats_list==NULL) { @@ -191,37 +193,64 @@ static void rpc_pkg_stats(rpc_t* rpc, void* ctx) return; } i = 0; + mode = 0; + cval = 0; limit = _pkg_proc_stats_no; - if (rpc->scan(ctx, "*d", &lpid) == 1) + if (rpc->scan(ctx, "*S", &cname) == 1) { - i = pkg_proc_get_pid_index((unsigned int)lpid); - if(i<0) + if(cname.len==3 && strncmp(cname.s, "pid", 3)==0) + mode = 1; + else if(cname.len==4 && strncmp(cname.s, "rank", 4)==0) + mode = 2; + else if(cname.len==5 && strncmp(cname.s, "index", 5)==0) + mode = 3; + else { + rpc->fault(ctx, 500, "Invalid filter type"); + return; + } + + if (rpc->scan(ctx, "d", &cval) < 1) { - rpc->fault(ctx, 500, "No such pid"); + rpc->fault(ctx, 500, "One more parameter expected"); return; } - limit = i + 1; + if(mode==1) + { + i = pkg_proc_get_pid_index((unsigned int)cval); + if(i<0) + { + rpc->fault(ctx, 500, "No such pid"); + return; + } + limit = i + 1; + } else if(mode==3) { + i=cval; + limit = i + 1; + } } for(; i<limit; i++) { /* add entry node */ - if (rpc->add(ctx, "{", &th) < 0) + if(mode!=2 || _pkg_proc_stats_list[i].rank==cval) { - rpc->fault(ctx, 500, "Internal error creating rpc"); - return; - } - if(rpc->struct_add(th, "dddddd", - "entry", i, - "pid", _pkg_proc_stats_list[i].pid, - "rank", _pkg_proc_stats_list[i].rank, - "used", _pkg_proc_stats_list[i].used, - "free", _pkg_proc_stats_list[i].available, - "real_used", _pkg_proc_stats_list[i].real_used - )<0) - { - rpc->fault(ctx, 500, "Internal error creating rpc"); - return; + if (rpc->add(ctx, "{", &th) < 0) + { + rpc->fault(ctx, 500, "Internal error creating rpc"); + return; + } + if(rpc->struct_add(th, "dddddd", + "entry", i, + "pid", _pkg_proc_stats_list[i].pid, + "rank", _pkg_proc_stats_list[i].rank, + "used", _pkg_proc_stats_list[i].used, + "free", _pkg_proc_stats_list[i].available, + "real_used", _pkg_proc_stats_list[i].real_used + )<0) + { + rpc->fault(ctx, 500, "Internal error creating rpc"); + return; + } } } }

1 0

[ openser-Feature Requests-1875757 ] Add "Reason" header as tm parameter for CANCEL when forking
by SourceForge.net 22 Dec '10

22 Dec '10

Feature Requests item #1875757, was opened at 2008-01-20 14:01 Message generated for change (Comment added) made by aregr You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743023&aid=1875757&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: modules Group: None Status: Open Resolution: None Priority: 5 Private: No Submitted By: Iñaki Baz Castillo (ibc_sf) Assigned to: Nobody/Anonymous (nobody) Summary: Add "Reason" header as tm parameter for CANCEL when forking Initial Comment: Hi, according to RFC 3326 [1] (Reason Header): 3.1 Call Completed Elsewhere A proxy forks an INVITE request and one of the branches returns a 200 (OK). The forking proxy includes this status code in a Reason header field in the CANCEL request that it sends to the rest of the branches. Reason: SIP ;cause=200 ;text="Call completed elsewhere" With this behaviour, if an AoR is registered in two phones and one of them answers a call, that call will not appear as MISSED in the other phone (if the phone supports "Reason" headers). This could be implemented as new "tm" parameters: modparam("tm", "add_reason_200_flag", 26) modparam("tm", "add_reason_200_text", "Call completed elsewhere") modparam("tm", "add_reason_200_text_avp", "$avp(i:26)") The last parameter would be an AVP containing the text to send in CANCEL "Reason" header if the call has been replied with 200 in other branch. If not set, default value ("add_reason_200_text") would be used. To add "Reason" header, flag(26) should be set before transaction creation: lookup("location"); switch($rc) { case 1: setflag(26); # Add "Reason" header in CANCELLED branches. $avp(i:26)="Call answered in other phone"; t_relay(); exit; } [1] RFC 3326 - The Reason Header Field: http://www.faqs.org/rfcs/rfc3326.html ---------------------------------------------------------------------- Comment By: aregr (aregr) Date: 2010-12-22 12:23 Message: This would be a very useful feature indeed for all those with forking setups. Also seems that we have a steady growing number of phone manufacturers supporting this feature as well. Who could fix this? -Should not be too difficult to implement? ---------------------------------------------------------------------- Comment By: Olle E. Johansson (oej) Date: 2008-06-30 22:09 Message: Logged In: YES user_id=7341 Originator: NO I added this to Asterisk a short while ago. I think it would be very useful in OpenSER too. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743023&aid=1875757&group_…

1 0

Kamailio rls module issues
by Klaus Darilion 21 Dec '10

21 Dec '10

Hi! I tested with sipp a simple scenario and detected 2 strange issues: U 2010/12/15 12:53:28.887255 83.136.32.148:5061 -> 83.136.32.148:5060 SUBSCRIBE sip:klaus3000@a1.net SIP/2.0. Via: SIP/2.0/UDP 83.136.32.148:5061;branch=z9hG4bK-8140-1-0. From: <sip:klaus3000@a1.net>;tag=1. To: <sip:test_ipcom@a1.net>. Call-ID: 1-8140(a)83.136.32.148. CSeq: 1 SUBSCRIBE. Contact: sip:foobar@83.136.32.148:5061. Content-Length: 0. Expires: 90. Event: presence. Accept: application/pidf+xml, application/xpidf+xml. Supported: eventlist. Accept: application/rlmi+xml. Accept: multipart/related. . # U 2010/12/15 12:53:28.959045 83.136.32.148:5060 -> 83.136.32.148:5061 SIP/2.0 200 OK. Via: SIP/2.0/UDP 83.136.32.148:5061;branch=z9hG4bK-8140-1-0. From: <sip:klaus3000@a1.net>;tag=1. To: <sip:test_ipcom@a1.net>;tag=86f18ea7b9f37b01834bd9036fb6c8f3-8bc8. Call-ID: 1-8140(a)83.136.32.148. CSeq: 1 SUBSCRIBE. Expires: 90. Contact: <sip:foobar@83.136.32.148:5061>. Require: eventlist. Server: kamailio (3.1.1 (i386/linux)). Content-Length: 0. . U 2010/12/15 12:53:28.969138 83.136.32.148:5060 -> 83.136.32.148:5061 NOTIFY sip:foobar@83.136.32.148:5061 SIP/2.0. Via: SIP/2.0/UDP 83.136.32.148;branch=z9hG4bK7f54.f84fd565.0. To: sip:klaus3000@a1.net;tag=1. From: sip:test_ipcom@a1.net;tag=86f18ea7b9f37b01834bd9036fb6c8f3-8bc8. CSeq: 1 NOTIFY. Call-ID: 1-8140(a)83.136.32.148. Content-Length: 418. User-Agent: kamailio (3.1.1 (i386/linux)). Max-Forwards: 70. Event: presence. Contact: <sip:83.136.32.148:5060;transport=udp>. Subscription-State: active;expires=90. Require: eventlist. Content-Type: "multipart/related;type="application/rlmi+xml";start= <1292414008.sip:klaus3000@a1.net.1594182384>;boundary=QUaqGeLBLc3NtSZsiWrjFAnu. . --QUaqGeLBLc3NtSZsiWrjFAnu. Content-Transfer-Encoding: binary. Content-ID: <1292414008.sip:klaus3000@a1.net.1594182384>. Content-Type: application/rlmi+xml;charset="UTF-8r". . <?xml version="1.0"?> <list uri="sip:klaus3000@a1.net" xmlns="urn:ietf:params:xml:ns:rlmi" version="1" fullState="true"> <resource uri="sip:asdfasf@a1.net"/> <resource uri="sip:test_ipcom@a1.net"/> </list> . --QUaqGeLBLc3NtSZsiWrjFAnu--. # U 2010/12/15 12:53:28.969304 83.136.32.148:5061 -> 83.136.32.148:5060 SIP/2.0 200 OK. Via: SIP/2.0/UDP 83.136.32.148;branch=z9hG4bK7f54.f84fd565.0. From: sip:test_ipcom@a1.net;tag=86f18ea7b9f37b01834bd9036fb6c8f3-8bc8. To: sip:klaus3000@a1.net;tag=1;tag=1. Call-ID: 1-8140(a)83.136.32.148. CSeq: 1 NOTIFY. Contact: sip:foobar@83.136.32.148:5061. Content-Length: 0. . ## U 2010/12/15 12:53:33.970997 83.136.32.148:5061 -> 83.136.32.148:5060 SUBSCRIBE sip:klaus3000@a1.net SIP/2.0. Via: SIP/2.0/UDP 83.136.32.148:5061;branch=z9hG4bK-8140-1-6. From: <sip:klaus3000@a1.net>;tag=1. To: <sip:test_ipcom@a1.net>;tag=86f18ea7b9f37b01834bd9036fb6c8f3-8bc8. Call-ID: 1-8140(a)83.136.32.148. CSeq: 2 SUBSCRIBE. Contact: sip:foobar@83.136.32.148:5061. Content-Length: 0. Expires: 0. Event: presence. Accept: application/pidf+xml, application/xpidf+xml. Supported: eventlist. Accept: application/rlmi+xml. Accept: multipart/related. . # U 2010/12/15 12:53:33.972115 83.136.32.148:5060 -> 83.136.32.148:5061 SIP/2.0 400 Stale Cseq Value. Via: SIP/2.0/UDP 83.136.32.148:5061;branch=z9hG4bK-8140-1-6. From: <sip:klaus3000@a1.net>;tag=1. To: <sip:test_ipcom@a1.net>;tag=86f18ea7b9f37b01834bd9036fb6c8f3-8bc8. Call-ID: 1-8140(a)83.136.32.148. CSeq: 2 SUBSCRIBE. Server: kamailio (3.1.1 (i386/linux)). Content-Length: 0. . 1. Why is the Contact header in 200 OK (SUBSCRIBE) wrong? Looks like Kamailio just copies the received contact header instead putting itself into contact. 2. Why does Kamailio reply with "400 Stale Cseq Value." on the reSUBSCRIBE? CSeq is fine. regards Klaus

5 13

git:master: core: fix ignored force_rport
by Andrei Pelinescu-Onciul 21 Dec '10

21 Dec '10

Module: sip-router Branch: master Commit: 70b2fe02a634ed2fd020eab27cbc8e7f676289bf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=70b2fe0… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Dec 21 14:38:45 2010 +0100 core: fix ignored force_rport The global force_rport config setting (not the force_rport() script function), was ignored in some cases (e.g. tm & sl). Reported-by: Tomas Mandys tomas.mandys iptel org --- forward.h | 3 ++- msg_translator.c | 3 --- parser/msg_parser.c | 2 ++ parser/msg_parser.h | 7 +++++++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/forward.h b/forward.h index e5f1a38..7600535 100644 --- a/forward.h +++ b/forward.h @@ -98,7 +98,8 @@ int update_sock_struct_from_via( union sockaddr_union* to, /* use src_ip, port=src_port if rport, via port if via port, 5060 otherwise */ #define update_sock_struct_from_ip( to, msg ) \ init_su((to), &(msg)->rcv.src_ip, \ - (((msg)->via1->rport)||((msg)->msg_flags&FL_FORCE_RPORT))? \ + (((msg)->via1->rport)|| \ + (((msg)->msg_flags|global_req_flags)&FL_FORCE_RPORT))? \ (msg)->rcv.src_port: \ ((msg)->via1->port)?(msg)->via1->port: SIP_PORT ) diff --git a/msg_translator.c b/msg_translator.c index c96d5b6..8b60fa7 100644 --- a/msg_translator.c +++ b/msg_translator.c @@ -156,9 +156,6 @@ extern char version[]; extern int version_len; -/* global flags for build_req_from_sip_req */ -static unsigned int global_req_flags=0; - /** per process fixup function for global_req_flags. diff --git a/parser/msg_parser.c b/parser/msg_parser.c index a2a834e..f65cf85 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -82,6 +82,8 @@ /* number of via's encountered */ int via_cnt; +/* global request flags */ +unsigned int global_req_flags = 0; /* returns pointer to next header line, and fill hdr_f ; * if at end of header returns pointer to the last crlf (always buf)*/ diff --git a/parser/msg_parser.h b/parser/msg_parser.h index baf0cf1..8ef60ca 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -373,6 +373,13 @@ typedef struct sip_msg { #define FAKED_REPLY ((struct sip_msg *) -1) extern int via_cnt; +/** global request flags. + * msg->msg_flags should be OR'ed with it before + * a flag value is checked, e.g.: + * if ((msg->msg_flags|global_req_flags) & FL_XXX) ... + */ +extern unsigned int global_req_flags; + int parse_msg(char* buf, unsigned int len, struct sip_msg* msg);

1 0

updating binaries without server crash
by Klaus Darilion 21 Dec '10

21 Dec '10

Hi! When updating binaries of Kamailio (e.g. replacing a module) Kamailio immediately shuts down, e.g.: : <core> [pass_fd.c:293]: ERROR: receive_fd: EOF on 14 ALERT: <core> [main.c:741]: child process 15490 exited by a signal 11 When I update Asterisk I can replace the binaries and Asterisk keeps still running. This is very convenient as the service disruption is much shorter. I wonder how Kamailio detects that the binaries were replaced. I suspect it has something to do how the modules are loaded (seems like the fd is still open). Is this a feature? Is it possible to change it (to be similar to Asterisk)? regards Klaus

2 4

git:master: kex: doxumented pkg.stats rpc command
by Daniel-Constantin Mierla 20 Dec '10

20 Dec '10

Module: sip-router Branch: master Commit: 42888884872511454eece63f757b4d73e14e3794 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4288888… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 20 23:39:07 2010 +0100 kex: doxumented pkg.stats rpc command --- modules_k/kex/README | 23 +++++++++++++++++++++++ modules_k/kex/doc/kex_admin.xml | 23 ++++++++++++++++++++++- 2 files changed, 45 insertions(+), 1 deletions(-) diff --git a/modules_k/kex/README b/modules_k/kex/README index 5f044e1..c04cdb2 100644 --- a/modules_k/kex/README +++ b/modules_k/kex/README @@ -48,6 +48,10 @@ Daniel-Constantin Mierla 4.5. version 4.6. which + 5. RPC Commands + + 5.1. pkg.stats + List of Examples 1.1. setsflag usage @@ -97,6 +101,10 @@ Chapter 1. Admin Guide 4.5. version 4.6. which + 5. RPC Commands + + 5.1. pkg.stats + 1. Overview This module collects extensions from Kamailio core. @@ -423,3 +431,18 @@ if(is_myself("$fu")) { MI FIFO Command Format: :which:_reply_fifo_file_ _empty_line_ + +5. RPC Commands + + 5.1. pkg.stats + +5.1. pkg.stats + + Print private memory (pkg) usage statistics per process. It can take an + optinal parameter that specifies the pid of process to print statistics + for. If pid parameter is not give, it prints statistics for all + processes. + + Examples: + sercmd pkg.stats + sercmd pkg.stats 1234 diff --git a/modules_k/kex/doc/kex_admin.xml b/modules_k/kex/doc/kex_admin.xml index 41435eb..da61349 100644 --- a/modules_k/kex/doc/kex_admin.xml +++ b/modules_k/kex/doc/kex_admin.xml @@ -525,7 +525,28 @@ if(is_myself("$fu")) { _empty_line_ </programlisting> </section> - </section> + </section> + <section> + <title>RPC Commands</title> + <section> + <title> + <function moreinfo="none">pkg.stats</function> + </title> + <para> + Print private memory (pkg) usage statistics per process. It + can take an optinal parameter that specifies the pid of process + to print statistics for. If pid parameter is not give, it prints + statistics for all processes. + </para> + <para> + Examples: + </para> + <programlisting format="linespecific"> + sercmd pkg.stats + sercmd pkg.stats 1234 + </programlisting> + </section> + </section> </chapter>

1 0

[tracker] Comment added: $snd(name) pvar contains local instead of remote socket info
by sip-router 20 Dec '10

20 Dec '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#103 - $snd(name) pvar contains local instead of remote socket info User who did this - Alex Hermann (axlh) ---------- I cherry-picked it into 3.1 and it seems to work fine, thanks. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=103#comment153 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:master: core: execute core events when pkg usage changes
by Daniel-Constantin Mierla 20 Dec '10

20 Dec '10

Module: sip-router Branch: master Commit: ed6f5bcaf616d2da8f8cfce4428b4eab41696717 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ed6f5bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 20 09:40:46 2010 +0100 core: execute core events when pkg usage changes - track used and real_used metrics for q/f_malloc when MALLOC_STATS is defined --- mem/f_malloc.c | 25 +++++++++++++++++++++++++ mem/q_malloc.c | 19 +++++++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/mem/f_malloc.c b/mem/f_malloc.c index 6fa88c3..17927f6 100644 --- a/mem/f_malloc.c +++ b/mem/f_malloc.c @@ -55,6 +55,9 @@ #include "memdbg.h" #include "../bit_scan.h" #include "../cfg/cfg.h" /* memlog */ +#ifdef MALLOC_STATS +#include "../evnets.h" +#endif /*useful macros*/ @@ -240,6 +243,9 @@ void fm_split_frag(struct fm_block* qm, struct fm_frag* frag, FRAG_CLEAR_USED(n); /* never used */ #if defined(DBG_F_MALLOC) || defined(MALLOC_STATS) qm->real_used+=FRAG_OVERHEAD; +#ifdef MALLOC_STATS + sr_event_exec(SREV_PKG_SET_REAL_USED, (void*)qm->real_used); +#endif #endif #ifdef DBG_F_MALLOC /* frag created by malloc, mark it*/ @@ -406,6 +412,10 @@ found: qm->used+=frag->size; if (qm->max_real_used<qm->real_used) qm->max_real_used=qm->real_used; +#ifdef MALLOC_STATS + sr_event_exec(SREV_PKG_SET_USED, (void*)qm->used); + sr_event_exec(SREV_PKG_SET_REAL_USED, (void*)qm->real_used); +#endif #endif FRAG_MARK_USED(frag); /* mark it as used */ return (char*)frag+sizeof(struct fm_frag); @@ -444,6 +454,10 @@ void fm_free(struct fm_block* qm, void* p) #if defined(DBG_F_MALLOC) || defined(MALLOC_STATS) qm->used-=size; qm->real_used-=size; +#ifdef MALLOC_STATS + sr_event_exec(SREV_PKG_SET_USED, (void*)qm->used); + sr_event_exec(SREV_PKG_SET_REAL_USED, (void*)qm->real_used); +#endif #endif #ifdef DBG_F_MALLOC f->file=file; @@ -513,6 +527,10 @@ void* fm_realloc(struct fm_block* qm, void* p, unsigned long size) free frag, so here we only need orig_size-f->size for real used */ qm->real_used-=(orig_size-f->size); qm->used-=(orig_size-f->size); +#ifdef MALLOC_STATS + sr_event_exec(SREV_PKG_SET_USED, (void*)qm->used); + sr_event_exec(SREV_PKG_SET_REAL_USED, (void*)qm->real_used); +#endif #endif }else if (f->size<size){ /* grow */ @@ -546,6 +564,9 @@ void* fm_realloc(struct fm_block* qm, void* p, unsigned long size) f->size+=n->size+FRAG_OVERHEAD; #if defined(DBG_F_MALLOC) || defined(MALLOC_STATS) qm->real_used-=FRAG_OVERHEAD; +#ifdef MALLOC_STATS + sr_event_exec(SREV_PKG_SET_REAL_USED, (void*)qm->real_used); +#endif #endif /* split it if necessary */ if (f->size > size){ @@ -559,6 +580,10 @@ void* fm_realloc(struct fm_block* qm, void* p, unsigned long size) #if defined(DBG_F_MALLOC) || defined(MALLOC_STATS) qm->real_used+=(f->size-orig_size); qm->used+=(f->size-orig_size); +#ifdef MALLOC_STATS + sr_event_exec(SREV_PKG_SET_USED, (void*)qm->used); + sr_event_exec(SREV_PKG_SET_REAL_USED, (void*)qm->real_used); +#endif #endif }else{ /* could not join => realloc */ diff --git a/mem/q_malloc.c b/mem/q_malloc.c index 04c6dc9..a90c1e6 100644 --- a/mem/q_malloc.c +++ b/mem/q_malloc.c @@ -48,6 +48,9 @@ #include "../globals.h" #include "memdbg.h" #include "../cfg/cfg.h" /* memlog */ +#ifdef MALLOC_STATS +#include "../events.h" +#endif /*useful macros*/ @@ -394,6 +397,10 @@ void* qm_malloc(struct qm_block* qm, unsigned long size) qm->used+=f->size; if (qm->max_real_used<qm->real_used) qm->max_real_used=qm->real_used; +#ifdef MALLOC_STATS + sr_event_exec(SREV_PKG_SET_USED, (void*)qm->used); + sr_event_exec(SREV_PKG_SET_REAL_USED, (void*)qm->real_used); +#endif #ifdef DBG_QM_MALLOC f->file=file; f->func=func; @@ -452,6 +459,10 @@ void qm_free(struct qm_block* qm, void* p) size=f->size; qm->used-=size; qm->real_used-=size; +#ifdef MALLOC_STATS + sr_event_exec(SREV_PKG_SET_USED, (void*)qm->used); + sr_event_exec(SREV_PKG_SET_REAL_USED, (void*)qm->real_used); +#endif #ifdef QM_JOIN_FREE /* mark this fragment as used (might fall into the middle of joined frags) @@ -568,6 +579,10 @@ void* qm_realloc(struct qm_block* qm, void* p, unsigned long size) */ qm->real_used-=(orig_size-f->size); qm->used-=(orig_size-f->size); +#ifdef MALLOC_STATS + sr_event_exec(SREV_PKG_SET_USED, (void*)qm->used); + sr_event_exec(SREV_PKG_SET_REAL_USED, (void*)qm->real_used); +#endif } }else if (f->size < size){ @@ -598,6 +613,10 @@ void* qm_realloc(struct qm_block* qm, void* p, unsigned long size) } qm->real_used+=(f->size-orig_size); qm->used+=(f->size-orig_size); +#ifdef MALLOC_STATS + sr_event_exec(SREV_PKG_SET_USED, (void*)qm->used); + sr_event_exec(SREV_PKG_SET_REAL_USED, (void*)qm->real_used); +#endif }else{ /* could not join => realloc */ #ifdef DBG_QM_MALLOC

1 0

← Newer
1
2
3
4
5
6
7
...
12
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2010