sr-dev April 2012

sr-dev@lists.kamailio.org

29 participants
347 discussions

git:master: core: Move parse_via_header to correct place.
by Andreas Granig 19 Apr '12

19 Apr '12

Module: sip-router Branch: master Commit: a075952dd0970b3ab5f7e403c88f954c2743ce80 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a075952… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Andreas Granig <agranig(a)sipwise.com> Date: Thu Apr 19 17:38:29 2012 +0200 core: Move parse_via_header to correct place. - Move parse_via_header(...) from select_core to parser to avoid compiler warnings when accessing it from modules. --- parser/… [View More]parse_via.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++ parser/parse_via.h | 8 +++++++ select_core.c | 54 -------------------------------------------------- 3 files changed, 64 insertions(+), 54 deletions(-) diff --git a/parser/parse_via.c b/parser/parse_via.c index 5c54e09..1ed1004 100644 --- a/parser/parse_via.c +++ b/parser/parse_via.c @@ -68,6 +68,7 @@ #include "../ip_addr.h" #include "parse_via.h" #include "parse_def.h" +#include "msg_parser.h" @@ -2662,3 +2663,58 @@ void free_via_list(struct via_body* vb) pkg_free(foo); } } + +int parse_via_header( struct sip_msg *msg, int n, struct via_body** q) +{ + struct hdr_field *p; + struct via_body *pp = NULL; + int i; + + switch (n) { + case 1: + case 2: + if (!msg->h_via1 && (parse_headers(msg,HDR_VIA_F,0)==-1 || !msg->h_via1)) { + DBG("bad msg or missing VIA1 header \n"); + return -1; + } + pp = msg->h_via1->parsed; + if (n==1) break; + pp = pp->next; + if (pp) break; + + if (!msg->h_via2 && (parse_headers(msg,HDR_VIA2_F,0)==-1 || !msg->h_via2)) { + DBG("bad msg or missing VIA2 header \n"); + return -1; + } + pp = msg->h_via2->parsed; + break; + default: + if (!msg->eoh && (parse_headers(msg,HDR_EOH_F,0)==-1 || !msg->eoh)) { + ERR("bad msg while parsing to EOH \n"); + return -1; + } + p = msg->h_via1; + i = n; + while (i && p) { + if (p->type == HDR_VIA_T) { + i--; + pp = p->parsed; + while (i && (pp->next)) { + i--; + pp = pp->next; + } + } + p = p->next; + } + if (i > 0) { + DBG("missing VIA[%d] header\n", n); + return -1; + } + } + if (pp) { + *q = pp; + return 0; + } else + return -1; +} + diff --git a/parser/parse_via.h b/parser/parse_via.h index 9f899a0..5c7f3c1 100644 --- a/parser/parse_via.h +++ b/parser/parse_via.h @@ -48,6 +48,8 @@ #include "../str.h" +struct sip_msg; + /* via param types * WARNING: keep in sync with parse_via.c FIN_HIDDEN... * and with tm/sip_msg.c via_body_cloner @@ -124,4 +126,10 @@ char* parse_via(char* buffer, char* end, struct via_body *vb); void free_via_list(struct via_body *vb); +/* + * Get one Via header + */ +int parse_via_header( struct sip_msg *msg, int n, struct via_body** q); + + #endif /* PARSE_VIA_H */ diff --git a/select_core.c b/select_core.c index ea9d5a1..94fa162 100644 --- a/select_core.c +++ b/select_core.c @@ -332,60 +332,6 @@ int select_contact_params(str* res, select_t* s, struct sip_msg* msg) return 1; } -int parse_via_header( struct sip_msg *msg, int n, struct via_body** q) -{ - struct hdr_field *p; - struct via_body *pp = NULL; - int i; - - switch (n) { - case 1: - case 2: - if (!msg->h_via1 && (parse_headers(msg,HDR_VIA_F,0)==-1 || !msg->h_via1)) { - DBG("bad msg or missing VIA1 header \n"); - return -1; - } - pp = msg->h_via1->parsed; - if (n==1) break; - pp = pp->next; - if (pp) break; - - if (!msg->h_via2 && (parse_headers(msg,HDR_VIA2_F,0)==-1 || !msg->h_via2)) { - DBG("bad msg or missing VIA2 header \n"); - return -1; - } - pp = msg->h_via2->parsed; - break; - default: - if (!msg->eoh && (parse_headers(msg,HDR_EOH_F,0)==-1 || !msg->eoh)) { - ERR("bad msg while parsing to EOH \n"); - return -1; - } - p = msg->h_via1; - i = n; - while (i && p) { - if (p->type == HDR_VIA_T) { - i--; - pp = p->parsed; - while (i && (pp->next)) { - i--; - pp = pp->next; - } - } - p = p->next; - } - if (i > 0) { - DBG("missing VIA[%d] header\n", n); - return -1; - } - } - if (pp) { - *q = pp; - return 0; - } else - return -1; -} - int select_via(str* res, select_t* s, struct sip_msg* msg) { struct via_body *p = NULL; [View Less]

1 0

Request for new Developer
by Andreas Granig 19 Apr '12

19 Apr '12

Hi, I'd like to give Richard Fuchs (rfuchs(a)sipwise.com) write access to git. He used to implement couple of things (e.g. period handling of timerec module beside others) already, and I commited it for him, but that's a bit unpractical. Any objections to it? Who needs which infos to grant him access? Thanks, Andreas

2 1

git:3.2: ChangeLog: updated for version 3.2.3
by Daniel-Constantin Mierla 19 Apr '12

19 Apr '12

Module: sip-router Branch: 3.2 Commit: 59f87e206e4a80ccbd2bc2ad3fb8b87208d85dea URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=59f87e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 19 14:06:51 2012 +0200 ChangeLog: updated for version 3.2.3 --- ChangeLog | 339 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 339 insertions(+), 0 … [View More]

1 0

git:3.2: Makefile: version set to 3.2.3
by Daniel-Constantin Mierla 19 Apr '12

19 Apr '12

Module: sip-router Branch: 3.2 Commit: 6c23e85e017efefa2750ac108fdefe86aafba010 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6c23e85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 19 14:02:43 2012 +0200 Makefile: version set to 3.2.3 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index … [View More]

1 0

git:3.2: pkg/debs: version set to 3.2.3 for kamailio deb specs
by Daniel-Constantin Mierla 19 Apr '12

19 Apr '12

Module: sip-router Branch: 3.2 Commit: d6d9b11c7542e986e63b1ce7088ac298aa72f4a7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d6d9b11… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 19 13:11:09 2012 +0200 pkg/debs: version set to 3.2.3 for kamailio deb specs --- pkg/kamailio/deb/debian/changelog | 6 ++++++ pkg/kamailio/deb/lenny/changelog | 6 ++++++ pkg/… [View More]kamailio/deb/lucid/changelog | 6 ++++++ pkg/kamailio/deb/squeeze/changelog | 6 ++++++ pkg/kamailio/deb/wheezy/changelog | 6 ++++++ 5 files changed, 30 insertions(+), 0 deletions(-) diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index 81c2151..057365f 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (3.2.3) unstable; urgency=low + + * update to 3.2.3 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 19 Apr 2012 12:38:30 +0100 + kamailio (3.2.2) unstable; urgency=low * update to 3.2.2 from upstream diff --git a/pkg/kamailio/deb/lenny/changelog b/pkg/kamailio/deb/lenny/changelog index 81c2151..057365f 100644 --- a/pkg/kamailio/deb/lenny/changelog +++ b/pkg/kamailio/deb/lenny/changelog @@ -1,3 +1,9 @@ +kamailio (3.2.3) unstable; urgency=low + + * update to 3.2.3 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 19 Apr 2012 12:38:30 +0100 + kamailio (3.2.2) unstable; urgency=low * update to 3.2.2 from upstream diff --git a/pkg/kamailio/deb/lucid/changelog b/pkg/kamailio/deb/lucid/changelog index 81c2151..057365f 100644 --- a/pkg/kamailio/deb/lucid/changelog +++ b/pkg/kamailio/deb/lucid/changelog @@ -1,3 +1,9 @@ +kamailio (3.2.3) unstable; urgency=low + + * update to 3.2.3 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 19 Apr 2012 12:38:30 +0100 + kamailio (3.2.2) unstable; urgency=low * update to 3.2.2 from upstream diff --git a/pkg/kamailio/deb/squeeze/changelog b/pkg/kamailio/deb/squeeze/changelog index 81c2151..057365f 100644 --- a/pkg/kamailio/deb/squeeze/changelog +++ b/pkg/kamailio/deb/squeeze/changelog @@ -1,3 +1,9 @@ +kamailio (3.2.3) unstable; urgency=low + + * update to 3.2.3 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 19 Apr 2012 12:38:30 +0100 + kamailio (3.2.2) unstable; urgency=low * update to 3.2.2 from upstream diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index 81c2151..057365f 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (3.2.3) unstable; urgency=low + + * update to 3.2.3 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 19 Apr 2012 12:38:30 +0100 + kamailio (3.2.2) unstable; urgency=low * update to 3.2.2 from upstream [View Less]

1 0

git:3.2: pkg/rpm: version set to 3.2.3 for kamailio specs
by Daniel-Constantin Mierla 19 Apr '12

19 Apr '12

Module: sip-router Branch: 3.2 Commit: d74ead88bf9b600279e032032f52f580d7bcf42c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d74ead8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 19 13:07:41 2012 +0200 pkg/rpm: version set to 3.2.3 for kamailio specs --- pkg/kamailio/rpm/kamailio.spec-4.1 | 2 +- pkg/kamailio/rpm/kamailio.spec.CenOS | 2 +- pkg/kamailio/rpm/… [View More]

1 0

gruu lookup question
by Juha Heinanen 19 Apr '12

19 Apr '12

when lookup() is called on in-dialog request that includes gruu in its request uri, is $du set based on received field of location table if the field is not null? -- juha

2 5

git:master: usrloc(k): option to start own timer processes
by Daniel-Constantin Mierla 19 Apr '12

19 Apr '12

Module: sip-router Branch: master Commit: c642e5049b8b5a5d3209b8d295207831512160ed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c642e50… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 19 10:53:49 2012 +0200 usrloc(k): option to start own timer processes - new parameter timer_procs - default is 0, meaning the core timer process is used (like so far) - if >0, a number … [View More]of basic sync timers are started - each own timer will take care of syncronizing the usrloc records, selecting specific slots in the internal hash table (load balancing mechanism) - this mode is useful for handling lot of usrloc records --- modules_k/usrloc/README | 18 ++++++++++++++ modules_k/usrloc/dlist.c | 4 +- modules_k/usrloc/dlist.h | 2 +- modules_k/usrloc/doc/usrloc_admin.xml | 23 ++++++++++++++++++ modules_k/usrloc/udomain.c | 4 +- modules_k/usrloc/udomain.h | 4 ++- modules_k/usrloc/ul_mi.c | 2 +- modules_k/usrloc/ul_mod.c | 42 ++++++++++++++++++++++++++++---- 8 files changed, 86 insertions(+), 13 deletions(-) diff --git a/modules_k/usrloc/README b/modules_k/usrloc/README index e89392f..06094af 100644 --- a/modules_k/usrloc/README +++ b/modules_k/usrloc/README @@ -64,6 +64,7 @@ Bogdan-Andrei Iancu 3.26. hash_size (integer) 3.27. preload (string) 3.28. db_update_as_insert (string) + 3.29. timer_procs (string) 4. Functions 5. MI Commands @@ -136,6 +137,7 @@ Bogdan-Andrei Iancu 1.26. Set hash_size parameter 1.27. Set preload parameter 1.28. Set db_update_as_insert parameter + 1.29. Set timer_procs parameter Chapter 1. Admin Guide @@ -180,6 +182,7 @@ Chapter 1. Admin Guide 3.26. hash_size (integer) 3.27. preload (string) 3.28. db_update_as_insert (string) + 3.29. timer_procs (string) 4. Functions 5. MI Commands @@ -284,6 +287,7 @@ Chapter 1. Admin Guide 3.26. hash_size (integer) 3.27. preload (string) 3.28. db_update_as_insert (string) + 3.29. timer_procs (string) 3.1. nat_bflag (integer) @@ -663,6 +667,20 @@ modparam("usrloc", "preload", "location") modparam("usrloc", "db_update_as_insert", 1) ... +3.29. timer_procs (string) + + Number of timer processes to be started by module. Timer processes take + care of checking expired records and syncronization with database. If + set to 0, no dedicated timer is started, the one from core will be + used. + + Default value is "0". + + Example 1.29. Set timer_procs parameter +... +modparam("usrloc", "timer_procs", 4) +... + 4. Functions There are no exported functions that could be used in scripts. diff --git a/modules_k/usrloc/dlist.c b/modules_k/usrloc/dlist.c index cb6c899..cb25871 100644 --- a/modules_k/usrloc/dlist.c +++ b/modules_k/usrloc/dlist.c @@ -605,7 +605,7 @@ unsigned long get_number_of_users(void) * \brief Run timer handler of all domains * \return 0 if all timer return 0, != 0 otherwise */ -int synchronize_all_udomains(void) +int synchronize_all_udomains(int istart, int istep) { int res = 0; dlist_t* ptr; @@ -617,7 +617,7 @@ int synchronize_all_udomains(void) res |= db_timer_udomain(ptr->d); } else { for( ptr=root ; ptr ; ptr=ptr->next) - mem_timer_udomain(ptr->d); + mem_timer_udomain(ptr->d, istart, istep); } return res; diff --git a/modules_k/usrloc/dlist.h b/modules_k/usrloc/dlist.h index 851fca6..149b84c 100644 --- a/modules_k/usrloc/dlist.h +++ b/modules_k/usrloc/dlist.h @@ -83,7 +83,7 @@ void print_all_udomains(FILE* _f); * \brief Run timer handler of all domains * \return 0 if all timer return 0, != 0 otherwise */ -int synchronize_all_udomains(void); +int synchronize_all_udomains(int istart, int istep); /*! diff --git a/modules_k/usrloc/doc/usrloc_admin.xml b/modules_k/usrloc/doc/usrloc_admin.xml index e719ad8..6624705 100644 --- a/modules_k/usrloc/doc/usrloc_admin.xml +++ b/modules_k/usrloc/doc/usrloc_admin.xml @@ -775,6 +775,29 @@ modparam("usrloc", "db_update_as_insert", 1) </example> </section> + <section id="timer_procs"> + <title><varname>timer_procs</varname> (string)</title> + <para> + Number of timer processes to be started by module. Timer processes + take care of checking expired records and syncronization with + database. If set to 0, no dedicated timer is started, the one from + core will be used. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>timer_procs</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "timer_procs", 4) +... +</programlisting> + </example> + </section> + </section> <section> diff --git a/modules_k/usrloc/udomain.c b/modules_k/usrloc/udomain.c index ca2b256..c812e7a 100644 --- a/modules_k/usrloc/udomain.c +++ b/modules_k/usrloc/udomain.c @@ -864,12 +864,12 @@ void mem_delete_urecord(udomain_t* _d, struct urecord* _r) * \brief Run timer handler for given domain * \param _d domain */ -void mem_timer_udomain(udomain_t* _d) +void mem_timer_udomain(udomain_t* _d, int istart, int istep) { struct urecord* ptr, *t; int i; - for(i=0; i<_d->size; i++) + for(i=istart; i<_d->size; i+=istep) { lock_ulslot(_d, i); diff --git a/modules_k/usrloc/udomain.h b/modules_k/usrloc/udomain.h index 8e83d14..de55b11 100644 --- a/modules_k/usrloc/udomain.h +++ b/modules_k/usrloc/udomain.h @@ -117,8 +117,10 @@ int db_timer_udomain(udomain_t* _d); /*! * \brief Run timer handler for given domain * \param _d domain + * \param istart index of hash table slot to start processing + * \param istep step through hash table slots to process */ -void mem_timer_udomain(udomain_t* _d); +void mem_timer_udomain(udomain_t* _d, int istart, int istep); /*! diff --git a/modules_k/usrloc/ul_mi.c b/modules_k/usrloc/ul_mi.c index 7d18e70..1855706 100644 --- a/modules_k/usrloc/ul_mi.c +++ b/modules_k/usrloc/ul_mi.c @@ -464,7 +464,7 @@ struct mi_root* mi_usrloc_flush(struct mi_root *cmd, void *param) if (rpl_tree==NULL) return 0; - synchronize_all_udomains(); + synchronize_all_udomains(0, 1); return rpl_tree; } diff --git a/modules_k/usrloc/ul_mod.c b/modules_k/usrloc/ul_mod.c index 63539c6..5a05a3d 100644 --- a/modules_k/usrloc/ul_mod.c +++ b/modules_k/usrloc/ul_mod.c @@ -57,6 +57,7 @@ #include "../../dprint.h" #include "../../rpc_lookup.h" #include "../../timer.h" /* register_timer */ +#include "../../timer_proc.h" /* register_sync_timer */ #include "../../globals.h" /* is_main */ #include "../../ut.h" /* str_init */ #include "dlist.h" /* register_udomain */ @@ -91,7 +92,8 @@ MODULE_VERSION static int mod_init(void); /*!< Module initialization function */ static void destroy(void); /*!< Module destroy function */ -static void timer(unsigned int ticks, void* param); /*!< Timer handler */ +static void ul_core_timer(unsigned int ticks, void* param); /*!< Core timer handler */ +static void ul_local_timer(unsigned int ticks, void* param); /*!< Local timer handler */ static int child_init(int rank); /*!< Per-child init function */ static int mi_child_init(void); @@ -103,6 +105,7 @@ static int ul_preload_param(modparam_t type, void* val); extern int bind_usrloc(usrloc_api_t* api); extern int ul_locks_no; int ul_db_update_as_insert = 0; +int ul_timer_procs = 0; /* * Module parameters and their default values @@ -186,6 +189,7 @@ static param_export_t params[] = { {"nat_bflag", INT_PARAM, &nat_bflag }, {"preload", STR_PARAM|USE_FUNC_PARAM, (void*)ul_preload_param}, {"db_update_as_insert", INT_PARAM, &ul_db_update_as_insert}, + {"timer_procs", INT_PARAM, &ul_timer_procs}, {0, 0, 0} }; @@ -301,7 +305,10 @@ static int mod_init(void) } /* Register cache timer */ - register_timer( timer, 0, timer_interval); + if(ul_timer_procs<=0) + register_timer(ul_core_timer, 0, timer_interval); + else + register_sync_timers(ul_timer_procs); /* init the callbacks list */ if ( init_ulcb_list() < 0) { @@ -350,6 +357,19 @@ static int mod_init(void) static int child_init(int _rank) { dlist_t* ptr; + int i; + + if(_rank==PROC_MAIN && ul_timer_procs>0) + { + for(i=0; i<ul_timer_procs; i++) + { + if(fork_sync_timer(PROC_TIMER, "USRLOC Timer", 1 /*socks flag*/, + ul_local_timer, (void*)(long)i, timer_interval /*sec*/)<0) { + LM_ERR("failed to start timer routine as process\n"); + return -1; /* error */ + } + } + } /* connecting to DB ? */ switch (db_mode) { @@ -420,7 +440,7 @@ static void destroy(void) /* we need to sync DB in order to flush the cache */ if (ul_dbh) { ul_unlock_locks(); - if (synchronize_all_udomains() != 0) { + if (synchronize_all_udomains(0, 1) != 0) { LM_ERR("flushing cache failed\n"); } ul_dbf.close(ul_dbh); @@ -435,11 +455,21 @@ static void destroy(void) /*! \brief - * Timer handler + * Core timer handler + */ +static void ul_core_timer(unsigned int ticks, void* param) +{ + if (synchronize_all_udomains(0, 1) != 0) { + LM_ERR("synchronizing cache failed\n"); + } +} + +/*! \brief + * Local timer handler */ -static void timer(unsigned int ticks, void* param) +static void ul_local_timer(unsigned int ticks, void* param) { - if (synchronize_all_udomains() != 0) { + if (synchronize_all_udomains((int)(long)param, ul_timer_procs) != 0) { LM_ERR("synchronizing cache failed\n"); } } [View Less]

1 0

git:master: core: added support for basic timer + interval sync
by Daniel-Constantin Mierla 19 Apr '12

19 Apr '12

Module: sip-router Branch: master Commit: 49e10148a00bf8d6427326fdffd07121a916c807 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=49e1014… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 19 10:52:02 2012 +0200 core: added support for basic timer + interval sync - new functions to start basic timers that will sync the interval after executing the task. Useful if the task … [View More]is taking long, the process will skip the delay in the sleep value --- timer_proc.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ timer_proc.h | 11 ++++++ 2 files changed, 112 insertions(+), 0 deletions(-) diff --git a/timer_proc.c b/timer_proc.c index c354fbd..4d58b1b 100644 --- a/timer_proc.c +++ b/timer_proc.c @@ -181,5 +181,106 @@ error: return -1; } +/** + * \brief update internal counters for running new sync sec. timers + * @param timers number of basic timer processes + * @return 0 on success; -1 on error + */ +int register_sync_timers(int timers) +{ + if(register_procs(timers)<0) + return -1; + cfg_register_child(timers); + return 0; +} + +/** + * \brief Forks a separate simple sleep() -&- sync periodic timer + * + * Forks a very basic periodic timer process, that just sleep()s for + * the specified interval and then calls the timer function. + * The new "sync timer" process execution start immediately, the sleep() + * is called first (so the first call to the timer function will happen + * \<interval\> seconds after the call to fork_sync_timer) + * @param child_id @see fork_process() + * @param desc @see fork_process() + * @param make_sock @see fork_process() + * @param f timer function/callback + * @param param parameter passed to the timer function + * @param interval interval in seconds. + * @return pid of the new process on success, -1 on error + * (doesn't return anything in the child process) + */ +int fork_sync_timer(int child_id, char* desc, int make_sock, + timer_function* f, void* param, int interval) +{ + int pid; + ticks_t ts1 = 0; + ticks_t ts2 = 0; + + pid=fork_process(child_id, desc, make_sock); + if (pid<0) return -1; + if (pid==0){ + /* child */ + ts2 = interval; + if (cfg_child_init()) return -1; + for(;;){ + if(ts2>0) sleep(ts2); + else sleep(1); + ts1 = get_ticks(); + cfg_update(); + f(get_ticks(), param); /* ticks in s for compatibility with old + timers */ + ts2 = interval - get_ticks() + ts1; + } + } + /* parent */ + return pid; +} + + +/** + * \brief Forks a separate simple milisecond-sleep() -&- sync periodic timer + * + * Forks a very basic periodic timer process, that just ms-sleep()s for + * the specified interval and then calls the timer function. + * The new "sync timer" process execution start immediately, the ms-sleep() + * is called first (so the first call to the timer function will happen + * \<interval\> seconds after the call to fork_basic_utimer) + * @param child_id @see fork_process() + * @param desc @see fork_process() + * @param make_sock @see fork_process() + * @param f timer function/callback + * @param param parameter passed to the timer function + * @param uinterval interval in mili-seconds. + * @return pid of the new process on success, -1 on error + * (doesn't return anything in the child process) + */ +int fork_sync_utimer(int child_id, char* desc, int make_sock, + utimer_function* f, void* param, int uinterval) +{ + int pid; + ticks_t ts1 = 0; + ticks_t ts2 = 0; + + pid=fork_process(child_id, desc, make_sock); + if (pid<0) return -1; + if (pid==0){ + /* child */ + ts2 = uinterval; + if (cfg_child_init()) return -1; + for(;;){ + if(ts2>0) sleep_us(uinterval); + else sleep_us(1); + ts1 = get_ticks_raw(); + cfg_update(); + f(TICKS_TO_MS(ts1), param); /* ticks in mili-seconds */ + ts2 = uinterval - get_ticks_raw() + ts1; + } + } + /* parent */ + return pid; +} + /* vi: set ts=4 sw=4 tw=79:ai:cindent: */ diff --git a/timer_proc.h b/timer_proc.h index e6faa7c..ba445da 100644 --- a/timer_proc.h +++ b/timer_proc.h @@ -117,6 +117,17 @@ int fork_basic_utimer(int child_id, char* desc, int make_sock, int fork_local_timer_process(int child_id, char* desc, int make_sock, struct local_timer** lt_h); +/** + * sync timers + */ +int register_sync_timers(int timers); + +int fork_sync_timer(int child_id, char* desc, int make_sock, + timer_function* f, void* param, int interval); + +int fork_sync_utimer(int child_id, char* desc, int make_sock, + utimer_function* f, void* param, int uinterval); + #endif /*__timer_proc_h*/ /* vi: set ts=4 sw=4 tw=79:ai:cindent: */ [View Less]

1 0

Releasing v3.2.3
by Daniel-Constantin Mierla 19 Apr '12

19 Apr '12

Hello, last patch release (v3.2.2) was done quite some time ago, therefore I am thinking of releasing v3.2.3 sometime next week, maybe Wednesday or Thursday. If there are patches in master branch to be backported to 3.2, please start doing them. Also, if anyone is aware of issues in 3.2 branch not reported to the tracker, announce them asap. Thanks, Daniel -- Daniel-Constantin Mierla Kamailio Advanced Training, April 23-26, 2012, Berlin, Germany http://www.asipto.com/index.php/kamailio-advanced-training/

1 2

← Newer
1
...
19
20
21
22
23
24
25
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2012