<!-- 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) - [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 - [x] 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 As you can see looking at the modifications stats counters where increment twice.
Hi @oej, If you find a few minutes you could review this MR. Not sure if you remember, this was introduced in a bug fix (see below) I kept some of your modifications, they seem more strait forward anyway.
``` commit b0cd09d2b451005a736396e6f38eac139ec31301 Author: Olle E. Johansson oej@edvina.net Date: Wed May 11 21:59:44 2016 +0200
dialog Make sure statistics are updated when initializing from database
Issue #424 ``` You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/1566
-- Commit Summary --
* [dialog] stats incremented twice
-- File Changes --
M src/modules/dialog/dialog.c (7) M src/modules/dialog/dlg_db_handler.c (2)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/1566.patch https://github.com/kamailio/kamailio/pull/1566.diff
update_stat is optimized `inline static void update_stat(stat_var* v, int n)` so the extra code to call `if_update_stat` only once was indeed not needed
Thank you for the patch. It seems that there was a change in the functionality regarding the stats counter implementation. I don't understand your comment regarding the update_stats method though. In your patch the if_update_stat macro is called, which then calls update_stat.?
Hi Henning, in the end we where calling `if_update_stat` twice. This code is only called when retrieving dialog from the DB.
Yes my comment was about removing the optimized version and keeping the simpler one, `if_update_stat` is is a macro calling several inline functions. One way of calling it was to using a counter when in order to call `if_update_stat` only once. Then as second call to `if_update_stat` was added in `b0cd09` probably because the optimization with the counter was obfuscating things slightly.
I think the optimization are not needed the cost per dialog seems very low. But we could still select to keep the optimized version if we want, knowing that since 2016 both version where used anyway
Merged #1566.
Thank you