diff options
author | Russell Bryant <russell@russellbryant.com> | 2008-05-14 21:40:43 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2008-05-14 21:40:43 +0000 |
commit | 08f91c1192559e847f955c57e7b259a9f1560a43 (patch) | |
tree | a37ef618305865e834fceab21afbecc8214fa482 /main | |
parent | c51989a309f2b50714f4c1bcad3987913fdb1f56 (diff) |
Merged revisions 116463 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r116463 | russell | 2008-05-14 16:32:00 -0500 (Wed, 14 May 2008) | 4 lines
Add ast_assert(), which can be used to handle fatal errors. It is only compiled
in if dev-mode is enabled, and only aborts if DO_CRASH is defined.
(inspired by issue #12650)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@116469 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r-- | main/abstract_jb.c | 4 | ||||
-rw-r--r-- | main/channel.c | 4 | ||||
-rw-r--r-- | main/rtp.c | 6 | ||||
-rw-r--r-- | main/sched.c | 4 | ||||
-rw-r--r-- | main/udptl.c | 3 |
5 files changed, 8 insertions, 13 deletions
diff --git a/main/abstract_jb.c b/main/abstract_jb.c index df822f5ea..e51187d7b 100644 --- a/main/abstract_jb.c +++ b/main/abstract_jb.c @@ -430,7 +430,7 @@ static void jb_get_and_deliver(struct ast_channel *chan) return; default: ast_log(LOG_ERROR, "This should never happen!\n"); - CRASH; + ast_assert(0); break; } @@ -486,7 +486,7 @@ static int create_jb(struct ast_channel *chan, struct ast_frame *frr) bridged = ast_bridged_channel(chan); if (!bridged) { /* We should always have bridged chan if a jitterbuffer is in use */ - CRASH; + ast_assert(0); } snprintf(name1, sizeof(name1), "%s", bridged->name); tmp = strchr(name1, '/'); diff --git a/main/channel.c b/main/channel.c index 099924470..745d0cf91 100644 --- a/main/channel.c +++ b/main/channel.c @@ -982,7 +982,7 @@ int ast_queue_frame(struct ast_channel *chan, struct ast_frame *fin) if (((fin->frametype == AST_FRAME_VOICE) && (qlen > 96)) || (qlen > 128)) { if (fin->frametype != AST_FRAME_VOICE) { ast_log(LOG_WARNING, "Exceptionally long queue length queuing to %s\n", chan->name); - CRASH; + ast_assert(0); } else { ast_debug(1, "Dropping voice to exceptionally long queue on %s\n", chan->name); ast_frfree(f); @@ -1625,7 +1625,7 @@ int ast_hangup(struct ast_channel *chan) ast_log(LOG_WARNING, "Hard hangup called by thread %ld on %s, while fd " "is blocked by thread %ld in procedure %s! Expect a failure\n", (long)pthread_self(), chan->name, (long)chan->blocker, chan->blockproc); - CRASH; + ast_assert(0); } if (!ast_test_flag(chan, AST_FLAG_ZOMBIE)) { ast_debug(1, "Hanging up channel '%s'\n", chan->name); diff --git a/main/rtp.c b/main/rtp.c index e7f849686..647ed808c 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -1096,8 +1096,7 @@ struct ast_frame *ast_rtcp_read(struct ast_rtp *rtp) rtcpheader = (unsigned int *)(rtcpdata + AST_FRIENDLY_OFFSET); if (res < 0) { - if (errno == EBADF) - CRASH; + ast_assert(errno != EBADF); if (errno != EAGAIN) { ast_log(LOG_WARNING, "RTCP Read error: %s. Hanging up.\n", strerror(errno)); return NULL; @@ -1440,8 +1439,7 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp) rtpheader = (unsigned int *)(rtp->rawdata + AST_FRIENDLY_OFFSET); if (res < 0) { - if (errno == EBADF) - CRASH; + ast_assert(errno != EBADF); if (errno != EAGAIN) { ast_log(LOG_WARNING, "RTP Read error: %s. Hanging up.\n", strerror(errno)); return NULL; diff --git a/main/sched.c b/main/sched.c index 64ef413ea..91d86164e 100644 --- a/main/sched.c +++ b/main/sched.c @@ -373,9 +373,7 @@ int ast_sched_del(struct sched_context *con, int id) if (!s) { ast_debug(1, "Attempted to delete nonexistent schedule entry %d!\n", id); -#ifdef DO_CRASH - CRASH; -#endif + ast_assert(0); return -1; } diff --git a/main/udptl.c b/main/udptl.c index 7dea4d89f..ea78f094a 100644 --- a/main/udptl.c +++ b/main/udptl.c @@ -659,8 +659,7 @@ struct ast_frame *ast_udptl_read(struct ast_udptl *udptl) if (res < 0) { if (errno != EAGAIN) ast_log(LOG_WARNING, "UDPTL read error: %s\n", strerror(errno)); - if (errno == EBADF) - CRASH; + ast_assert(errno != EBADF); return &ast_null_frame; } |