You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/3520
-- Commit Summary --
* docs/ : typos
* etc/ typos
-- File Changes --
M INSTALL (2)
M doc/docbook/catalog.xml (2)
M doc/docbook/dep.xsl (4)
M doc/docbook/entities.xml (10)
M doc/docbook/html.chunked.xsl (2)
M doc/doxygen/main.dox (2)
M doc/man/kamailio.cfg.5 (2)
M doc/misc/HISTORY (10)
M doc/misc/NEWS (58)
M doc/misc/TODO (10)
M doc/misc/cvs-commit-rules.txt (6)
M doc/stylesheets/dbschema_k/catalog.xml (2)
M doc/stylesheets/dbschema_k/xsl/db_berkeley.xsl (4)
M doc/stylesheets/dbschema_k/xsl/db_redis.xsl (4)
M doc/stylesheets/dbschema_k/xsl/dbtext.xsl (4)
M doc/stylesheets/dbschema_k/xsl/mysql.xsl (2)
M doc/stylesheets/dbschema_k/xsl/pi_framework_mod.xsl (2)
M doc/tutorials/presence/cfg/ps.cfg (2)
M doc/tutorials/presence/install.xml (2)
M doc/tutorials/presence/intro.xml (4)
M doc/tutorials/serdev/routing_engine.xml (2)
M doc/tutorials/seruser/otherapps.xml (2)
M etc/kamailio.cfg (4)
M etc/sip-router.cfg (16)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/3520.patchhttps://github.com/kamailio/kamailio/pull/3520.diff
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/3520
You are receiving this because you are subscribed to this thread.
Message ID: <kamailio/kamailio/pull/3520(a)github.com>
Module: kamailio
Branch: master
Commit: 6e9335ff2245596b74bc1c749d1e7805bf186f02
URL: https://github.com/kamailio/kamailio/commit/6e9335ff2245596b74bc1c749d1e780…
Author: �������������������� �������������������������������� <git-dpa(a)aegee.org>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2023-08-07T15:32:56+02:00
etc/ typos
---
Modified: etc/kamailio.cfg
Modified: etc/sip-router.cfg
---
Diff: https://github.com/kamailio/kamailio/commit/6e9335ff2245596b74bc1c749d1e780…
Patch: https://github.com/kamailio/kamailio/commit/6e9335ff2245596b74bc1c749d1e780…
---
diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg
index 68493736d41..715c289af1e 100644
--- a/etc/kamailio.cfg
+++ b/etc/kamailio.cfg
@@ -227,7 +227,7 @@ enable_sctp=no
####### Custom Parameters #########
-/* These parameters can be modified runtime via RPC interface
+/* These parameters can be modified at runtime via RPC interface
* - see the documentation of 'cfg_rpc' module.
*
* Format: group.id = value 'desc' description
@@ -389,7 +389,7 @@ modparam("registrar", "path_mode", 0)
modparam("acc", "early_media", 0)
modparam("acc", "report_ack", 0)
modparam("acc", "report_cancels", 0)
-/* by default ww do not adjust the direct of the sequential requests.
+/* by default we do not adjust the direct of the sequential requests.
* if you enable this parameter, be sure the enable "append_fromtag"
* in "rr" module */
modparam("acc", "detect_direction", 0)
diff --git a/etc/sip-router.cfg b/etc/sip-router.cfg
index 0390ef7ec57..8669ea63d79 100644
--- a/etc/sip-router.cfg
+++ b/etc/sip-router.cfg
@@ -1,7 +1,7 @@
#
# $Id$
#
-# Example configuration file (simpler then ser-oob.cfg, but more
+# Example configuration file (simpler than ser-oob.cfg, but more
# complex then ser-basic.cfg).
#
# First start SER sample config script with:
@@ -73,7 +73,7 @@ rev_dns=no # (cmd. line: -R)
#group=ser
#disable_core=yes #disables core dumping
#open_fd_limit=1024 # sets the open file descriptors limit
-#mhomed=yes # usefull for multihomed hosts, small performance penalty
+#mhomed=yes # useful for multihomed hosts, small performance penalty
#disable_tcp=yes
#tcp_accept_aliases=yes # accepts the tcp alias via option (see NEWS)
sip_warning=yes
@@ -172,7 +172,7 @@ modparam("ctl", "binrpc", "tcp:127.0.0.1:2046")
# failed transactions (=negative responses) should be logged to
modparam("acc_db", "failed_transactions", 1)
-# comment the next line if you dont want to have accounting to DB
+# comment the next line if you don't want to have accounting to DB
modparam("acc_db", "log_flag", "FLAG_ACC")
# -- tm params --
@@ -197,7 +197,7 @@ modparam("tls", "private_key", "ser-selfsigned.key")
# -- xmlrpc params --
-# using a sub-route from the module is a lot safer then relying on the
+# using a sub-route from the module is a lot safer than relying on the
# request method to distinguish HTTP from SIP
modparam("xmlrpc", "route", "RPC");
@@ -358,8 +358,8 @@ route[RR]
# particularly good if upstream and downstream entities
# use different transport protocol
- # if the inital INVITE got the ACC flag store this in
- # an RR AVP cookie. this is more for demonstration purpose
+ # if the initial INVITE got the ACC flag store this in
+ # an RR AVP cookie. This is more for demonstration purpose
if (isflagset(FLAG_ACC)) {
$account = "yes";
setavpflag($account, "dialog_cookie");
@@ -377,7 +377,7 @@ route[DOMAIN]
# check if the callee is at a local domain
lookup_domain("$td", "@ruri.host");
- # we dont know the domain of the caller and also not
+ # we don't know the domain of the caller and also not
# the domain of the callee -> somone uses our proxy as
# a relay
if (strempty($t.did) && strempty($f.did)) {
@@ -528,7 +528,7 @@ route[INBOUND]
if (lookup_contacts("location")) {
append_hf("P-hint: usrloc applied\r\n");
- # we set the TM module timers according to the prefences
+ # we set the TM module timers according to the preferences
# of the callee (avoid too long ringing of his phones)
# Note1: timer values have to be in ms now!
# Note2: this makes even more sense if you switch to a voicemail
Hello,
(Adding sr-dev to CC)
This looks indeed a bit strange. Do you get any error messages in the log? In which process you are freeing the memory, one of the worker processes or the RPC process?
You could also try to use another memory manager to see if you get better performance. There is a command line parameter to choose one during startup.
Cheers,
Henning
--
Henning Westerholt - https://skalatan.de/blog/
Kamailio services - https://gilawa.com<https://gilawa.com/>
From: Chaigneau, Nicolas <nicolas.chaigneau(a)capgemini.com>
Sent: Wednesday, January 18, 2023 6:49 PM
To: Kamailio (SER) - Users Mailing List <sr-users(a)lists.kamailio.org>
Subject: [SR-Users] Performances issue when freeing shared memory in custom module (Kamailio 5.5.2)
Hello,
I'm encountering performance issues with Kamailio (5.5.2).
I'm using a custom Kamailio module that loads routing data in memory, using Kamailio shared memory.
This routing data is very large. It can be fully reloaded through a Kamailio RPC command (which is done once each day).
When reloading, two sets of data are maintained, one "loading" and another "current" (the latter being used to handle SIP requests).
When loading of the new data is finished, it is swapped to "current". Then, memory of the old (now unused) data is freed.
I've noticed that when Kamailio is freeing the old data, there is a very significant performance impact on SIP requests.
This is surprising to me, because the SIP requests do not use this old data.
This is not a CPU issue, idle CPU% is at about 99% at that moment.
I'm using the following functions :
- shm_mallocxz
- shm_free
From what I understand, shm_free is actually "qm_shm_free" defined in "src\core\mem\q_malloc.c" (the default shared memory manager being "qm").
I've noticed that there is also a variant shm_free_unsafe ("qm_free"), which does not perform locking.
I'm wondering if the lock could be the cause of my performances issues ?
(But I'm not sure how this could be possible, because although the SIP requests need to access the shared memory allocated, they do not use directly the functions from the share memory manager.)
If the performances issues are causes by the lock, could I use the unsafe version "safely" ? (considering that it is guaranteed that the old data cannot be used by anyone else)
Thanks for your help.
Regards,
Nicolas.
This message contains information that may be privileged or confidential and is the property of the Capgemini Group. It is intended only for the person to whom it is addressed. If you are not the intended recipient, you are not authorized to read, print, retain, copy, disseminate, distribute, or use this message or any part thereof. If you receive this message in error, please notify the sender immediately and delete all copies of this message.
**Description**
We are using ims_charging module and Freediameter as diameter server for billing process....recently we faced one issue...For Initial **INVITEs** kamailio sending **CCR request (INITIAL_REQUEST)** to **diameter server** but if we receive Immediate **CANCLE** for the **INVITE**, kamailio sending **CCR request ( TERMINATE_REQUEST )** without waiting for the **CCR request (INITIAL_REQUEST) response** from the **Diameter server.**..
**Expected behavior**
Kamailio has to send **CCR request ( TERMINATE_REQUEST )** after getting the **response** from the **INITIAL_REQUEST.**
**Additional Info**
kamailio server : 4.2
platform : linux
--
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/issues/2143