sr-dev February 2010

sr-dev@lists.kamailio.org

31 participants
250 discussions

git:master: Makefile:modules fixed usage of -jN flag for modules(_k, _s)

by Marius Zbihlei

Module: sip-router Branch: master Commit: 329e20e2a88b08f6c092d6db014a6a7f9ea67bb6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=329e20e… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Feb 4 15:06:54 2010 +0200 Makefile:modules fixed usage of -jN flag for modules(_k,_s) Removed the @for construct (launched a new shell) with a @foreach construct which does a textual expansion of the block in question (loop unrolling) --- Makefile | 12 +----------- Makefile.rules | 10 ++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index b6dc645..272cff3 100644 --- a/Makefile +++ b/Makefile @@ -603,17 +603,7 @@ $(1)_target=$(prefix)/$(modules_dir)$(1) .PHONY: $(1) $(1): modules.lst - @for r in $($(1)) "" ; do \ - if [ -n "$$$$r" -a -r "$$$$r/Makefile" ]; then \ - $(call oecho, "" ;) \ - $(call oecho, "" ;) \ - if $(MAKE) -C $$$$r $$(mk_params) || [ ${err_fail} != 1 ] ; then \ - :; \ - else \ - exit 1; \ - fi ; \ - fi ; \ - done; true + @$(foreach r,$($(1)),$(call module_make,$(r),$(mk_params))) .PHONY: $(1)-doc $(1)-doc: modules.lst diff --git a/Makefile.rules b/Makefile.rules index e2ba439..7b46ef3 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -76,6 +76,16 @@ quiet=verbose oecho=echo $(1) endif +module_make= if [ -n "$(1)" -a -r "$(1)/Makefile" ]; then \ + $(call oecho, "" ;) \ + $(call oecho, "" ;) \ + if $$(MAKE) -C $(1) $(2) || [ ${err_fail} != 1 ] ; then \ + :; \ + else \ + exit 1; \ + fi ; \ + fi ; + quote:= " escall= $(subst $$,\$$,$(subst $(quote),\$(quote),$1)) exec_cmd= $(if $($(quiet)_cmd_$(1)),\

14 years, 10 months

new: interactive debugger for config

by Daniel-Constantin Mierla

Hello, the new debugger module can be used to do runtime debugging of SIP Router config file, in similar manner of gdb. The module is controlled via the RPC interface, therefore investigation can be done from a remote site. That makes it very handy to use with sercmd as well. One features is to print a log message for each action executed in the config for a SIP message, showing the execution path. The option can be enabled/disabled per process. The other one is step by step execution of config file. When a SIP message message comes it, SIP Router process will stop at first action and wait for commands, like: execute the action, evaluate a pseduo-variable, print to syslog a pseudo-variable, remove the breakpoints and continue execution without interruption, ... See the readme for more: http://sip-router.org/docbook/sip-router/branch/master/modules/debugger/deb… It is still some stuff to complete, some known issues to remove, but the module is usable and may help some of you to troubleshoot migrations from older versions to 3.0 (use master branch until your config is updated and running fine, then use it with stable 3.0). Hope is going to be useful and waiting for feedback to improve. Of course, contributions are most welcome! Cheers, Daniel -- Daniel-Constantin Mierla eLearning class for Kamailio 3.0.0 Starting Feb 8, 2010 * http://www.asipto.com/

14 years, 10 months

git:master: debugger: new module for interactive cfg debugging

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: bb7dceb00c840b195e986333180bbd7b5c9e7f12 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bb7dceb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Feb 4 00:11:59 2010 +0100 debugger: new module for interactive cfg debugging - print config execution path of a SIP message to logs - interactive debugging for config, similar to gdb - step-by-step execution of each action in the config file - the SIP router process stops at cfg actions and waits for RPC commands to go to next one, evaluate a pseudo-variable, continue execution, etc. - see README for more details --- modules/debugger/Makefile | 12 + modules/debugger/README | 325 +++++++++++++ modules/debugger/debugger_api.c | 786 +++++++++++++++++++++++++++++++ modules/debugger/debugger_api.h | 37 ++ modules/debugger/debugger_mod.c | 140 ++++++ modules/debugger/doc/Makefile | 4 + modules/debugger/doc/debugger.xml | 36 ++ modules/debugger/doc/debugger_admin.xml | 400 ++++++++++++++++ 8 files changed, 1740 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=bb7…

14 years, 10 months

git:master: debugger: removed completed task from to-do

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: c4505aab3b2a945de126b617902382554837df3a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c4505aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Feb 4 20:50:36 2010 +0100 debugger: removed completed task from to-do - fixed the description of inner command for dbg.bp --- modules/debugger/README | 8 ++------ modules/debugger/doc/debugger_admin.xml | 12 ++---------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/modules/debugger/README b/modules/debugger/README index 4b4149f..e0b8a1f 100644 --- a/modules/debugger/README +++ b/modules/debugger/README @@ -282,8 +282,8 @@ if($si=="10.0.0.10") Name: dbg.bp Parameters: - * _cmd_ : inner command can be 'on' or 'off' to enable or disable the - tracing for one or all processe. + * _cmd_ : inner command, see next section for the list of available + values. * _pid_ : pid for which to apply the inner command. If it missing, then will be applied for all processes. * _params_ : extra params specific for each inner command. @@ -393,10 +393,6 @@ sercmd> dbg.bp move 10481 7. To-do The 'MUSTS' and ideas of what can be done: - * many internal parameters not yet exported to cfg: log level for - printed messages, log facility, sleep time while waiting at - breakpoint, number of iterations to wait for response from SIP - router process ... they are now global variables inside module. * Complete breakpoint setting and usage on specific lines. * Make the output more human friendly - text can be used instead of integer values for some fields such as state. Also, for some diff --git a/modules/debugger/doc/debugger_admin.xml b/modules/debugger/doc/debugger_admin.xml index c65851e..b774bdf 100644 --- a/modules/debugger/doc/debugger_admin.xml +++ b/modules/debugger/doc/debugger_admin.xml @@ -317,8 +317,8 @@ if($si=="10.0.0.10") </para> <para>Parameters:</para> <itemizedlist> - <listitem><para>_cmd_ : inner command can be 'on' or 'off' to - enable or disable the tracing for one or all processe.</para> + <listitem><para>_cmd_ : inner command, see next section for + the list of available values.</para> </listitem> <listitem><para>_pid_ : pid for which to apply the inner command. If it missing, then will be applied for all processes.</para> @@ -477,14 +477,6 @@ sercmd> dbg.bp move 10481 </para> <itemizedlist> <listitem> - <para>many internal parameters not yet exported to cfg: - log level for printed messages, log facility, sleep time while - waiting at breakpoint, number of iterations to wait for response - from SIP router process ... they are now global variables inside - module. - </para> - </listitem> - <listitem> <para> Complete breakpoint setting and usage on specific lines. </para>

14 years, 10 months

git:master: debugger: more parameters exported to cfg

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 8412526a4e638b8d72f5d718191bd3122c10cf95 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8412526… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Feb 4 20:36:34 2010 +0100 debugger: more parameters exported to cfg --- modules/debugger/README | 83 +++++++++++++++++++++++- modules/debugger/debugger_mod.c | 26 ++++++++ modules/debugger/doc/debugger_admin.xml | 106 ++++++++++++++++++++++++++++++- 3 files changed, 212 insertions(+), 3 deletions(-) diff --git a/modules/debugger/README b/modules/debugger/README index ecd5b3e..4b4149f 100644 --- a/modules/debugger/README +++ b/modules/debugger/README @@ -27,6 +27,11 @@ Daniel-Constantin Mierla 3.1. cfgtrace (int) 3.2. breakpoint (int) + 3.3. log_level (int) + 3.4. log_facility (str) + 3.5. log_prefix (str) + 3.6. step_usleep (int) + 3.7. step_loops (int) 4. Exported Functions @@ -45,7 +50,12 @@ Daniel-Constantin Mierla 1.1. Set cfgtrace parameter 1.2. Set breakpoint parameter - 1.3. mt_match usage + 1.3. Set log_level parameter + 1.4. Set log_facility parameter + 1.5. Set log_prefix parameter + 1.6. Set step_usleep parameter + 1.7. Set step_loops parameter + 1.8. dbg_breakpoint usage Chapter 1. Admin Guide @@ -61,6 +71,11 @@ Chapter 1. Admin Guide 3.1. cfgtrace (int) 3.2. breakpoint (int) + 3.3. log_level (int) + 3.4. log_facility (str) + 3.5. log_prefix (str) + 3.6. step_usleep (int) + 3.7. step_loops (int) 4. Exported Functions @@ -117,6 +132,11 @@ Chapter 1. Admin Guide 3.1. cfgtrace (int) 3.2. breakpoint (int) + 3.3. log_level (int) + 3.4. log_facility (str) + 3.5. log_prefix (str) + 3.6. step_usleep (int) + 3.7. step_loops (int) 3.1. cfgtrace (int) @@ -141,6 +161,65 @@ modparam("debugger", "cfgtrace", 1) modparam("debugger", "breakpoint", 1) ... +3.3. log_level (int) + + What log level to be used to print module specific messages. + + Default value is "-1" (L_ERR). + + Example 1.3. Set log_level parameter +... +modparam("debugger", "log_level", 1) +... + +3.4. log_facility (str) + + What log facility to be used to print module specific messages. + + Default value is "NULL" (default from core). + + Example 1.4. Set log_facility parameter +... +modparam("debugger", "log_facility", "LOG_DAEMON") +... + +3.5. log_prefix (str) + + String to print before any module specific messages. + + Default value is "*** cfgtrace:". + + Example 1.5. Set log_prefix parameter +... +modparam("debugger", "log_prefix", "from-debugger-with-love:") +... + +3.6. step_usleep (int) + + Microseconds to sleep before checking for new commands when waiting at + breakpoint + + Default value is "100000" (that is 0.1sec). + + Example 1.6. Set step_usleep parameter +... +modparam("debugger", "step_usleep", 500000) +... + +3.7. step_loops (int) + + How many sleeps of 'step_usleep' the RPC process performs when waiting + for a reply from worker process before responding to RPC. This avoids + blocking RPC process for ever in case the worker process 'forgets' to + write back a reply. + + Default value is "200". + + Example 1.7. Set step_loops parameter +... +modparam("debugger", "step_loops", 100) +... + 4. Exported Functions 4.1. dbg_breakpoint(mode) @@ -153,7 +232,7 @@ modparam("debugger", "breakpoint", 1) Note that this version does not export this anchors to RPC for interactive debugging (temporary disabled). - Example 1.3. mt_match usage + Example 1.8. dbg_breakpoint usage ... if($si=="10.0.0.10") dbg_breakpoint("1"); diff --git a/modules/debugger/debugger_mod.c b/modules/debugger/debugger_mod.c index 326a75f..e0fa8f2 100644 --- a/modules/debugger/debugger_mod.c +++ b/modules/debugger/debugger_mod.c @@ -45,8 +45,16 @@ static void mod_destroy(void); static int w_dbg_breakpoint(struct sip_msg* msg, char* point, char* str2); static int fixup_dbg_breakpoint(void** param, int param_no); +/* parameters */ extern int _dbg_cfgtrace; extern int _dbg_breakpoint; +extern int _dbg_cfgtrace_level; +extern int _dbg_cfgtrace_facility; +extern char *_dbg_cfgtrace_prefix; +extern int _dbg_step_usleep; +extern int _dbg_step_loops; + +static char * _dbg_cfgtrace_facility_str = 0; static cmd_export_t cmds[]={ {"dbg_breakpoint", (cmd_function)w_dbg_breakpoint, 1, @@ -57,6 +65,11 @@ static cmd_export_t cmds[]={ static param_export_t params[]={ {"cfgtrace", INT_PARAM, &_dbg_cfgtrace}, {"breakpoint", INT_PARAM, &_dbg_breakpoint}, + {"log_level", INT_PARAM, &_dbg_cfgtrace_level}, + {"log_facility", STR_PARAM, &_dbg_cfgtrace_facility_str}, + {"log_prefix", STR_PARAM, &_dbg_cfgtrace_prefix}, + {"step_usleep", INT_PARAM, &_dbg_step_usleep}, + {"step_loops", INT_PARAM, &_dbg_step_loops}, {0, 0, 0} }; @@ -81,6 +94,19 @@ struct module_exports exports = { */ static int mod_init(void) { + int fl; + if (_dbg_cfgtrace_facility_str!=NULL) + { + fl = str2facility(_dbg_cfgtrace_facility_str); + if (fl != -1) + { + _dbg_cfgtrace_facility = fl; + } else { + LM_ERR("invalid log facility configured"); + return -1; + } + } + if(dbg_init_rpc()!=0) { LM_ERR("failed to register RPC commands\n"); diff --git a/modules/debugger/doc/debugger_admin.xml b/modules/debugger/doc/debugger_admin.xml index e812aba..c65851e 100644 --- a/modules/debugger/doc/debugger_admin.xml +++ b/modules/debugger/doc/debugger_admin.xml @@ -115,6 +115,110 @@ modparam("debugger", "breakpoint", 1) </example> </section> + <section> + <title><varname>log_level</varname> (int)</title> + <para> + What log level to be used to print module specific messages. + </para> + <para> + <emphasis> + Default value is <quote>-1</quote> (L_ERR). + </emphasis> + </para> + <example> + <title>Set <varname>log_level</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("debugger", "log_level", 1) +... +</programlisting> + </example> + </section> + + <section> + <title><varname>log_facility</varname> (str)</title> + <para> + What log facility to be used to print module specific messages. + </para> + <para> + <emphasis> + Default value is <quote>NULL</quote> (default from core). + </emphasis> + </para> + <example> + <title>Set <varname>log_facility</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("debugger", "log_facility", "LOG_DAEMON") +... +</programlisting> + </example> + </section> + + <section> + <title><varname>log_prefix</varname> (str)</title> + <para> + String to print before any module specific messages. + </para> + <para> + <emphasis> + Default value is <quote>*** cfgtrace:</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>log_prefix</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("debugger", "log_prefix", "from-debugger-with-love:") +... +</programlisting> + </example> + </section> + + <section> + <title><varname>step_usleep</varname> (int)</title> + <para> + Microseconds to sleep before checking for new commands when + waiting at breakpoint + </para> + <para> + <emphasis> + Default value is <quote>100000</quote> (that is 0.1sec). + </emphasis> + </para> + <example> + <title>Set <varname>step_usleep</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("debugger", "step_usleep", 500000) +... +</programlisting> + </example> + </section> + + <section> + <title><varname>step_loops</varname> (int)</title> + <para> + How many sleeps of 'step_usleep' the RPC process performs when + waiting for a reply from worker process before responding to RPC. + This avoids blocking RPC process for ever in case the worker + process 'forgets' to write back a reply. + </para> + <para> + <emphasis> + Default value is <quote>200</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>step_loops</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("debugger", "step_loops", 100) +... +</programlisting> + </example> + </section> + </section> <section> @@ -132,7 +236,7 @@ modparam("debugger", "breakpoint", 1) interactive debugging (temporary disabled). </para> <example> - <title><function>mt_match</function> usage</title> + <title><function>dbg_breakpoint</function> usage</title> <programlisting format="linespecific"> ... if($si=="10.0.0.10")

14 years, 10 months

new module: mqueue

by Elena-Ramona Modroiu

Hi, few details about the new module mqueue. It provides a generic message queue for SIP Router inter process communication. Items in the queue are pairs of (key, value), both string. The items are consumed in the order they were added in the queue (first in first out). More details at: http://sip-router.org/docbook/sip-router/branch/master/modules/mqueue/mqueu… http://sip-router.org/wiki/cookbooks/pseudo-variables/devel#mqueue_module_p… The module is handy to use for time consuming and/or blocking operations (eg, email notifications). Not to hold the SIP worker process, you can add an item in a queue that is going to be consumed by another process (like timer processes created via rtimer module). Best regards, Ramona

14 years, 10 months

git:master: core: unlikely() to test ev SREV_CFG_RUN_ACTION

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 5c679ad10a1c73d267101277ea53d52db05abbb2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5c679ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Feb 4 12:30:47 2010 +0100 core: unlikely() to test ev SREV_CFG_RUN_ACTION - test if the event is enabled before creating the parameter and executing the callback --- action.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/action.c b/action.c index e58484b..2542a9c 100644 --- a/action.c +++ b/action.c @@ -144,9 +144,12 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ser_error=E_UNSPEC; /* hook for every executed action (in use by cfg debugger) */ - srevp[0] = (void*)a; - srevp[1] = (void*)msg; - sr_event_exec(SREV_CFG_RUN_ACTION, (void*)srevp); + if(unlikely(sr_event_enabled(SREV_CFG_RUN_ACTION))) + { + srevp[0] = (void*)a; + srevp[1] = (void*)msg; + sr_event_exec(SREV_CFG_RUN_ACTION, (void*)srevp); + } ret=E_BUG; switch ((unsigned char)a->type){

14 years, 10 months

git:master: Makefile: core stats enabled for kamailio flavor

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 1010c358252d73deadbcc37380d7cb5527aeff35 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1010c35… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Feb 4 13:02:11 2010 +0100 Makefile: core stats enabled for kamailio flavor --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index a015244..556883e 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -654,7 +654,7 @@ ifeq ($(TLS_HOOKS), 1) C_DEFS+= -DUSE_TLS -DTLS_HOOKS endif ifeq ($(KMSTATS), 1) - C_DEFS+= -DSTATISTICS + C_DEFS+= -DUSE_CORE_STATS -DSTATISTICS endif ifeq ($(FMSTATS), 1) C_DEFS+= -DMALLOC_STATS

14 years, 10 months

git:master: core: events: new function to test event enabled

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 2ac66302b0d4dd02d03c17ce89d2dc3a880c928d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2ac6630… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Feb 4 12:26:30 2010 +0100 core: events: new function to test event enabled - sr_event_enabled(type) returns true if a callback has been registered for respective event type --- events.c | 15 +++++++++++++++ events.h | 1 + 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/events.c b/events.c index f2be3ad..61abc5f 100644 --- a/events.c +++ b/events.c @@ -126,3 +126,18 @@ int sr_event_exec(int type, void *data) } } +int sr_event_enabled(int type) +{ + switch(type) { + case SREV_NET_DATA_IN: + return (_sr_events_list.net_data_in!=0)?1:0; + case SREV_NET_DATA_OUT: + return (_sr_events_list.net_data_out!=0)?1:0; + case SREV_CORE_STATS: + return (_sr_events_list.core_stats!=0)?1:0; + case SREV_CFG_RUN_ACTION: + return (_sr_events_list.run_action!=0)?1:0; + } + return 0; +} + diff --git a/events.h b/events.h index 5c7238a..6f79070 100644 --- a/events.h +++ b/events.h @@ -40,5 +40,6 @@ typedef struct sr_event_cb { void sr_event_cb_init(void); int sr_event_register_cb(int type, sr_event_cb_f f); int sr_event_exec(int type, void *data); +int sr_event_enabled(int type); #endif

14 years, 10 months

git:master: mqueue: fixed c&p errors in docs

by Elena-Ramona Modroiu

Module: sip-router Branch: master Commit: 8ee09afb89aafac3c39989059e316324441c9843 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8ee09af… Author: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Committer: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Date: Thu Feb 4 12:57:02 2010 +0100 mqueue: fixed c&p errors in docs --- modules/mqueue/README | 69 ++++++++++++++++++++++++----------- modules/mqueue/doc/mqueue_admin.xml | 4 +- 2 files changed, 50 insertions(+), 23 deletions(-) diff --git a/modules/mqueue/README b/modules/mqueue/README index 5cf2aea..4c439a4 100644 --- a/modules/mqueue/README +++ b/modules/mqueue/README @@ -17,21 +17,21 @@ Elena-Ramona Modroiu 1. Admin Guide - 1.1. Overview - 1.2. Dependencies + 1. Overview + 2. Dependencies - 1.2.1. Kamailio Modules - 1.2.2. External Libraries or Applications + 2.1. Kamailio Modules + 2.2. External Libraries or Applications - 1.3. Exported Parameters + 3. Exported Parameters - 1.3.1. mqueue (string) + 3.1. mqueue (string) - 1.4. Exported Functions + 4. Exported Functions - 1.4.1. mq_add(queue, key, value) - 1.4.2. mq_fetch(queue) - 1.4.3. mq_pv(queue) + 4.1. mq_add(queue, key, value) + 4.2. mq_fetch(queue) + 4.3. mq_pv_free(queue) List of Examples @@ -42,7 +42,25 @@ Elena-Ramona Modroiu Chapter 1. Admin Guide -1.1. Overview + Table of Contents + + 1. Overview + 2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + + 3. Exported Parameters + + 3.1. mqueue (string) + + 4. Exported Functions + + 4.1. mq_add(queue, key, value) + 4.2. mq_fetch(queue) + 4.3. mq_pv_free(queue) + +1. Overview This module offers generic message queue system in shared memory for inter-process communication via config file. One example of usage is to @@ -52,22 +70,27 @@ Chapter 1. Admin Guide There can be defined many queues, access to values being done via pseudo variables. -1.2. Dependencies +2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications -1.2.1. Kamailio Modules +2.1. Kamailio Modules The following modules must be loaded before this module: * None. -1.2.2. External Libraries or Applications +2.2. External Libraries or Applications The following libraries or applications must be installed before running Kamailio with this module loaded: * None. -1.3. Exported Parameters +3. Exported Parameters -1.3.1. mqueue (string) + 3.1. mqueue (string) + +3.1. mqueue (string) Definition of memory queue @@ -87,9 +110,13 @@ modparam("mqueue", "mqueue", "name=myq;size=20;") modparam("mqueue", "mqueue", "name=qaz") ... -1.4. Exported Functions +4. Exported Functions + + 4.1. mq_add(queue, key, value) + 4.2. mq_fetch(queue) + 4.3. mq_pv_free(queue) -1.4.1. mq_add(queue, key, value) +4.1. mq_add(queue, key, value) Add a new item (key, value) in the queue. If max size of queue is exceeded, the oldest one is removed. @@ -99,20 +126,20 @@ modparam("mqueue", "mqueue", "name=qaz") mq_add("myq", "$rU", "call from $fU"); ... -1.4.2. mq_fetch(queue) +4.2. mq_fetch(queue) Take oldest item from que and fill $mqk(queue) and $mqv(queue) pseudo variables. Return true on success. Example 1.3. mq_fetch usage ... -while(mq_add("myq")) +while(mq_fetch("myq")) { xlog("$mqk(myq) - $mqv(myq)\n"); } ... -1.4.3. mq_pv(queue) +4.3. mq_pv_free(queue) Free the item fetched in pseudo-variables. It is optional, a new fetch frees the old values. diff --git a/modules/mqueue/doc/mqueue_admin.xml b/modules/mqueue/doc/mqueue_admin.xml index 1cf3eda..e02ca38 100644 --- a/modules/mqueue/doc/mqueue_admin.xml +++ b/modules/mqueue/doc/mqueue_admin.xml @@ -125,7 +125,7 @@ mq_add("myq", "$rU", "call from $fU"); <title><function>mq_fetch</function> usage</title> <programlisting format="linespecific"> ... -while(mq_add("myq")) +while(mq_fetch("myq")) { xlog("$mqk(myq) - $mqv(myq)\n"); } @@ -136,7 +136,7 @@ while(mq_add("myq")) <section> <title> - <function moreinfo="none">mq_pv(queue)</function> + <function moreinfo="none">mq_pv_free(queue)</function> </title> <para> Free the item fetched in pseudo-variables. It is optional, a new fetch

14 years, 10 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2010