diff options
author | Matthew Jordan <mjordan@digium.com> | 2013-12-19 00:50:01 +0000 |
---|---|---|
committer | Matthew Jordan <mjordan@digium.com> | 2013-12-19 00:50:01 +0000 |
commit | 7e9febbf86f7a9aa0cc1d9852d1ed1b77f25b3ce (patch) | |
tree | fafe2c3b45211d267449024e44dd10f65ac77e9d /main/cdr.c | |
parent | af723c6572e988753c24cbb911d6b521600f4a3f (diff) |
app_cdr,app_forkcdr,func_cdr: Synchronize with engine when manipulating state
When doing the rework of the CDR engine that pushed all of the logic into cdr.c
and made it respond to changes in channel state over Stasis, we knew that
accessing the CDR engine from the dialplan would be "slightly"
non-deterministic. Dialplan threads would be accessing CDRs while Stasis
threads would be updating the state of said CDRs - whereas in the past,
everything happened on the dialplan threads. Tests have shown that "slightly"
is in reality "very".
This patch synchronizes things by making the dialplan applications/functions
that manipulate CDRs do so over Stasis. ForkCDR, NoCDR, ResetCDR, CDR, and
CDR_PROP now all use Stasis to send their requests over to the CDR engine,
and synchronize on the channel Stasis topic via a subscription so that they
return their values/control to the dialplan at the appropriate time.
While going through this, the following changes were also made:
* DISA, which can reset the CDR when a user successfully authenticates, now
just uses the ResetCDR app to do this. This prevents having to duplicate
the same Stasis synchronization logic in that application.
* Answer no longer disables CDRs. It actually didn't work anyway - calling
DISABLE on the channel's CDR doesn't stop the CDR from getting the Answer
time - it just kills all CDRs on that channel, which isn't what the caller
would intend.
(closes issue ASTERISK-22884)
(closes issue ASTERISK-22886)
Review: https://reviewboard.asterisk.org/r/3057/
........
Merged revisions 404294 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@404295 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/cdr.c')
-rw-r--r-- | main/cdr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/cdr.c b/main/cdr.c index 63648361d..593f47152 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -3269,7 +3269,7 @@ int ast_cdr_clear_property(const char *channel_name, enum ast_cdr_options option return 0; } -int ast_cdr_reset(const char *channel_name, struct ast_flags *options) +int ast_cdr_reset(const char *channel_name, int keep_variables) { RAII_VAR(struct cdr_object *, cdr, cdr_object_get_by_name(channel_name), ao2_cleanup); struct ast_var_t *vardata; @@ -3282,7 +3282,7 @@ int ast_cdr_reset(const char *channel_name, struct ast_flags *options) ao2_lock(cdr); for (it_cdr = cdr; it_cdr; it_cdr = it_cdr->next) { /* clear variables */ - if (!ast_test_flag(options, AST_CDR_FLAG_KEEP_VARS)) { + if (!keep_variables) { while ((vardata = AST_LIST_REMOVE_HEAD(&it_cdr->party_a.variables, entries))) { ast_var_delete(vardata); } |