sr-dev March 2012

sr-dev@lists.kamailio.org

26 participants
149 discussions

git:master: core: safer propagation of parameter address
by Daniel-Constantin Mierla 20 Mar '12

20 Mar '12

Module: sip-router Branch: master Commit: 4464c27f37bf9bc84e96c5898b08dbc3cd1ae3d8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4464c27… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 20 14:32:28 2012 +0100 core: safer propagation of parameter address --- xavp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xavp.c b/xavp.c index fed62ee..97b545d 100644 --- a/xavp.c +++ b/xavp.c @@ -197,7 +197,7 @@ static sr_xavp_t *xavp_get_internal(str *name, sr_xavp_t **list, int idx, sr_xav sr_xavp_t *xavp_get(str *name, sr_xavp_t *start) { - return xavp_get_internal(name, &start, 0, NULL); + return xavp_get_internal(name, (start)?&start:NULL, 0, NULL); } sr_xavp_t *xavp_get_by_index(str *name, int idx, sr_xavp_t **start)

1 0

git:master: registrar(k): new parameter xavp_cfg
by Daniel-Constantin Mierla 20 Mar '12

20 Mar '12

Module: sip-router Branch: master Commit: 71348e9c9714066f47b01a6f5061a9651e8c051c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=71348e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 20 21:25:21 2012 +0100 registrar(k): new parameter xavp_cfg - defines the name of an XAVP container to hold per-REGISTER parameters - for now, max_contacts can be set for each registration, overwriting the module parameter value. For example: modparam("registrar", "xavp_cfg", "reg") ... request_route { ... if(is_method("REGISTER")) $xavp(reg=>max_contacts) = 2; ... } --- modules_k/registrar/README | 51 +++++++++++++++++------- modules_k/registrar/doc/registrar_admin.xml | 35 ++++++++++++++++ modules_k/registrar/reg_mod.c | 6 +++ modules_k/registrar/reg_mod.h | 2 + modules_k/registrar/save.c | 57 +++++++++++++++++++++++---- 5 files changed, 129 insertions(+), 22 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=713…

1 0

git:master: utils/kamctl: rebuilt .sql files to reflect changes to pua, rls , and xcap tables
by Peter Dunkley 20 Mar '12

20 Mar '12

Module: sip-router Branch: master Commit: 6853a8c061df2456291d825415769625f741daf6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6853a8c… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Mar 19 16:12:02 2012 +0000 utils/kamctl: rebuilt .sql files to reflect changes to pua, rls, and xcap tables --- utils/kamctl/db_sqlite/presence-create.sql | 22 +++++++++++++--------- utils/kamctl/db_sqlite/rls-create.sql | 6 ++++++ utils/kamctl/mysql/presence-create.sql | 22 +++++++++++++--------- utils/kamctl/mysql/rls-create.sql | 6 ++++++ utils/kamctl/oracle/presence-create.sql | 22 +++++++++++++--------- utils/kamctl/oracle/rls-create.sql | 6 ++++++ utils/kamctl/postgres/presence-create.sql | 22 +++++++++++++--------- utils/kamctl/postgres/rls-create.sql | 6 ++++++ 8 files changed, 76 insertions(+), 36 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=685…

3 6

git:master: lib/srdb1/schema: Updated XCAP indices to fix MySQL primary key issue
by Peter Dunkley 20 Mar '12

20 Mar '12

Module: sip-router Branch: master Commit: 2a41fe4fd144bbe82259d1546674b1dd06897d19 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2a41fe4… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Mar 20 16:54:18 2012 +0000 lib/srdb1/schema: Updated XCAP indices to fix MySQL primary key issue - The previous commit was incorrect --- lib/srdb1/schema/pr_xcap.xml | 1 + utils/kamctl/db_sqlite/presence-create.sql | 2 +- utils/kamctl/mysql/presence-create.sql | 2 +- utils/kamctl/oracle/presence-create.sql | 2 +- utils/kamctl/postgres/presence-create.sql | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/srdb1/schema/pr_xcap.xml b/lib/srdb1/schema/pr_xcap.xml index e0e42df..8aa3343 100644 --- a/lib/srdb1/schema/pr_xcap.xml +++ b/lib/srdb1/schema/pr_xcap.xml @@ -85,6 +85,7 @@ <index> <name>doc_uri_idx</name> + <colref linkend="doc_uri"/> <unique/> </index> diff --git a/utils/kamctl/db_sqlite/presence-create.sql b/utils/kamctl/db_sqlite/presence-create.sql index 96ba84e..f3f74fb 100644 --- a/utils/kamctl/db_sqlite/presence-create.sql +++ b/utils/kamctl/db_sqlite/presence-create.sql @@ -68,7 +68,7 @@ CREATE TABLE xcap ( source INTEGER NOT NULL, doc_uri VARCHAR(255) NOT NULL, port INTEGER NOT NULL, - CONSTRAINT xcap_doc_uri_idx UNIQUE () + CONSTRAINT xcap_doc_uri_idx UNIQUE (doc_uri) ); CREATE INDEX xcap_account_doc_type_idx ON xcap (username, domain, doc_type); diff --git a/utils/kamctl/mysql/presence-create.sql b/utils/kamctl/mysql/presence-create.sql index b052448..9bef393 100644 --- a/utils/kamctl/mysql/presence-create.sql +++ b/utils/kamctl/mysql/presence-create.sql @@ -68,7 +68,7 @@ CREATE TABLE xcap ( source INT(11) NOT NULL, doc_uri VARCHAR(255) NOT NULL, port INT(11) NOT NULL, - CONSTRAINT doc_uri_idx UNIQUE () + CONSTRAINT doc_uri_idx UNIQUE (doc_uri) ) ENGINE=MyISAM; CREATE INDEX account_doc_type_idx ON xcap (username, domain, doc_type); diff --git a/utils/kamctl/oracle/presence-create.sql b/utils/kamctl/oracle/presence-create.sql index 52eaa48..1449e0d 100644 --- a/utils/kamctl/oracle/presence-create.sql +++ b/utils/kamctl/oracle/presence-create.sql @@ -92,7 +92,7 @@ CREATE TABLE xcap ( source NUMBER(10), doc_uri VARCHAR2(255), port NUMBER(10), - CONSTRAINT xcap_doc_uri_idx UNIQUE () + CONSTRAINT xcap_doc_uri_idx UNIQUE (doc_uri) ); CREATE OR REPLACE TRIGGER xcap_tr diff --git a/utils/kamctl/postgres/presence-create.sql b/utils/kamctl/postgres/presence-create.sql index c960bce..cba741c 100644 --- a/utils/kamctl/postgres/presence-create.sql +++ b/utils/kamctl/postgres/presence-create.sql @@ -68,7 +68,7 @@ CREATE TABLE xcap ( source INTEGER NOT NULL, doc_uri VARCHAR(255) NOT NULL, port INTEGER NOT NULL, - CONSTRAINT xcap_doc_uri_idx UNIQUE () + CONSTRAINT xcap_doc_uri_idx UNIQUE (doc_uri) ); CREATE INDEX xcap_account_doc_type_idx ON xcap (username, domain, doc_type);

1 0

git:master: lib/srdb1/schema: Updated XCAP indices to fix MySQL primary key issue
by Peter Dunkley 20 Mar '12

20 Mar '12

Module: sip-router Branch: master Commit: 45a9d6089a3d03d64f7648a2682ef18f5149171f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=45a9d60… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Mar 20 16:47:03 2012 +0000 lib/srdb1/schema: Updated XCAP indices to fix MySQL primary key issue - Made id primary key again - Made doc_uri a unique index (constraint) - Removed unique constraint from other indices as no longer needed --- lib/srdb1/schema/pr_xcap.xml | 10 ++++++---- utils/kamctl/db_sqlite/presence-create.sql | 12 +++++++----- utils/kamctl/mysql/presence-create.sql | 12 +++++++----- utils/kamctl/oracle/presence-create.sql | 12 +++++++----- utils/kamctl/postgres/presence-create.sql | 12 +++++++----- 5 files changed, 34 insertions(+), 24 deletions(-) diff --git a/lib/srdb1/schema/pr_xcap.xml b/lib/srdb1/schema/pr_xcap.xml index ec6c126..e0e42df 100644 --- a/lib/srdb1/schema/pr_xcap.xml +++ b/lib/srdb1/schema/pr_xcap.xml @@ -23,6 +23,7 @@ <autoincrement/> <type db="dbtext">int,auto</type> <description>Unique ID</description> + <primary/> </column> <column id="username"> @@ -73,7 +74,6 @@ <type>string</type> <size>&xcap_uri_len;</size> <description>Document uri</description> - <primary/> </column> <column id="port"> @@ -84,11 +84,15 @@ </column> <index> + <name>doc_uri_idx</name> + <unique/> + </index> + + <index> <name>account_doc_type_idx</name> <colref linkend="username"/> <colref linkend="domain"/> <colref linkend="doc_type"/> - <unique/> </index> <index> @@ -97,7 +101,6 @@ <colref linkend="domain"/> <colref linkend="doc_type"/> <colref linkend="doc_uri"/> - <unique/> </index> <index> @@ -105,6 +108,5 @@ <colref linkend="username"/> <colref linkend="domain"/> <colref linkend="doc_uri"/> - <unique/> </index> </table> diff --git a/utils/kamctl/db_sqlite/presence-create.sql b/utils/kamctl/db_sqlite/presence-create.sql index 8d23108..96ba84e 100644 --- a/utils/kamctl/db_sqlite/presence-create.sql +++ b/utils/kamctl/db_sqlite/presence-create.sql @@ -59,20 +59,22 @@ CREATE TABLE watchers ( INSERT INTO version (table_name, table_version) values ('xcap','4'); CREATE TABLE xcap ( - id INTEGER NOT NULL, + id INTEGER PRIMARY KEY NOT NULL, username VARCHAR(64) NOT NULL, domain VARCHAR(64) NOT NULL, doc BYTEA NOT NULL, doc_type INTEGER NOT NULL, etag VARCHAR(64) NOT NULL, source INTEGER NOT NULL, - doc_uri VARCHAR(255) PRIMARY KEY NOT NULL, + doc_uri VARCHAR(255) NOT NULL, port INTEGER NOT NULL, - CONSTRAINT xcap_account_doc_type_idx UNIQUE (username, domain, doc_type), - CONSTRAINT xcap_account_doc_type_uri_idx UNIQUE (username, domain, doc_type, doc_uri), - CONSTRAINT xcap_account_doc_uri_idx UNIQUE (username, domain, doc_uri) + CONSTRAINT xcap_doc_uri_idx UNIQUE () ); +CREATE INDEX xcap_account_doc_type_idx ON xcap (username, domain, doc_type); +CREATE INDEX xcap_account_doc_type_uri_idx ON xcap (username, domain, doc_type, doc_uri); +CREATE INDEX xcap_account_doc_uri_idx ON xcap (username, domain, doc_uri); + INSERT INTO version (table_name, table_version) values ('pua','7'); CREATE TABLE pua ( id INTEGER PRIMARY KEY NOT NULL, diff --git a/utils/kamctl/mysql/presence-create.sql b/utils/kamctl/mysql/presence-create.sql index 6395738..b052448 100644 --- a/utils/kamctl/mysql/presence-create.sql +++ b/utils/kamctl/mysql/presence-create.sql @@ -59,20 +59,22 @@ CREATE TABLE watchers ( INSERT INTO version (table_name, table_version) values ('xcap','4'); CREATE TABLE xcap ( - id INT(10) UNSIGNED AUTO_INCREMENT NOT NULL, + id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, username VARCHAR(64) NOT NULL, domain VARCHAR(64) NOT NULL, doc MEDIUMBLOB NOT NULL, doc_type INT(11) NOT NULL, etag VARCHAR(64) NOT NULL, source INT(11) NOT NULL, - doc_uri VARCHAR(255) PRIMARY KEY NOT NULL, + doc_uri VARCHAR(255) NOT NULL, port INT(11) NOT NULL, - CONSTRAINT account_doc_type_idx UNIQUE (username, domain, doc_type), - CONSTRAINT account_doc_type_uri_idx UNIQUE (username, domain, doc_type, doc_uri), - CONSTRAINT account_doc_uri_idx UNIQUE (username, domain, doc_uri) + CONSTRAINT doc_uri_idx UNIQUE () ) ENGINE=MyISAM; +CREATE INDEX account_doc_type_idx ON xcap (username, domain, doc_type); +CREATE INDEX account_doc_type_uri_idx ON xcap (username, domain, doc_type, doc_uri); +CREATE INDEX account_doc_uri_idx ON xcap (username, domain, doc_uri); + INSERT INTO version (table_name, table_version) values ('pua','7'); CREATE TABLE pua ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, diff --git a/utils/kamctl/oracle/presence-create.sql b/utils/kamctl/oracle/presence-create.sql index 92403e5..52eaa48 100644 --- a/utils/kamctl/oracle/presence-create.sql +++ b/utils/kamctl/oracle/presence-create.sql @@ -83,18 +83,16 @@ BEGIN map2users('watchers'); END; / INSERT INTO version (table_name, table_version) values ('xcap','4'); CREATE TABLE xcap ( - id NUMBER(10), + id NUMBER(10) PRIMARY KEY, username VARCHAR2(64), domain VARCHAR2(64), doc BLOB, doc_type NUMBER(10), etag VARCHAR2(64), source NUMBER(10), - doc_uri VARCHAR2(255) PRIMARY KEY, + doc_uri VARCHAR2(255), port NUMBER(10), - CONSTRAINT xcap_account_doc_type_idx UNIQUE (username, domain, doc_type), - CONSTRAINT xcap_account_doc_type_uri_idx UNIQUE (username, domain, doc_type, doc_uri), - CONSTRAINT xcap_account_doc_uri_idx UNIQUE (username, domain, doc_uri) + CONSTRAINT xcap_doc_uri_idx UNIQUE () ); CREATE OR REPLACE TRIGGER xcap_tr @@ -105,6 +103,10 @@ END xcap_tr; / BEGIN map2users('xcap'); END; / +CREATE INDEX xcap_account_doc_type_idx ON xcap (username, domain, doc_type); +CREATE INDEX xcap_account_doc_type_uri_idx ON xcap (username, domain, doc_type, doc_uri); +CREATE INDEX xcap_account_doc_uri_idx ON xcap (username, domain, doc_uri); + INSERT INTO version (table_name, table_version) values ('pua','7'); CREATE TABLE pua ( id NUMBER(10) PRIMARY KEY, diff --git a/utils/kamctl/postgres/presence-create.sql b/utils/kamctl/postgres/presence-create.sql index 57b4451..c960bce 100644 --- a/utils/kamctl/postgres/presence-create.sql +++ b/utils/kamctl/postgres/presence-create.sql @@ -59,20 +59,22 @@ CREATE TABLE watchers ( INSERT INTO version (table_name, table_version) values ('xcap','4'); CREATE TABLE xcap ( - id SERIAL NOT NULL, + id SERIAL PRIMARY KEY NOT NULL, username VARCHAR(64) NOT NULL, domain VARCHAR(64) NOT NULL, doc BYTEA NOT NULL, doc_type INTEGER NOT NULL, etag VARCHAR(64) NOT NULL, source INTEGER NOT NULL, - doc_uri VARCHAR(255) PRIMARY KEY NOT NULL, + doc_uri VARCHAR(255) NOT NULL, port INTEGER NOT NULL, - CONSTRAINT xcap_account_doc_type_idx UNIQUE (username, domain, doc_type), - CONSTRAINT xcap_account_doc_type_uri_idx UNIQUE (username, domain, doc_type, doc_uri), - CONSTRAINT xcap_account_doc_uri_idx UNIQUE (username, domain, doc_uri) + CONSTRAINT xcap_doc_uri_idx UNIQUE () ); +CREATE INDEX xcap_account_doc_type_idx ON xcap (username, domain, doc_type); +CREATE INDEX xcap_account_doc_type_uri_idx ON xcap (username, domain, doc_type, doc_uri); +CREATE INDEX xcap_account_doc_uri_idx ON xcap (username, domain, doc_uri); + INSERT INTO version (table_name, table_version) values ('pua','7'); CREATE TABLE pua ( id SERIAL PRIMARY KEY NOT NULL,

1 0

ASYNC module question
by Peter Dunkley 20 Mar '12

20 Mar '12

Hi, As part of some work to get the maximum performance out of Kamailio RLS and Presence I would like to be able to hand-off processing of presence requests (NOTIFY, PUBLISH, and SUBSCRIBE) to some worker processes. This way, even if large numbers of presence requests are received on a single TCP connection, all that the Kamailio process managing that connection has to do is to de-packetise the requests and hand them off. I have been looking at the ASYNC module and it doesn't seem to do quite the right thing for this. The issue is the sleep parameter. I want my worker processes to process presence requests continuously from a queue, not suspend them for a second or more and then process them. Is there a simple change to ASYNC to get it to do this? I currently do what I need in a quite different way (see config fragment below), but I think using ASYNC would be cleaner if it did what I needed... ... # ----- mqueue params ----- modparam("mqueue", "mqueue", "name=presence") # ----- rtimer params ----- modparam("rtimer", "timer", "name=presence0;interval=1;mode=1;") modparam("rtimer", "exec", "timer=presence0;route=PRESENCE_PROCESS") modparam("rtimer", "timer", "name=presence1;interval=1;mode=1;") modparam("rtimer", "exec", "timer=presence1;route=PRESENCE_PROCESS") ... modparam("rtimer", "timer", "name=presence7;interval=1;mode=1;") modparam("rtimer", "exec", "timer=presence7;route=PRESENCE_PROCESS") ... if (@event!="presence" && @event!="presence.winfo") { $var(ev_type) = @event; xlog("L_INFO", " $rm $var(ev_type) not a presence message for myself\n"); return; } if (!t_suspend()) { t_reply("500", "Server Internal Error"); xlog("L_ERR", "Failed to suspend transaction for $rm\n"); exit; } xlog("L_INFO", "Suspended transaction for $rm [$T(id_index):$T(id_label)]\n"); if (!mq_add("presence", "$T(id_index)", "$T(id_label)")) { t_reply("500", "Server Internal Error"); xlog("L_ERR", "Failed to queue transaction for $rm [$T(id_index):$T(id_label)]\n"); exit; } exit; ... route[PRESENCE_PROCESS] { lock("pres"); $var(pres) = $shv(pres); $shv(pres) = $shv(pres) + 1; unlock("pres"); xlog("L_WARN", "Starting presence de-queue process $var(pres) (pid: $pp)\n"); while (1) { while (mq_fetch("presence")) { $var(id_index) = (int) $mqk(presence); $var(id_label) = (int) $mqv(presence); xlog("L_INFO", "Found queued presence transaction [$var(id_index):$var(id_label)]\n"); t_continue("$var(id_index)", "$var(id_label)", "PRESENCE"); } usleep(100000); } } route[PRESENCE] { xlog("L_INFO", "$rm: route[PRESENCE] process $var(pres)\n"); if (is_method("NOTIFY")) { xlog("L_INFO", "Sending NOTIFY to RLS\n"); rls_handle_notify(); } else if (is_method("PUBLISH")) { xlog("L_INFO", "Sending PUBLISH to Presence\n"); handle_publish(); } else if (is_method("SUBSCRIBE")) { xlog("L_INFO", "Sending SUBSCRIBE to RLS\n"); $var(ret_code) = rls_handle_subscribe(); if ($var(ret_code) == 10) { xlog("L_INFO", " SUBSCRIBE not for RLS - sending to Presence\n"); handle_subscribe(); } } else { xlog("L_ERR", "Received non-(NOTIFY|SUBSCRIBE) request from presence queue\n"); t_reply("500", "Server Internal Error"); } exit; } Thanks, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

2 2

git:master: lib/srdb1/schema: Updated indices for the pua table to make them correct for DB-only mode
by Peter Dunkley 19 Mar '12

19 Mar '12

Module: sip-router Branch: master Commit: 676f44ae04bf858722733d86f937b7a1b0b44177 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=676f44a… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Mar 19 16:00:39 2012 +0000 lib/srdb1/schema: Updated indices for the pua table to make them correct for DB-only mode --- lib/srdb1/schema/pr_pua.xml | 38 +++++++++++++++++++++++++++++++------- 1 files changed, 31 insertions(+), 7 deletions(-) diff --git a/lib/srdb1/schema/pr_pua.xml b/lib/srdb1/schema/pr_pua.xml index 6a3079c..5bd690b 100644 --- a/lib/srdb1/schema/pr_pua.xml +++ b/lib/srdb1/schema/pr_pua.xml @@ -49,7 +49,7 @@ <natural/> </column> - <column> + <column id="expires"> <name>expires</name> <type>int</type> <size>&expires_len;</size> @@ -99,7 +99,7 @@ <description>Call ID</description> </column> - <column> + <column id="to_tag"> <name>to_tag</name> <type>string</type> <size>&domain_len;</size> @@ -160,23 +160,47 @@ <unique/> </index> - <index> - <name>presid_idx</name> - <colref linkend="pres_id"/> + <index> + <name>expires_idx</name> + <colref linkend="expires"/> + <unique/> </index> <index> - <name>dialog_idx</name> + <name>dialog1_idx</name> <colref linkend="call_id"/> <colref linkend="from_tag"/> <colref linkend="to_tag"/> </index> <index> - <name>tmp_dlg_idx</name> + <name>dialog2_idx</name> + <colref linkend="pres_id"/> + <colref linkend="pres_uri"/> + </index> + + <index> + <name>tmp_dlg1_idx</name> + <colref linkend="call_id"/> + <colref linkend="from_tag"/> + </index> + + <index> + <name>tmp_dlg2_idx</name> <colref linkend="pres_id"/> <colref linkend="pres_uri"/> <colref linkend="call_id"/> <colref linkend="from_tag"/> </index> + + <index> + <name>tmp_record1_idx</name> + <colref linkend="pres_id"/> + </index> + + <index> + <name>tmp_record2_idx</name> + <colref linkend="pres_id"/> + <colref linkend="etag"/> + </index> </table>

1 0

git:master: modules_k/rls: RLS DB-only mode performance improvements
by Peter Dunkley 19 Mar '12

19 Mar '12

Module: sip-router Branch: master Commit: 6d7e23db563b7ba70701e21928def9c228c30520 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6d7e23d… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Mar 19 16:05:56 2012 +0000 modules_k/rls: RLS DB-only mode performance improvements - When the RLS DB-only mode was implemented it was designed to do (as close as possible) exactly what the hash-table mode did in the same way the hash-table mode did it. This means lots of hash-table lookups (which are fast) result in lots of DB selects (which are slow). It also means where an entry is found in the hash-table and modified in place, in DB mode a select must be done and then an update. A lot of these DB transactions are not strictly necessary, and often fields were retrieved or updated in the DB even when they hadn't changed. - This change refactors the DB-only code (in rls_db.c) and re-orders the functional code in other files to make the DB operations as simple as possible and as few as few as possible. --- modules_k/rls/notify.c | 6 +- modules_k/rls/resource_notify.c | 34 +- modules_k/rls/rls.h | 17 +- modules_k/rls/rls_db.c | 994 ++++++++++++++------------------------- modules_k/rls/subscribe.c | 149 ++++--- 5 files changed, 459 insertions(+), 741 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=6d7…

1 0

git:master: lib/srdb1/schema: Updated xcap table indices
by Peter Dunkley 19 Mar '12

19 Mar '12

Module: sip-router Branch: master Commit: 639bda8df8ff3671e9ac14eb18f744df24f83adc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=639bda8… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Mar 19 16:09:39 2012 +0000 lib/srdb1/schema: Updated xcap table indices - They now match the queries in the presence_xml, rls, and xcap_server modules. --- lib/srdb1/schema/pr_xcap.xml | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/lib/srdb1/schema/pr_xcap.xml b/lib/srdb1/schema/pr_xcap.xml index 76baa4d..ec6c126 100644 --- a/lib/srdb1/schema/pr_xcap.xml +++ b/lib/srdb1/schema/pr_xcap.xml @@ -21,7 +21,6 @@ <type>unsigned int</type> <size>&table_id_len;</size> <autoincrement/> - <primary/> <type db="dbtext">int,auto</type> <description>Unique ID</description> </column> @@ -74,6 +73,7 @@ <type>string</type> <size>&xcap_uri_len;</size> <description>Document uri</description> + <primary/> </column> <column id="port"> @@ -88,13 +88,23 @@ <colref linkend="username"/> <colref linkend="domain"/> <colref linkend="doc_type"/> - <colref linkend="doc_uri"/> <unique/> </index> <index> - <name>source_idx</name> - <colref linkend="source"/> + <name>account_doc_type_uri_idx</name> + <colref linkend="username"/> + <colref linkend="domain"/> + <colref linkend="doc_type"/> + <colref linkend="doc_uri"/> + <unique/> </index> + <index> + <name>account_doc_uri_idx</name> + <colref linkend="username"/> + <colref linkend="domain"/> + <colref linkend="doc_uri"/> + <unique/> + </index> </table>

1 0

git:master: lib/srdb1/schema: Updated indices for rls_presentity and rls_watchers tables
by Peter Dunkley 19 Mar '12

19 Mar '12

Module: sip-router Branch: master Commit: 1cdab1b92c7df5b9108e1dbb0059e955a6f5024e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1cdab1b… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Mar 19 16:08:30 2012 +0000 lib/srdb1/schema: Updated indices for rls_presentity and rls_watchers tables - The rls_watchers table indices are now correct for DB-only mode --- lib/srdb1/schema/rls_presentity.xml | 9 +++++++++ lib/srdb1/schema/rls_watchers.xml | 26 ++++++++++++++++++++++---- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/lib/srdb1/schema/rls_presentity.xml b/lib/srdb1/schema/rls_presentity.xml index fc29c2d..ca7cf4a 100644 --- a/lib/srdb1/schema/rls_presentity.xml +++ b/lib/srdb1/schema/rls_presentity.xml @@ -89,8 +89,17 @@ </index> <index> + <name>rlsubs_idx</name> + <colref linkend="rlsubs_did"/> + </index> + + <index> <name>updated_idx</name> <colref linkend="updated"/> </index> + <index> + <name>expires_idx</name> + <colref linkend="expires"/> + </index> </table> diff --git a/lib/srdb1/schema/rls_watchers.xml b/lib/srdb1/schema/rls_watchers.xml index 3f67dc0..5db70b0 100644 --- a/lib/srdb1/schema/rls_watchers.xml +++ b/lib/srdb1/schema/rls_watchers.xml @@ -48,7 +48,7 @@ <description>To domain</description> </column> - <column> + <column id="watcher_username"> <name>watcher_username</name> <type>string</type> <size>&user_len;</size> @@ -56,7 +56,7 @@ <natural/> </column> - <column> + <column id="watcher_domain"> <name>watcher_domain</name> <type>string</type> <size>&domain_len;</size> @@ -64,7 +64,7 @@ <natural/> </column> - <column> + <column id="event"> <name>event</name> <type>string</type> <size>&user_len;</size> @@ -129,7 +129,7 @@ <description>Record route</description> </column> - <column> + <column id="expires"> <name>expires</name> <type>int</type> <size>&expires_len;</size> @@ -181,4 +181,22 @@ <unique/> </index> + <index> + <name>rls_watchers_delete</name> + <colref linkend="callid"/> + <colref linkend="to_tag"/> + </index> + + <index> + <name>rls_watchers_update</name> + <colref linkend="watcher_username"/> + <colref linkend="watcher_domain"/> + <colref linkend="event"/> + </index> + + <index> + <name>rls_watchers_expires</name> + <colref linkend="expires"/> + </index> + </table>

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
15
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2012