diff options
| author | Mark Michelson <mmichelson@digium.com> | 2013-12-03 17:07:29 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2013-12-03 17:07:29 +0000 |
| commit | 8e8b329e14ad2e4d747c4c4eb33c118305401aee (patch) | |
| tree | 200a9b111d9cf75ab980aedf53ee714b7cc398f2 /tests/test_cel.c | |
| parent | 8b24b0d20647697c9ee899dea85871465c3032cb (diff) | |
Add channel locking for channel snapshot creation.
This adds channel locks around calls to create channel snapshots as well
as other functions which operate on a channel and then end up
creating a channel snapshot. Functions that expect the channel to be
locked prior to being called have had their documentation updated to
indicate such.
........
Merged revisions 403311 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403314 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'tests/test_cel.c')
| -rw-r--r-- | tests/test_cel.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/test_cel.c b/tests/test_cel.c index 0aa8b601c..a90dfbf3e 100644 --- a/tests/test_cel.c +++ b/tests/test_cel.c @@ -1551,10 +1551,14 @@ AST_TEST_DEFINE(test_cel_local_optimize) CREATE_ALICE_CHANNEL(chan_alice, &alice_caller); CREATE_BOB_CHANNEL(chan_bob, &bob_caller); + ast_channel_lock(chan_alice); alice_snapshot = ast_channel_snapshot_create(chan_alice); + ast_channel_unlock(chan_alice); ast_test_validate(test, alice_snapshot != NULL); + ast_channel_lock(chan_bob); bob_snapshot = ast_channel_snapshot_create(chan_bob); + ast_channel_unlock(chan_bob); ast_test_validate(test, bob_snapshot != NULL); ast_multi_channel_blob_add_channel(mc_blob, "1", alice_snapshot); @@ -1675,7 +1679,9 @@ static int append_expected_event( const char *peer) { RAII_VAR(struct ast_channel_snapshot *, snapshot, NULL, ao2_cleanup); + ast_channel_lock(chan); snapshot = ast_channel_snapshot_create(chan); + ast_channel_unlock(chan); if (!snapshot) { return -1; } |