sr-dev

sr-dev@lists.kamailio.org

15 participants
45333 discussions

git:master:eb5c1a41: presence: use separate structure to match presentity to replace or update
by Daniel-Constantin Mierla 22 Apr '20

22 Apr '20

Module: kamailio Branch: master Commit: eb5c1a41ced14f502648c6bda9ae0ef585b0cb37 URL: https://github.com/kamailio/kamailio/commit/eb5c1a41ced14f502648c6bda9ae0ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-22T08:11:36+02:00 presence: use separate structure to match presentity to replace or update --- Modified: src/modules/presence/hash.c Modified: src/modules/presence/hash.h Modified: src/modules/presence/presentity.c Modified: src/modules/presence/presentity.h Modified: src/modules/presence/publish.c --- Diff: https://github.com/kamailio/kamailio/commit/eb5c1a41ced14f502648c6bda9ae0ef… Patch: https://github.com/kamailio/kamailio/commit/eb5c1a41ced14f502648c6bda9ae0ef…

1 0

git:master:8077f387: presence: init pres and subs hash tables for non db-only mode and memory index
by Daniel-Constantin Mierla 22 Apr '20

22 Apr '20

Module: kamailio Branch: master Commit: 8077f387f9253a486a980c65a776507a7ad6ee7f URL: https://github.com/kamailio/kamailio/commit/8077f387f9253a486a980c65a776507… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-21T22:42:12+02:00 presence: init pres and subs hash tables for non db-only mode and memory index --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/8077f387f9253a486a980c65a776507… Patch: https://github.com/kamailio/kamailio/commit/8077f387f9253a486a980c65a776507… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index cbbc23feb3..7120dd7951 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -350,10 +350,11 @@ static int mod_init(void) } if(publ_cache_mode==PS_PCACHE_HYBRID || publ_cache_mode==PS_PCACHE_RECORD) { - if(phtable_size < 1) + if(phtable_size < 1) { phtable_size = 256; - else + } else { phtable_size = 1 << phtable_size; + } } if(publ_cache_mode==PS_PCACHE_RECORD) { @@ -362,6 +363,28 @@ static int mod_init(void) } } + if(pres_subs_dbmode != DB_ONLY) { + if(shtable_size < 1) { + shtable_size = 512; + } else { + shtable_size = 1 << shtable_size; + } + + subs_htable = new_shtable(shtable_size); + if(subs_htable == NULL) { + LM_ERR(" initializing subscribe hash table\n"); + goto dberror; + } + } + + if(publ_cache_mode==PS_PCACHE_HYBRID) { + pres_htable = new_phtable(); + if(pres_htable == NULL) { + LM_ERR("initializing presentity hash table\n"); + goto dberror; + } + } + if(publ_cache_mode != PS_PCACHE_RECORD || pres_subs_dbmode != NO_DB) { if(pres_db_url.s == NULL) { LM_ERR("database url not set!\n"); @@ -405,17 +428,8 @@ static int mod_init(void) goto dberror; } + if(pres_subs_dbmode != DB_ONLY) { - if(shtable_size < 1) - shtable_size = 512; - else - shtable_size = 1 << shtable_size; - - subs_htable = new_shtable(shtable_size); - if(subs_htable == NULL) { - LM_ERR(" initializing subscribe hash table\n"); - goto dberror; - } if(restore_db_subs() < 0) { LM_ERR("restoring subscribe info from database\n"); goto dberror; @@ -423,13 +437,7 @@ static int mod_init(void) } if(publ_cache_mode==PS_PCACHE_HYBRID) { - pres_htable = new_phtable(); - if(pres_htable == NULL) { - LM_ERR("initializing presentity hash table\n"); - goto dberror; - } - - if(pres_htable_restore() < 0) { + if(pres_htable_db_restore() < 0) { LM_ERR("filling in presentity hash table from database\n"); goto dberror; }

1 0

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

21 Apr '20

@eschmidbauer I created a dedicated issue on tracker for troubleshooting related issues to in-memory presentity records, let's continue there: * https://github.com/kamailio/kamailio/issues/2294 Attach there the output for `bt full` taken from core file with gdb. Also, add the parameters you set for presence* modules. -- 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: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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev