<!-- Kamailio Pull Request Template -->
<!-- IMPORTANT: - for detailed contributing guidelines, read: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md - pull requests must be done to master branch, unless they are backports of fixes from master branch to a stable branch - backports to stable branches must be done with 'git cherry-pick -x ...' - code is contributed under BSD for core and main components (tm, sl, auth, tls) - code is contributed GPLv2 or a compatible license for the other components - GPL code is contributed with OpenSSL licensing exception -->
#### Pre-Submission Checklist <!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply --> <!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above--> <!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list --> - [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) - [ ] 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) - [ ] Breaking change (fix or feature that would change existing functionality)
#### Checklist: <!-- Go over all points below, and after creating the PR, tick the checkboxes that apply --> - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description <!-- Describe your changes in detail --> By reusing the pcre_md structure needed by pcre2_match function we see improvements of 10x in the time of dp_translate() function call (via benchmark module). You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/4289
-- Commit Summary --
* dialplan: improve performance by reusing PCRE structure
-- File Changes --
M src/modules/dialplan/dp_repl.c (36)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/4289.patch https://github.com/kamailio/kamailio/pull/4289.diff
henningw left a comment (kamailio/kamailio#4289)
Thanks for the PR - nice catch. I don't use this particular module that often, lets wait a bit for other feedback.
@linuxmaniac commented on this pull request.
@@ -427,6 +427,14 @@ int rule_translate(sip_msg_t *msg, str *instr, dpl_node_t *rule,
return 0; }
+ if(pcre_md == NULL) { + pcre_md = pcre2_match_data_create(MAX_REPLACE_WITH, NULL);
if we don't set the second parameter we are no longer using ``pcre2_compile_context *dpl_ctx`` that we were using implicitly when using ``pcre2_match_data_create_from_pattern`` so we no longer using ``pcre2_malloc/pcre2_free`` are you aware of that change?
Since you are using ``static`` now I'm assuming we don't really need to use shm here. But, nevertheless, we will end up using plain ``malloc/free`` and not ``pkg_malloc/pkg_free``
@lbalaceanu commented on this pull request.
@@ -427,6 +427,14 @@ int rule_translate(sip_msg_t *msg, str *instr, dpl_node_t *rule,
return 0; }
+ if(pcre_md == NULL) { + pcre_md = pcre2_match_data_create(MAX_REPLACE_WITH, NULL);
Hi @linuxmaniac - thank you, I was not aware about that compile context usage you mentioned. However, I also think that because we are using a static variable we can get away with allocating via malloc/free once. Please tell me if you want it changed however.
linuxmaniac left a comment (kamailio/kamailio#4289)
fine for me
lbalaceanu left a comment (kamailio/kamailio#4289)
Can I merge then?
Merged #4289 into master.
-
Henning Westerholt -
Lucian Balaceanu
-
Victor Seva