sr-dev

sr-dev@lists.kamailio.org

15 participants
45351 discussions

git:tmp/k3.0_sr_backports: update drp_reqs statistics
by Andrei Pelinescu-Onciul 01 Feb '10

01 Feb '10

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: 45a368cb040ef8e94fa39d1ddf6fe85faabce8f4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=45a368c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Oct 23 16:48:16 2009 +0200 update drp_reqs statistics (cherry picked from commit f4b64fc173c4ecc470346f05514af43adbda294a) --- forward.c | 2 ++ receive.c | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/forward.c b/forward.c index eae80ed..3a4fbf4 100644 --- a/forward.c +++ b/forward.c @@ -584,6 +584,8 @@ end: /* received_buf & line_buf will be freed in receive_msg by free_lump_list*/ if(ret==0) sr_event_exec(SREV_CORE_STATS, (void*)1); + else + sr_event_exec(SREV_CORE_STATS, (void*)3); return ret; } diff --git a/receive.c b/receive.c index 4b0c755..60eefa7 100644 --- a/receive.c +++ b/receive.c @@ -183,7 +183,10 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) on via1 being parsed in a pre-script callback --andrei */ if (exec_pre_script_cb(msg, REQUEST_CB_TYPE)==0 ) + { + sr_event_exec(SREV_CORE_STATS, (void*)3); goto end; /* drop the request */ + } set_route_type(REQUEST_ROUTE); /* exec the routing script */

1 0

git:tmp/k3.0_sr_backports: update bad_msg_hdr statistics
by Andrei Pelinescu-Onciul 01 Feb '10

01 Feb '10

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: f17084c770018a3c43e0161ef6c00764e9dac3df URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f17084c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Oct 23 15:51:39 2009 +0200 update bad_msg_hdr statistics (cherry picked from commit 0c7926f1a854aed5af4541518bc0cacdf4fce7e7) --- parser/msg_parser.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/parser/msg_parser.c b/parser/msg_parser.c index 8f3b163..48f666c 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -54,6 +54,7 @@ #include "../data_lump_rpl.h" #include "../mem/mem.h" #include "../error.h" +#include "../events.h" #include "../globals.h" #include "parse_hname2.h" #include "parse_uri.h" @@ -278,6 +279,7 @@ char* get_hdr_field(char* buf, char* end, struct hdr_field* hdr) return tmp; error: DBG("get_hdr_field: error exit\n"); + sr_event_exec(SREV_CORE_STATS, (void*)8); hdr->type=HDR_ERROR_T; hdr->len=tmp-hdr->name.s; return tmp;

1 0

git:tmp/k3.0_sr_backports: update bad_URIs statistics
by Andrei Pelinescu-Onciul 01 Feb '10

01 Feb '10

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: 1c18ae3f870eb48a04d13b7a750575b17060cfb3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1c18ae3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Oct 23 15:57:40 2009 +0200 update bad_URIs statistics (cherry picked from commit feef8d66b067e34459660be78b1f6b2625eaa533) --- parser/parse_uri.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/parser/parse_uri.c b/parser/parse_uri.c index 741258e..efcc54b 100644 --- a/parser/parse_uri.c +++ b/parser/parse_uri.c @@ -50,6 +50,7 @@ #include "../ut.h" /* q_memchr */ /* #endif */ #include "../error.h" +#include "../events.h" /* buf= pointer to begining of uri (sip:x@foo.bar:5060;a=b?h=i) * len= len of uri @@ -1223,6 +1224,7 @@ error_bug: error_exit: ser_error=E_BAD_URI; uri->type=ERROR_URI_T; + sr_event_exec(SREV_CORE_STATS, (void*)7); return E_BAD_URI; }

1 0

git:tmp/k3.0_sr_backports: core: stats events cbs are called only if USE_CORE_STATS is defined
by Andrei Pelinescu-Onciul 01 Feb '10

01 Feb '10

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: 6b109fa2ae51e1b5676d163f015c8cda7ea4eef6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6b109fa… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 1 18:20:10 2010 +0100 core: stats events cbs are called only if USE_CORE_STATS is defined Use macros instead of triggering directly various SREV_CORE_STATS callbacks. This way if compiled without core stats support (USE_CORE_STATS), there will be no performance impact (the macros will be empty). All the macros are defined in core_stats.h. --- core_stats.h | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++ forward.c | 11 ++++-- parser/msg_parser.c | 4 +- parser/parse_uri.c | 4 +- receive.c | 13 ++++--- 5 files changed, 117 insertions(+), 14 deletions(-) diff --git a/core_stats.h b/core_stats.h new file mode 100644 index 0000000..729d73e --- /dev/null +++ b/core_stats.h @@ -0,0 +1,99 @@ +/* + * $Id$ + * + * Copyright (C) 2010 iptelorg GmbH + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/** macros used for various core statistics. + * (if USE_CORE_STATS is not defined they won't do anything) + * @file core_stats.h + * @ingroup core + */ +/* + * History: + * -------- + * 2010-02-01 initial version (andrei) +*/ + +#ifndef __core_stats_h +#define __core_stats_h + +/* define USE_CORE_STATS to enable statistics events + (SREV_CORE_STATS callbacks) */ +/*#define USE_CORE_STATS */ + +#ifndef USE_CORE_STATS + +#define STATS_REQ_FWD_DROP() +#define STATS_REQ_FWD_OK() +#define STATS_RPL_FWD_DROP() +#define STATS_RPL_FWD_OK() +#define STATS_BAD_MSG() +#define STATS_BAD_RPL() +#define STATS_BAD_URI() +#define STATS_BAD_MSG_HDR() + +#else /* USE_CORE_STATS */ + +#include "events.h" + +/** called each time a received request is dropped. + * The request might be dropped explicitly (e.g. pre script callback) + * or there might be an error while trying to forward it (e.g. send). + */ +#define STATS_REQ_FWD_DROP() sr_event_exec(SREV_CORE_STATS, (void*)3) + + +/** called each time forwarding a request succeeds (send).*/ +#define STATS_REQ_FWD_OK() sr_event_exec(SREV_CORE_STATS, (void*)1) + + +/** called each time forwarding a reply fails. + * The reply forwarding might fail due to send errors, + * pre script callbacks (module denying forwarding) or explicit script + * drop (drop or module function returning 0). + */ +#define STATS_RPL_FWD_DROP() sr_event_exec(SREV_CORE_STATS, (void*)4) + + +/* called each time forwarding a reply succeeds. */ +#define STATS_RPL_FWD_OK() sr_event_exec(SREV_CORE_STATS, (void*)2) + + +/** called each time a received request is too bad to process. + * For now it's called in case the message does not have any via. + */ +#define STATS_BAD_MSG() sr_event_exec(SREV_CORE_STATS, (void*)5) + + +/** called each time a received reply is too bad to process. + * For now it's called in case the message does not have any via. + */ +#define STATS_BAD_RPL() sr_event_exec(SREV_CORE_STATS, (void*)6) + + +/** called each time uri parsing fails. */ +#define STATS_BAD_URI() sr_event_exec(SREV_CORE_STATS, (void*)7) + + +/** called each time parsing some header fails. */ +#define STATS_BAD_MSG_HDR() sr_event_exec(SREV_CORE_STATS, (void*)8) + + + +#endif /* USE_CORE_STATS */ + +#endif /*__core_stats_h*/ + +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */ diff --git a/forward.c b/forward.c index 3a4fbf4..4b88780 100644 --- a/forward.c +++ b/forward.c @@ -94,6 +94,7 @@ #include "dst_blacklist.h" #endif #include "compiler_opt.h" +#include "core_stats.h" #ifdef DEBUG_DMALLOC #include <dmalloc.h> @@ -582,10 +583,12 @@ end: #endif if (buf) pkg_free(buf); /* received_buf & line_buf will be freed in receive_msg by free_lump_list*/ +#if defined STATS_REQ_FWD_OK || defined STATS_REQ_FWD_DROP if(ret==0) - sr_event_exec(SREV_CORE_STATS, (void*)1); + STATS_REQ_FWD_OK(); else - sr_event_exec(SREV_CORE_STATS, (void*)3); + STATS_REQ_FWD_DROP(); +#endif /* STATS_REQ_FWD_* */ return ret; } @@ -740,7 +743,7 @@ int forward_reply(struct sip_msg* msg) #endif if (msg_send(&dst, new_buf, new_len)<0) { - sr_event_exec(SREV_CORE_STATS, (void*)4); + STATS_RPL_FWD_DROP(); goto error; } #ifdef STATS @@ -751,7 +754,7 @@ int forward_reply(struct sip_msg* msg) msg->via2->host.len, msg->via2->host.s, (unsigned short) msg->via2->port); - sr_event_exec(SREV_CORE_STATS, (void*)2); + STATS_RPL_FWD_OK(); pkg_free(new_buf); skip: return 0; diff --git a/parser/msg_parser.c b/parser/msg_parser.c index 48f666c..1cb530c 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -54,7 +54,7 @@ #include "../data_lump_rpl.h" #include "../mem/mem.h" #include "../error.h" -#include "../events.h" +#include "../core_stats.h" #include "../globals.h" #include "parse_hname2.h" #include "parse_uri.h" @@ -279,7 +279,7 @@ char* get_hdr_field(char* buf, char* end, struct hdr_field* hdr) return tmp; error: DBG("get_hdr_field: error exit\n"); - sr_event_exec(SREV_CORE_STATS, (void*)8); + STATS_BAD_MSG_HDR(); hdr->type=HDR_ERROR_T; hdr->len=tmp-hdr->name.s; return tmp; diff --git a/parser/parse_uri.c b/parser/parse_uri.c index efcc54b..47cb1bc 100644 --- a/parser/parse_uri.c +++ b/parser/parse_uri.c @@ -50,7 +50,7 @@ #include "../ut.h" /* q_memchr */ /* #endif */ #include "../error.h" -#include "../events.h" +#include "../core_stats.h" /* buf= pointer to begining of uri (sip:x@foo.bar:5060;a=b?h=i) * len= len of uri @@ -1224,7 +1224,7 @@ error_bug: error_exit: ser_error=E_BAD_URI; uri->type=ERROR_URI_T; - sr_event_exec(SREV_CORE_STATS, (void*)7); + STATS_BAD_URI(); return E_BAD_URI; } diff --git a/receive.c b/receive.c index 60eefa7..2496e41 100644 --- a/receive.c +++ b/receive.c @@ -64,6 +64,7 @@ #include "tcp_server.h" /* for tcpconn_add_alias */ #include "tcp_options.h" /* for access to tcp_accept_aliases*/ #include "cfg/cfg.h" +#include "core_stats.h" #ifdef DEBUG_DMALLOC #include <mem/dmalloc.h> @@ -149,7 +150,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) if ((msg->via1==0) || (msg->via1->error!=PARSE_OK)){ /* no via, send back error ? */ LOG(L_ERR, "ERROR: receive_msg: no via found in request\n"); - sr_event_exec(SREV_CORE_STATS, (void*)5); + STATS_BAD_MSG(); goto error02; } /* check if necessary to add receive?->moved to forward_req */ @@ -184,7 +185,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) */ if (exec_pre_script_cb(msg, REQUEST_CB_TYPE)==0 ) { - sr_event_exec(SREV_CORE_STATS, (void*)3); + STATS_REQ_FWD_DROP(); goto end; /* drop the request */ } @@ -212,7 +213,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) if ((msg->via1==0) || (msg->via1->error!=PARSE_OK)){ /* no via, send back error ? */ LOG(L_ERR, "ERROR: receive_msg: no via found in reply\n"); - sr_event_exec(SREV_CORE_STATS, (void*)6); + STATS_BAD_RPL(); goto error02; } @@ -230,8 +231,8 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) */ if (exec_pre_script_cb(msg, ONREPLY_CB_TYPE)==0 ) { - sr_event_exec(SREV_CORE_STATS, (void*)4); - goto end; /* drop the request */ + STATS_RPL_FWD_DROP(); + goto end; /* drop the reply */ } /* exec the onreply routing script */ @@ -246,7 +247,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) }else #endif /* NO_ONREPLY_ROUTE_ERROR */ if (unlikely(ret==0 || (ctx.run_flags&DROP_R_F))){ - sr_event_exec(SREV_CORE_STATS, (void*)4); + STATS_RPL_FWD_DROP(); goto skip_send_reply; /* drop the message, no error */ } }

1 0

git:tmp/k3.0_sr_backports: update err_rpls statistics
by Andrei Pelinescu-Onciul 01 Feb '10

01 Feb '10

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: a3cdd3335977c8b9bd2e8225c3e8c9bc7f1b9cc8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a3cdd33… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Oct 23 16:04:21 2009 +0200 update err_rpls statistics (cherry picked from commit b542c1c71ed132e58d0d07d5ba66a241384ae6a2) --- receive.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/receive.c b/receive.c index 49c7c0b..ed75e0d 100644 --- a/receive.c +++ b/receive.c @@ -208,6 +208,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) if ((msg->via1==0) || (msg->via1->error!=PARSE_OK)){ /* no via, send back error ? */ LOG(L_ERR, "ERROR: receive_msg: no via found in reply\n"); + sr_event_exec(SREV_CORE_STATS, (void*)6); goto error02; }

1 0

git:tmp/k3.0_sr_backports: core: added new event SREV_CORE_STATS
by Andrei Pelinescu-Onciul 01 Feb '10

01 Feb '10

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: 13959998a2701a279db6396cd9aa6e7913cc0ec7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1395999… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Oct 13 20:47:35 2009 +0200 core: added new event SREV_CORE_STATS - to be used by Kamailio core statistics not included in stock SR core (cherry picked from commit 47c89177ce276cdf8f6a2d06fdd3359ba283fe4c) --- events.c | 12 ++++++++++++ events.h | 2 ++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/events.c b/events.c index 0d07395..be98221 100644 --- a/events.c +++ b/events.c @@ -48,6 +48,11 @@ int sr_event_register_cb(int type, sr_event_cb_f f) _sr_events_list.net_data_out = f; else return -1; break; + case SREV_CORE_STATS: + if(_sr_events_list.core_stats==0) + _sr_events_list.core_stats = f; + else return -1; + break; default: return -1; } @@ -91,6 +96,13 @@ int sr_event_exec(int type, void *data) return ret; } else return 1; break; + case SREV_CORE_STATS: + if(unlikely(_sr_events_list.core_stats!=0)) + { + ret = _sr_events_list.core_stats(data); + return ret; + } else return 1; + break; default: return -1; } diff --git a/events.h b/events.h index 9fda619..9af0d71 100644 --- a/events.h +++ b/events.h @@ -25,12 +25,14 @@ #define SREV_NET_DATA_IN 1 #define SREV_NET_DATA_OUT 2 +#define SREV_CORE_STATS 3 typedef int (*sr_event_cb_f)(void *data); typedef struct sr_event_cb { sr_event_cb_f net_data_in; sr_event_cb_f net_data_out; + sr_event_cb_f core_stats; } sr_event_cb_t; void sr_event_cb_init(void);

1 0

SF.net SVN: openser:[5971] branches/1.5/forward.c
by Marius Zbihlei 01 Feb '10

01 Feb '10

Revision: 5971 http://openser.svn.sourceforge.net/openser/?rev=5971&view=rev Author: mariuszbihlei Date: 2010-02-01 14:39:47 +0000 (Mon, 01 Feb 2010) Log Message: ----------- The mhomed implementation works by calling a socket()/connect()/getsockname()/close() to find out the interface in a multihomed system. Because mhomed works only for UDP sockets, a major performance improvement is shown if we use the same socket for multiple connects(possible for UDP sockets), thus completly removing the socket() call and the close() call.(well, except for the first time) The CPU load(user+system) shown in a mhomed environment on a stateless router, with a call rate of 6000 calls/s is 46.1% load in the case of this patched version, versus 63.54% load in the case of the original version. Modified Paths: -------------- branches/1.5/forward.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

new module: mtree
by Daniel-Constantin Mierla 01 Feb '10

01 Feb '10

Hello, the master branch got a new module named mtree. It is able to load database records in the form of (key,value) and index them in shared memory trees based on key. One db table is loaded in one mtree, you can define as many trees as you need. The typical use case is to load arbitrary data related to DIDs or prefixes, offering very fast lookup even with large number of records. The value can be string or digested in a runtime structure, so far being able to digest dstid:weight values, useful for prefix matching on weight rather than longest match. The trees are read only, with option to reload via mi command (rpc to be added soon). Online readme at: http://sip-router.org/docbook/sip-router/branch/master/modules/mtree/mtree.… Cheers, Daniel -- Daniel-Constantin Mierla eLearning class for Kamailio 3.0.0 Starting Feb 8, 2010 * http://www.asipto.com/

1 0

git:kamailio_3.0: uac(k): proper test for send failure
by Daniel-Constantin Mierla 01 Feb '10

01 Feb '10

Module: sip-router Branch: kamailio_3.0 Commit: 9600b1be5136f72d567a6b579abeb96cb5928fc7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9600b1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 24 21:20:02 2010 +0100 uac(k): proper test for send failure (cherry picked from commit 1479cd808ea8e5025bfa8400a257e3f89db4ab68) --- modules_k/uac/uac_send.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/uac/uac_send.c b/modules_k/uac/uac_send.c index 9a1f2b9..b77317d 100644 --- a/modules_k/uac/uac_send.c +++ b/modules_k/uac/uac_send.c @@ -398,7 +398,7 @@ int uac_req_send(struct sip_msg *msg, char *s1, char *s2) (_uac_req.s_ouri.len<=0)?NULL:&_uac_req.s_ouri /* outbound uri */ ); - if(ret!=0) + if(ret<0) return -1; return 1; }

1 0

git:kamailio_3.0: uac(k): use header types for detection
by Daniel-Constantin Mierla 01 Feb '10

01 Feb '10

Module: sip-router Branch: kamailio_3.0 Commit: 369d7598244c60c2c8e4d601e166a03cb211128c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=369d759… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 24 21:21:59 2010 +0100 uac(k): use header types for detection --- modules_k/uac/auth.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_k/uac/auth.c b/modules_k/uac/auth.c index 78f51d5..0fb3e25 100644 --- a/modules_k/uac/auth.c +++ b/modules_k/uac/auth.c @@ -232,9 +232,9 @@ static inline struct hdr_field *get_autenticate_hdr(struct sip_msg *rpl, } for( hdr=rpl->headers ; hdr ; hdr=hdr->next ) { - if((rpl_code==WWW_AUTH_CODE && hdr->type==HDR_WWW_AUTHENTICATE_T) - || (rpl_code==PROXY_AUTH_CODE - && hdr->type==HDR_PROXY_AUTHENTICATE_T)) + if ( rpl_code==WWW_AUTH_CODE && hdr->type==HDR_WWW_AUTHENTICATE_T ) + return hdr; + if ( rpl_code==PROXY_AUTH_CODE && hdr->type==HDR_PROXY_AUTHENTICATE_T ) return hdr; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev