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_stasis_channels.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_stasis_channels.c')
| -rw-r--r-- | tests/test_stasis_channels.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/test_stasis_channels.c b/tests/test_stasis_channels.c index 45f1e2ba3..b7c9fe2c5 100644 --- a/tests/test_stasis_channels.c +++ b/tests/test_stasis_channels.c @@ -77,10 +77,12 @@ AST_TEST_DEFINE(channel_blob_create) "foo", "bar"); /* Off nominal creation */ + ast_channel_lock(chan); ast_test_validate(test, NULL == ast_channel_blob_create(chan, NULL, json)); /* Test for single channel */ msg = ast_channel_blob_create(chan, type, json); + ast_channel_unlock(chan); ast_test_validate(test, NULL != msg); blob = stasis_message_data(msg); ast_test_validate(test, NULL != blob); @@ -129,7 +131,9 @@ AST_TEST_DEFINE(null_blob) "foo", "bar"); /* Test for single channel */ + ast_channel_lock(chan); msg = ast_channel_blob_create(chan, type, NULL); + ast_channel_unlock(chan); ast_test_validate(test, NULL != msg); blob = stasis_message_data(msg); ast_test_validate(test, NULL != blob); @@ -196,9 +200,15 @@ AST_TEST_DEFINE(multi_channel_blob_snapshots) chan_charlie = ast_channel_alloc(0, AST_STATE_DOWN, "300", "Bob", "300", "300", "default", NULL, 0, "TEST/Charlie"); blob = ast_multi_channel_blob_create(json); + ast_channel_lock(chan_alice); ast_multi_channel_blob_add_channel(blob, "Caller", ast_channel_snapshot_create(chan_alice)); + ast_channel_unlock(chan_alice); + ast_channel_lock(chan_bob); ast_multi_channel_blob_add_channel(blob, "Peer", ast_channel_snapshot_create(chan_bob)); + ast_channel_unlock(chan_bob); + ast_channel_lock(chan_charlie); ast_multi_channel_blob_add_channel(blob, "Peer", ast_channel_snapshot_create(chan_charlie)); + ast_channel_unlock(chan_charlie); /* Test for unknown role */ ast_test_validate(test, NULL == ast_multi_channel_blob_get_channel(blob, "Foobar")); @@ -252,7 +262,9 @@ AST_TEST_DEFINE(channel_snapshot_json) chan = ast_channel_alloc(0, AST_STATE_DOWN, "cid_num", "cid_name", "acctcode", "exten", "context", NULL, 0, "TEST/name"); ast_test_validate(test, NULL != chan); + ast_channel_lock(chan); snapshot = ast_channel_snapshot_create(chan); + ast_channel_unlock(chan); ast_test_validate(test, NULL != snapshot); actual = ast_channel_snapshot_to_json(snapshot, NULL); |