sr-dev

sr-dev@lists.kamailio.org

16 participants
45370 discussions

git:master:174cc5e8: presence: delete expired in-memory presentity records
by Daniel-Constantin Mierla 21 Apr '20

21 Apr '20

Module: kamailio Branch: master Commit: 174cc5e8d1800312eaa6d1bc4fea8df7934c5b55 URL: https://github.com/kamailio/kamailio/commit/174cc5e8d1800312eaa6d1bc4fea8df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-21T19:45:01+02:00 presence: delete expired in-memory presentity records --- Modified: src/modules/presence/publish.c --- Diff: https://github.com/kamailio/kamailio/commit/174cc5e8d1800312eaa6d1bc4fea8df… Patch: https://github.com/kamailio/kamailio/commit/174cc5e8d1800312eaa6d1bc4fea8df… --- diff --git a/src/modules/presence/publish.c b/src/modules/presence/publish.c index 4662965f50..dfa37c07e8 100644 --- a/src/modules/presence/publish.c +++ b/src/modules/presence/publish.c @@ -265,7 +265,6 @@ void ps_ptable_timer_clean(unsigned int ticks, void *param) if(ptlist==NULL) { return; } - for(ptn = ptlist; ptn != NULL; ptn = ptn->next) { memset(&pres, 0, sizeof(presentity_t)); @@ -316,6 +315,12 @@ void ps_ptable_timer_clean(unsigned int ticks, void *param) } error: + for(ptn = ptlist; ptn != NULL; ptn = ptn->next) { + if(ps_ptable_remove(ptn) <0) { + LM_ERR("failed deleting presentity item\n"); + } + } + if(ptlist != NULL) { ps_presentity_list_free(ptlist, 1); }

1 0

git:master:7ada66b1: presence: user core macro for hash slot index
by Daniel-Constantin Mierla 21 Apr '20

21 Apr '20

Module: kamailio Branch: master Commit: 7ada66b12254b809faaf265d21e75e7f347f695d URL: https://github.com/kamailio/kamailio/commit/7ada66b12254b809faaf265d21e75e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-21T17:31:44+02:00 presence: user core macro for hash slot index --- Modified: src/modules/presence/hash.c --- Diff: https://github.com/kamailio/kamailio/commit/7ada66b12254b809faaf265d21e75e7… Patch: https://github.com/kamailio/kamailio/commit/7ada66b12254b809faaf265d21e75e7… --- diff --git a/src/modules/presence/hash.c b/src/modules/presence/hash.c index dc72a366ac..f6abcdcc79 100644 --- a/src/modules/presence/hash.c +++ b/src/modules/presence/hash.c @@ -992,7 +992,7 @@ int ps_ptable_insert(ps_presentity_t *pt) return -1; } - idx = ptn->hashid & (_ps_ptable->ssize - 1); + idx = core_hash_idx(ptn->hashid, _ps_ptable->ssize); lock_get(&_ps_ptable->slots[idx].lock); if(_ps_ptable->slots[idx].plist == NULL) { @@ -1028,7 +1028,7 @@ int ps_ptable_replace(ps_presentity_t *pt) ptc.ruid = pres_sruid.uid; } - idx = ptc.hashid & (_ps_ptable->ssize - 1); + idx = core_hash_idx(ptc.hashid, _ps_ptable->ssize); lock_get(&_ps_ptable->slots[idx].lock); ptn = _ps_ptable->slots[idx].plist; @@ -1090,7 +1090,7 @@ int ps_ptable_update(ps_presentity_t *pt) ptc.ruid = pres_sruid.uid; } - idx = ptc.hashid & (_ps_ptable->ssize - 1); + idx = core_hash_idx(ptc.hashid, _ps_ptable->ssize); lock_get(&_ps_ptable->slots[idx].lock); ptn = _ps_ptable->slots[idx].plist; @@ -1146,7 +1146,7 @@ int ps_ptable_remove(ps_presentity_t *pt) memcpy(&ptc, pt, sizeof(ps_presentity_t)); ptc.hashid = core_case_hash(&pt->user, &pt->domain, 0); - idx = ptc.hashid & (_ps_ptable->ssize - 1); + idx = core_hash_idx(ptc.hashid, _ps_ptable->ssize); lock_get(&_ps_ptable->slots[idx].lock); ptn = _ps_ptable->slots[idx].plist; @@ -1189,7 +1189,7 @@ ps_presentity_t *ps_ptable_get_list(str *user, str *domain) ptc.user = *user; ptc.domain = *domain; ptc.hashid = core_case_hash(&ptc.user, &ptc.domain, 0); - idx = ptc.hashid & (_ps_ptable->ssize - 1); + idx = core_hash_idx(ptc.hashid, _ps_ptable->ssize); lock_get(&_ps_ptable->slots[idx].lock); ptn = _ps_ptable->slots[idx].plist; @@ -1236,7 +1236,7 @@ ps_presentity_t *ps_ptable_get_item(str *user, str *domain, str *event, str *eta ptc.event = *event; ptc.etag = *etag; ptc.hashid = core_case_hash(&ptc.user, &ptc.domain, 0); - idx = ptc.hashid & (_ps_ptable->ssize - 1); + idx = core_hash_idx(ptc.hashid, _ps_ptable->ssize); lock_get(&_ps_ptable->slots[idx].lock); ptn = _ps_ptable->slots[idx].plist;

1 0

git:master:d4f8674d: core: hashes - small helper macro to compute hash slot index
by Daniel-Constantin Mierla 21 Apr '20

21 Apr '20

Module: kamailio Branch: master Commit: d4f8674d0068a31bed7097804f37b6bff5fe21fb URL: https://github.com/kamailio/kamailio/commit/d4f8674d0068a31bed7097804f37b6b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-21T17:30:37+02:00 core: hashes - small helper macro to compute hash slot index --- Modified: src/core/hashes.h --- Diff: https://github.com/kamailio/kamailio/commit/d4f8674d0068a31bed7097804f37b6b… Patch: https://github.com/kamailio/kamailio/commit/d4f8674d0068a31bed7097804f37b6b… --- diff --git a/src/core/hashes.h b/src/core/hashes.h index 5b8e2f2773..2afb8361c8 100644 --- a/src/core/hashes.h +++ b/src/core/hashes.h @@ -27,7 +27,7 @@ #include "str.h" - +#define core_hash_idx(hid, hsize) ((hid)&(hsize-1)) /** internal use: hash update * params: char* s - string start,

1 0

Re: [sr-dev] [kamailio/kamailio] presence: functions to keep presentity records in memory (f917318)
by Emmanuel Schmidbauer 21 Apr '20

21 Apr '20

update, if i set `modparam("presence", "subs_db_mode", 3)` there is no segfault -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/f917318c1e5fefa4106eaaf46123506…

1 0

Re: [sr-dev] [kamailio/kamailio] presence: functions to keep presentity records in memory (f917318)
by Emmanuel Schmidbauer 21 Apr '20

21 Apr '20

here is a trace from the coredump: ``` Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00007f12607da547 in atomic_cmpxchg_int (var=0x8, old=0, new_v=1) at ../../core/mem/../atomic/atomic_x86.h:224 224 ATOMIC_FUNC_CMPXCHG(cmpxchg, "cmpxchgl %2, %1", int , int) (gdb) up #1 0x00007f12607da57b in futex_get (lock=0x8) at ../../core/mem/../futexlock.h:99 99 v=atomic_cmpxchg(lock, 0, 1); /* lock if 0 */ (gdb) #2 0x00007f12607fe0d0 in update_db_subs_timer_dbnone (no_lock=0) at subscribe.c:2079 2079 lock_get(&subs_htable[i].lock); (gdb) up #3 0x00007f1260802121 in timer_db_update (ticks=61825161, param=0x0) at subscribe.c:2441 2441 update_db_subs_timer_dbnone(no_lock); (gdb) up #4 0x00005568ade05b2e in sr_wtimer_exec (ticks=61825161, param=0x0) at core/timer_proc.c:433 433 wt->f(ticks, wt->param); (gdb) up #5 0x00005568ade04b58 in fork_sync_timer (child_id=-1, desc=0x5568ae01a3a1 "secondary timer", make_sock=1, f=0x5568ade057a8 <sr_wtimer_exec>, param=0x0, interval=1000) at core/timer_proc.c:267 267 f(TICKS_TO_S(ts1), param); /* ticks in sec for compatibility with old (gdb) up #6 0x00005568ade05ece in sr_wtimer_start () at core/timer_proc.c:459 459 if(fork_sync_timer(-1 /*PROC_TIMER*/, "secondary timer", 1, (gdb) up #7 0x00005568adc05e24 in main_loop () at main.c:1452 1452 if(sr_wtimer_start()<0) { (gdb) up #8 0x00005568adc123e7 in main (argc=9, argv=0x7ffd9501a8a8) at main.c:2845 2845 ret=main_loop(); (gdb) up ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/f917318c1e5fefa4106eaaf46123506…

1 0

Re: [sr-dev] [kamailio/kamailio] presence: functions to keep presentity records in memory (f917318)
by Emmanuel Schmidbauer 21 Apr '20

21 Apr '20

getting coredump and seeing this in log: ``` 3(5514) DEBUG: presence [subscribe.c:711]: msg_watchers_clean(): cleaning pending subscriptions 0(5505) ALERT: <core> [main.c:775]: handle_sigs(): child process 5514 exited by a signal 11 0(5505) ALERT: <core> [main.c:778]: handle_sigs(): core was generated 0(5505) INFO: <core> [main.c:798]: handle_sigs(): dont_fork turned on, living on ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/f917318c1e5fefa4106eaaf46123506…

1 0

git:master:4e49c0e2: presence: rpc presence.presentity_list is returning an array
by Daniel-Constantin Mierla 21 Apr '20

21 Apr '20

Module: kamailio Branch: master Commit: 4e49c0e21747b9c4344acb16e0013c178ec45dff URL: https://github.com/kamailio/kamailio/commit/4e49c0e21747b9c4344acb16e0013c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-21T15:25:25+02:00 presence: rpc presence.presentity_list is returning an array --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/4e49c0e21747b9c4344acb16e0013c1… Patch: https://github.com/kamailio/kamailio/commit/4e49c0e21747b9c4344acb16e0013c1… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index 84997b4230..cbbc23feb3 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -1932,7 +1932,7 @@ rpc_export_t presence_rpc[] = { {"presence.updateWatchers", rpc_presence_update_watchers, rpc_presence_update_watchers_doc, 0}, {"presence.presentity_list", rpc_presence_presentity_list, - rpc_presence_presentity_list_doc, 0}, + rpc_presence_presentity_list_doc, RET_ARRAY}, {0, 0, 0, 0} };

1 0

git:master:814af22c: presence: use unsigned int for presentity hash id
by Daniel-Constantin Mierla 21 Apr '20

21 Apr '20

Module: kamailio Branch: master Commit: 814af22ca48b2e1a57052b6e92cbf786cf2d99f8 URL: https://github.com/kamailio/kamailio/commit/814af22ca48b2e1a57052b6e92cbf78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-21T15:09:01+02:00 presence: use unsigned int for presentity hash id --- Modified: src/modules/presence/hash.c Modified: src/modules/presence/hash.h Modified: src/modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/814af22ca48b2e1a57052b6e92cbf78… Patch: https://github.com/kamailio/kamailio/commit/814af22ca48b2e1a57052b6e92cbf78…

1 0

Re: [sr-dev] [kamailio/kamailio] presence: functions to keep presentity records in memory (f917318)
by Emmanuel Schmidbauer 21 Apr '20

21 Apr '20

> @eschmidbauer - can you help testing somehow? Not having the possibility to test properly here, working mainly from home these days I can't use many devices. First would be to make sure existing your existing config is still working fine. I tried to be very non-intrusive as much as possible in the old code and operation mode. > > Then, to test in-memory only presentity records, set: > > ``` > modparam("presence", "publ_cache", 2) > ``` > > You have to use latest master branch. I did basic tests with baresip for handling the PUBLISH requests and I could see they are in database presentity table if publ_cache!=2 as well as in memory via rpc command if publ_cache==2. > > You can set also subscription records in memory with: > > ``` > modparam("presence", "subs_db_mode", 0) > ``` yes- i'll see what i can do and report back to you. im assuming i'll have to compile master branch for these features. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/f917318c1e5fefa4106eaaf46123506…

1 0

git:master:b3e01c14: pv: fixes for KEMI pvx.xavp_getd
by Victor Seva 21 Apr '20

21 Apr '20

Module: kamailio Branch: master Commit: b3e01c149433c26e8792f1caf77b189d85378055 URL: https://github.com/kamailio/kamailio/commit/b3e01c149433c26e8792f1caf77b189… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-04-21T13:27:38+02:00 pv: fixes for KEMI pvx.xavp_getd --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/b3e01c149433c26e8792f1caf77b189… Patch: https://github.com/kamailio/kamailio/commit/b3e01c149433c26e8792f1caf77b189… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 2574148c04..511a0e3b29 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -1402,7 +1402,7 @@ sr_kemi_dict_item_t* ki_xavp_dict(sr_xavp_t *xavp); /** * SR_KEMIP_ARRAY with values of xavp=>name */ -sr_kemi_dict_item_t* ki_xavp_dict_name(sr_xavp_t *xavp, str name) +sr_kemi_dict_item_t* ki_xavp_dict_name(sr_xavp_t *xavp, str *name) { sr_kemi_dict_item_t *ini = NULL; sr_kemi_dict_item_t *val; @@ -1416,7 +1416,7 @@ sr_kemi_dict_item_t* ki_xavp_dict_name(sr_xavp_t *xavp, str name) } memset(ini, 0, sizeof(sr_kemi_xval_t)); ini->vtype = SR_KEMIP_ARRAY; - while(avp!=NULL&&!STR_EQ(avp->name,name)) + while(avp!=NULL&&!STR_EQ(avp->name,*name)) { avp = avp->next; } @@ -1467,8 +1467,8 @@ sr_kemi_dict_item_t* ki_xavp_dict_name(sr_xavp_t *xavp, str name) last->next = val; } else { ini->v.dict = val; - last = val; } + last = val; avp = xavp_get_next(avp); } return ini; @@ -1509,13 +1509,13 @@ sr_kemi_dict_item_t* ki_xavp_dict(sr_xavp_t *xavp) val->vtype = SR_KEMIP_DICT; val->name.s = keys->s.s; val->name.len = keys->s.len; - val->v.dict = ki_xavp_dict_name(avp, keys->s); + val->v.dict = ki_xavp_dict_name(avp, &keys->s); if(last) { last->next = val; } else { ini = val; - last = ini; } + last = val; k = keys; keys = keys->next; pkg_free(k);

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