sr-dev November 2024

sr-dev@lists.kamailio.org

20 participants
367 discussions

git:master:6c408ff8: snmpstats: use proper name for ims module in docs

by Henning Westerholt

Module: kamailio Branch: master Commit: 6c408ff8c7b558a725d67898d5f1a8dc3d717c61 URL: https://github.com/kamailio/kamailio/commit/6c408ff8c7b558a725d67898d5f1a8d… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-11-05T16:45:50Z snmpstats: use proper name for ims module in docs --- Modified: src/modules/snmpstats/doc/snmpstats_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6c408ff8c7b558a725d67898d5f1a8d… Patch: https://github.com/kamailio/kamailio/commit/6c408ff8c7b558a725d67898d5f1a8d… --- diff --git a/src/modules/snmpstats/doc/snmpstats_admin.xml b/src/modules/snmpstats/doc/snmpstats_admin.xml index 12a6ee152c0..538908e2573 100644 --- a/src/modules/snmpstats/doc/snmpstats_admin.xml +++ b/src/modules/snmpstats/doc/snmpstats_admin.xml @@ -215,7 +215,7 @@ <listitem> <para> - <emphasis>dialog or dialog-ng</emphasis> - all scalars relating to the number of dialogs are + <emphasis>dialog or ims_dialog</emphasis> - all scalars relating to the number of dialogs are dependent on the presence of a dialog module. Furthermore, if the module is not loaded, then the kamailioDialogLimitMinorEvent, and kamailioDialogLimitMajorEvent alarm will be disabled.

1 month, 2 weeks

[kamailio/kamailio] app_python3: removal of legacy modules (PR #3986)

by space88man

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [X] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Long overdue clean-up of `app_python3`; remove legacy modules and rely solely on KEMI. Bring it in sync with `app_python3s`. Larger background: this is part I of a series of commits to enable free-threading builds of python to be used in kamailio. https://py-free-threading.github.io/ You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3986 -- Commit Summary -- * app_python3: removal of legacy modules -- File Changes -- M src/modules/app_python3/app_python3_mod.c (14) D src/modules/app_python3/mod_Core.c (68) D src/modules/app_python3/mod_Core.h (36) D src/modules/app_python3/mod_Logger.c (266) D src/modules/app_python3/mod_Logger.h (37) D src/modules/app_python3/mod_Ranks.c (96) D src/modules/app_python3/mod_Ranks.h (35) D src/modules/app_python3/mod_Router.c (84) D src/modules/app_python3/mod_Router.h (36) M src/modules/app_python3/python_iface.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3986.patch https://github.com/kamailio/kamailio/pull/3986.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3986 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3986(a)github.com>

1 month, 2 weeks

git:master:0ffe157b: app_python3: refactor GIL and thread state handling

by space88man

Module: kamailio Branch: master Commit: 0ffe157bc13e7759ae1cee63a584fad4ac9eb38f URL: https://github.com/kamailio/kamailio/commit/0ffe157bc13e7759ae1cee63a584fad… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: space88man <shihping.chan(a)gmail.com> Date: 2024-11-05T11:01:08+08:00 app_python3: refactor GIL and thread state handling * KEMI Python scripts that use Python threading for background jobs would observe that the Python threads are not running This is due to not releasing the GIL when returning to the Kamailio event loop from KEMI calls * The module was using PyGILState_Ensure / PyGILState_Release to ensure thread-correctness It turns out that in this case these are the wrong functions to use The main thread is already correct due to Py_Initialize(); the PyGILState_xxx functions are redundant To release the GIL so Python threads run we use the macros Py_BLOCK_THREADS/Py_UNBLOCK_THREADS Note: the PyGILState_XXX functions are for C-threads created by Python unaware libraries --- Modified: src/modules/app_python3/app_python3_mod.c Modified: src/modules/app_python3/apy_kemi.h Modified: src/modules/app_python3/python_exec.c --- Diff: https://github.com/kamailio/kamailio/commit/0ffe157bc13e7759ae1cee63a584fad… Patch: https://github.com/kamailio/kamailio/commit/0ffe157bc13e7759ae1cee63a584fad…

1 month, 2 weeks

git:master:effd74b6: app_python3: initial support for free-threading Python

by space88man

Module: kamailio Branch: master Commit: effd74b61aff3fef27386a19035fe2df241650b5 URL: https://github.com/kamailio/kamailio/commit/effd74b61aff3fef27386a19035fe2d… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: space88man <shihping.chan(a)gmail.com> Date: 2024-11-05T11:01:08+08:00 app_python3: initial support for free-threading Python * free-threading build can be disabled by defining -DKSR_PYTHON_DISABLE_FREETHREADING * this has no effect if Python is a non-free-threading build --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/effd74b61aff3fef27386a19035fe2d… Patch: https://github.com/kamailio/kamailio/commit/effd74b61aff3fef27386a19035fe2d… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 0c1ab535809..213a19e4703 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -530,7 +530,6 @@ static PyObject *init_KSR(void) KSR_moduledef.m_methods = _sr_crt_KSRMethods; _sr_apy_ksr_module = PyModule_Create(&KSR_moduledef); - Py_INCREF(_sr_apy_ksr_module); m = 0; @@ -538,6 +537,13 @@ static PyObject *init_KSR(void) /* special sub-modules - x.modf() can have variable number of params */ _sr_apy_ksr_modules_list[m] = PyModule_Create(&KSR_x_moduledef); PyModule_AddObject(_sr_apy_ksr_module, "x", _sr_apy_ksr_modules_list[m]); + +#if defined(Py_GIL_DISABLED) && !defined(KSR_PYTHON_DISABLE_FREETHREADING) +#warning Python Free Threading build + PyUnstable_Module_SetGIL(_sr_apy_ksr_module, Py_MOD_GIL_NOT_USED); + PyUnstable_Module_SetGIL(_sr_apy_ksr_modules_list[m], Py_MOD_GIL_NOT_USED); +#endif + Py_INCREF(_sr_apy_ksr_modules_list[m]); m++; @@ -579,6 +585,12 @@ static PyObject *init_KSR(void) mmodule->m_size = -1; _sr_apy_ksr_modules_list[m] = PyModule_Create(mmodule); + +#if defined(Py_GIL_DISABLED) && !defined(KSR_PYTHON_DISABLE_FREETHREADING) +#warning Python Free Threading build + PyUnstable_Module_SetGIL( + _sr_apy_ksr_modules_list[m], Py_MOD_GIL_NOT_USED); +#endif PyModule_AddObject(_sr_apy_ksr_module, emods[k].kexp[0].mname.s, _sr_apy_ksr_modules_list[m]); Py_INCREF(_sr_apy_ksr_modules_list[m]);

1 month, 2 weeks

git:master:c62f78e7: app_python3: clean-up of early imports

by space88man

Module: kamailio Branch: master Commit: c62f78e73390dff617a45a3c2e1f5d0382698510 URL: https://github.com/kamailio/kamailio/commit/c62f78e73390dff617a45a3c2e1f5d0… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: space88man <shihping.chan(a)gmail.com> Date: 2024-11-05T11:01:08+08:00 app_python3: clean-up of early imports --- Modified: src/modules/app_python3/app_python3_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c62f78e73390dff617a45a3c2e1f5d0… Patch: https://github.com/kamailio/kamailio/commit/c62f78e73390dff617a45a3c2e1f5d0… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index 57cf1864ced..ef243510d6a 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -353,7 +353,7 @@ int apy_reload_script(void) return rval; } -#define INTERNAL_VERSION "1002\n" +#define INTERNAL_VERSION "1003\n" int apy_load_script(void) { @@ -376,11 +376,7 @@ int apy_load_script(void) // Py3 does not create a package-like hierarchy of modules // make legacy modules importable using Py2 syntax - rc = PyRun_SimpleString("import sys\n" - "import KSR\n" - "KSR.__version__ = " INTERNAL_VERSION - "sys.modules['KSR.pv'] = KSR.pv\n" - "sys.modules['KSR.x'] = KSR.x\n"); + rc = PyRun_SimpleString("import KSR\nKSR.__version__ = " INTERNAL_VERSION); if(rc) { LM_ERR("Early imports of modules failed\n"); goto err;

1 month, 2 weeks

git:master:16876cf3: app_python3: removal of legacy modules

by space88man

Module: kamailio Branch: master Commit: 16876cf3f87f5447f9f5cb8e795106076409534a URL: https://github.com/kamailio/kamailio/commit/16876cf3f87f5447f9f5cb8e7951060… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: space88man <shihping.chan(a)gmail.com> Date: 2024-11-05T11:01:08+08:00 app_python3: removal of legacy modules --- Modified: src/modules/app_python3/app_python3_mod.c Removed: src/modules/app_python3/mod_Core.c Removed: src/modules/app_python3/mod_Core.h Removed: src/modules/app_python3/mod_Logger.c Removed: src/modules/app_python3/mod_Logger.h Removed: src/modules/app_python3/mod_Ranks.c Removed: src/modules/app_python3/mod_Ranks.h Removed: src/modules/app_python3/mod_Router.c Removed: src/modules/app_python3/mod_Router.h Removed: src/modules/app_python3/python_iface.c Removed: src/modules/app_python3/python_iface.h --- Diff: https://github.com/kamailio/kamailio/commit/16876cf3f87f5447f9f5cb8e7951060… Patch: https://github.com/kamailio/kamailio/commit/16876cf3f87f5447f9f5cb8e7951060…

1 month, 2 weeks

git:master:2fc867d2: modules: readme files regenerated - timer ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 2fc867d2861b7a16b0b6836e8de295a6b47597a8 URL: https://github.com/kamailio/kamailio/commit/2fc867d2861b7a16b0b6836e8de295a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-11-04T21:46:10+01:00 modules: readme files regenerated - timer ... [skip ci] --- Modified: src/modules/timer/README Modified: src/modules/tsilo/README --- Diff: https://github.com/kamailio/kamailio/commit/2fc867d2861b7a16b0b6836e8de295a… Patch: https://github.com/kamailio/kamailio/commit/2fc867d2861b7a16b0b6836e8de295a… --- diff --git a/src/modules/timer/README b/src/modules/timer/README index 853fe7304a3..a9705658edf 100644 --- a/src/modules/timer/README +++ b/src/modules/timer/README @@ -183,14 +183,14 @@ if (@timer.executed != "") { Example 1.5. Common example using timer module ... -loadmodule "modules/xprint/xprint.so" -loadmodule "modules/timer/timer.so" +loadmodule "xlog.so" +loadmodule "timer.so" modparam("timer", "declare_timer", "tmr1=ONTIMER,1000"); modparam("timer", "declare_timer", "tmr2=ONTIMER2,2000,slow,enable"); route["print"] { - xplog("L_INFO", "fired: %(a)timer.executed\n"); + xlog("fired: $sel((a)timer.executed)\n"); } route["ONTIMER"] { @@ -227,20 +227,20 @@ end route section which is called once after Kamailio starts. ... loadmodule "timer"; -loadmodule "xprint"; +loadmodule "xlog"; modparam("timer", "declare_timer", "TIMER_TEST=TEST,100,,enable"); request_route { - xplog("L_E","main route"); + xlog("main route"); } route[TEST] { timer_enable("TIMER_TEST", "0"); - xplog("L_E","test start\n"); + xlog("test start\n"); # add here tested functionality - xplog("L_E","test end\n"); - } + xlog("test end\n"); +} ... diff --git a/src/modules/tsilo/README b/src/modules/tsilo/README index 142cf6536cc..efb0ca84df1 100644 --- a/src/modules/tsilo/README +++ b/src/modules/tsilo/README @@ -38,6 +38,7 @@ Donat Zenichev 4.2. ts_append(domain, ruri) 4.3. ts_append_by_contact(domain, ruri [, contact]) 4.4. ts_append_to(tindex, tlabel, domain, [uri]) + 4.5. ts_append_branches(uri) 5. RPC Commands @@ -60,6 +61,7 @@ Donat Zenichev 1.4. ts_append usage 1.5. ts_append_by_contact usage 1.6. ts_append_to usage + 1.7. ts_append_branches usage Chapter 1. Admin Guide @@ -82,6 +84,7 @@ Chapter 1. Admin Guide 4.2. ts_append(domain, ruri) 4.3. ts_append_by_contact(domain, ruri [, contact]) 4.4. ts_append_to(tindex, tlabel, domain, [uri]) + 4.5. ts_append_branches(uri) 5. RPC Commands @@ -166,6 +169,7 @@ modparam("tsilo", "use_domain", 1) 4.2. ts_append(domain, ruri) 4.3. ts_append_by_contact(domain, ruri [, contact]) 4.4. ts_append_to(tindex, tlabel, domain, [uri]) + 4.5. ts_append_branches(uri) 4.1. ts_store([uri]) @@ -278,6 +282,18 @@ if (is_method("REGISTER")) { } ... +4.5. ts_append_branches(uri) + + Append the current internal branches to the transaction stored for the + uri. + + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. + + Example 1.7. ts_append_branches usage +... + ts_append_branches("sip:alice@$td"); +... + 5. RPC Commands 5.1. ts.dump

1 month, 2 weeks

git:master:306d1439: tsilo: docs for ts_append_branches(uri)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 306d1439900d776e7876320e128cac90288420dd URL: https://github.com/kamailio/kamailio/commit/306d1439900d776e7876320e128cac9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-04T21:40:28+01:00 tsilo: docs for ts_append_branches(uri) --- Modified: src/modules/tsilo/doc/tsilo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/306d1439900d776e7876320e128cac9… Patch: https://github.com/kamailio/kamailio/commit/306d1439900d776e7876320e128cac9… --- diff --git a/src/modules/tsilo/doc/tsilo_admin.xml b/src/modules/tsilo/doc/tsilo_admin.xml index 75b23d952e0..500218792f9 100644 --- a/src/modules/tsilo/doc/tsilo_admin.xml +++ b/src/modules/tsilo/doc/tsilo_admin.xml @@ -313,6 +313,24 @@ if (is_method("REGISTER")) { ts_append_to("$var(tindex)", "$var(tlabel)", "location"); } ... +</programlisting> + </example> + </section> + <section id="tsilo.f.ts_append_branches"> + <title><function moreinfo="none">ts_append_branches(uri)</function></title> + <para> + Append the current internal branches to the transaction stored for the + uri. + </para> + <para> + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. + </para> + <example> + <title><function>ts_append_branches</function> usage</title> + <programlisting format="linespecific"> +... + ts_append_branches("sip:alice@$td"); +... </programlisting> </example> </section>

1 month, 2 weeks

git:master:e9574d08: tsilo: added ts_append_branches(uri)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e9574d0833df81ed6c929ade6eee1ff0fc9addd4 URL: https://github.com/kamailio/kamailio/commit/e9574d0833df81ed6c929ade6eee1ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-04T21:25:55+01:00 tsilo: added ts_append_branches(uri) - add current internal branches to the transaction stored for the uri --- Modified: src/modules/tsilo/ts_append.c Modified: src/modules/tsilo/ts_append.h Modified: src/modules/tsilo/tsilo.c --- Diff: https://github.com/kamailio/kamailio/commit/e9574d0833df81ed6c929ade6eee1ff… Patch: https://github.com/kamailio/kamailio/commit/e9574d0833df81ed6c929ade6eee1ff…

1 month, 2 weeks

git:master:21c70668: timer: docs - updates to examples

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 21c7066842a034d8674e5fac2b7c6fd38b0073e8 URL: https://github.com/kamailio/kamailio/commit/21c7066842a034d8674e5fac2b7c6fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-04T11:38:50+01:00 timer: docs - updates to examples --- Modified: src/modules/timer/doc/timer.xml --- Diff: https://github.com/kamailio/kamailio/commit/21c7066842a034d8674e5fac2b7c6fd… Patch: https://github.com/kamailio/kamailio/commit/21c7066842a034d8674e5fac2b7c6fd… --- diff --git a/src/modules/timer/doc/timer.xml b/src/modules/timer/doc/timer.xml index e22d65341c2..cbfb23941fe 100644 --- a/src/modules/timer/doc/timer.xml +++ b/src/modules/timer/doc/timer.xml @@ -224,14 +224,14 @@ if (@timer.executed != "") { <title>Common example using timer module</title> <programlisting> ... -loadmodule "modules/xprint/xprint.so" -loadmodule "modules/timer/timer.so" +loadmodule "xlog.so" +loadmodule "timer.so" modparam("timer", "declare_timer", "tmr1=ONTIMER,1000"); modparam("timer", "declare_timer", "tmr2=ONTIMER2,2000,slow,enable"); route["print"] { - xplog("L_INFO", "fired: %(a)timer.executed\n"); + xlog("fired: $sel((a)timer.executed)\n"); } route["ONTIMER"] { @@ -276,22 +276,22 @@ end <programlisting> ... loadmodule "timer"; -loadmodule "xprint"; +loadmodule "xlog"; modparam("timer", "declare_timer", "TIMER_TEST=TEST,100,,enable"); request_route { - xplog("L_E","main route"); + xlog("main route"); } route[TEST] { timer_enable("TIMER_TEST", "0"); - xplog("L_E","test start\n"); + xlog("test start\n"); # add here tested functionality - xplog("L_E","test end\n"); - } + xlog("test end\n"); +} ... </programlisting> @@ -299,4 +299,3 @@ route[TEST] { </section> </chapter> </book> -

1 month, 2 weeks

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2024