kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent multiple CDR batches from conflicting when scheduling the CDR write

Browse Source 
The Asterisk Test Suite caught an error condition where a scheduled CDR batch
write can be deleted twice if two channels attempt to post their CDRs at the
same time.  The batch CDR mutex is locked while the CDRs are appended to the
current batch list; however, it is unlocked prior to actually scheduling the
CDR write.  As such, two threads can attempt to remove the currently scheduled
batch write at the same time, resulting in an assertion error.

This patch extends the time that the mutex is locked to encompass actually
scheduling the write.  This prevents two threads from unscheduling the
currently scheduled write at the same time.
........

Merged revisions 375727 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 375728 from http://svn.asterisk.org/svn/asterisk/branches/10
........

Merged revisions 375729 from http://svn.asterisk.org/svn/asterisk/branches/11


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375730 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2012-11-04 00:02:06 +00:00
parent 27a9bab706
commit 19282f682e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main/cdr.c
View File

@@ -1424,11 +1424,13 @@ void ast_cdr_detach(struct ast_cdr *cdr)
newtail->cdr = cdr;
batch->tail = newtail;
curr = batch->size++;
ast_mutex_unlock(&cdr_batch_lock);
/* if we have enough stuff to post, then do it */
if (curr >= (batchsize - 1))
if (curr >= (batchsize - 1)) {
submit_unscheduled_batch();
}
ast_mutex_unlock(&cdr_batch_lock);
}
static void *do_cdr(void *data)