diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2014-04-04 17:57:46 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2014-04-04 17:57:46 +0000 |
| commit | 9be438299d47e71a36d252ea55d5432ac751504f (patch) | |
| tree | 2a59d59bca780d66e241901f477c630a17ded9b2 /res/res_musiconhold.c | |
| parent | 73f337d97be6600f283a6149a7dfd107fb3a66e3 (diff) | |
Add some asserts that were handy when looking for a stasis cache problem.
* Assert if a channel is destroyed but has the snapshot staging flag set.
In this case the final channel destruction snapshot would never get taken.
* Assert if what we just got out of the stasis cache is not what we were
looking for. This assert would have saved several days searching for a
bug and a lot of my hair.
* Assert if the music on hold message posts could not find the associated
channel. A crash will happen later when manager tries to send the MOH AMI
message. This assert catches the problem when the stasis message is
posted instead of by the thread processing the defective message.
* Always generate a backtrace when an ast_assert() fails.
Review: https://reviewboard.asterisk.org/r/3411/
........
Merged revisions 411701 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@411702 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_musiconhold.c')
| -rw-r--r-- | res/res_musiconhold.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index f5c820e75..d95b2fd12 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -280,6 +280,9 @@ static void moh_post_start(struct ast_channel *chan, const char *moh_class_name) message = ast_channel_blob_create_from_cache(ast_channel_uniqueid(chan), ast_channel_moh_start_type(), json_object); if (message) { + /* A channel snapshot must have been in the cache. */ + ast_assert(((struct ast_channel_blob *) stasis_message_data(message))->snapshot != NULL); + stasis_publish(ast_channel_topic(chan), message); } ao2_cleanup(message); @@ -295,6 +298,9 @@ static void moh_post_stop(struct ast_channel *chan) message = ast_channel_blob_create_from_cache(ast_channel_uniqueid(chan), ast_channel_moh_stop_type(), NULL); if (message) { + /* A channel snapshot must have been in the cache. */ + ast_assert(((struct ast_channel_blob *) stasis_message_data(message))->snapshot != NULL); + stasis_publish(ast_channel_topic(chan), message); } ao2_cleanup(message); |