diff options
| -rw-r--r-- | channels/chan_agent.c | 2 | ||||
| -rw-r--r-- | include/asterisk/channel.h | 7 | ||||
| -rw-r--r-- | include/asterisk/utils.h | 27 | ||||
| -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 |
8 files changed, 36 insertions, 21 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c index ae6d093c7..4149f1c7f 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -1051,7 +1051,7 @@ static struct ast_channel *agent_new(struct agent_pvt *p, int state) if (p->chan) { if (ast_test_flag(p->chan, AST_FLAG_BLOCKING)) { ast_log( LOG_ERROR, "A blocker exists after agent channel ownership acquired\n" ); - CRASH; + ast_assert(0); } } return tmp; diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 1172274f7..41371ccc0 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -1340,17 +1340,10 @@ static inline int ast_select(int nfds, fd_set *rfds, fd_set *wfds, fd_set *efds, #endif } -#ifdef DO_CRASH -#define CRASH do { fprintf(stderr, "!! Forcing immediate crash a-la abort !!\n"); *((int *)0) = 0; } while(0) -#else -#define CRASH do { } while(0) -#endif - #define CHECK_BLOCKING(c) do { \ if (ast_test_flag(c, AST_FLAG_BLOCKING)) {\ if (option_debug) \ ast_log(LOG_DEBUG, "Thread %ld Blocking '%s', already blocked by thread %ld in procedure %s\n", (long) pthread_self(), (c)->name, (long) (c)->blocker, (c)->blockproc); \ - CRASH; \ } else { \ (c)->blocker = pthread_self(); \ (c)->blockproc = __PRETTY_FUNCTION__; \ diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h index 1e5203671..44994f4c0 100644 --- a/include/asterisk/utils.h +++ b/include/asterisk/utils.h @@ -562,4 +562,31 @@ void ast_enable_packet_fragmentation(int sock); #define ARRAY_LEN(a) (sizeof(a) / sizeof(a[0])) +#ifdef AST_DEVMODE +#define ast_assert(a) _ast_assert(a, # a, __FILE__, __LINE__, __PRETTY_FUNCTION__) +static void force_inline _ast_assert(int condition, const char *condition_str, + const char *file, int line, const char *function) +{ + if (__builtin_expect(!condition, 1)) { + /* Attempt to put it into the logger, but hope that at least someone saw the + * message on stderr ... */ + ast_log(LOG_ERROR, "FRACK!, Failed assertion %s (%d) at line %d in %s of %s\n", + condition_str, condition, line, function, file); + fprintf(stderr, "FRACK!, Failed assertion %s (%d) at line %d in %s of %s\n", + condition_str, condition, line, function, file); + /* Give the logger a chance to get the message out, just in case we abort(), or + * Asterisk crashes due to whatever problem just happened after we exit ast_assert(). */ + usleep(1); +#ifdef DO_CRASH + abort(); + /* Just in case abort() doesn't work or something else super silly, + * and for Qwell's amusement. */ + *((int*)0)=0; +#endif + } +} +#else +#define ast_assert(a) +#endif + #endif /* _ASTERISK_UTILS_H */ diff --git a/main/abstract_jb.c b/main/abstract_jb.c index ed2600070..25bd8fd0d 100644 --- a/main/abstract_jb.c +++ b/main/abstract_jb.c @@ -433,7 +433,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; } @@ -489,7 +489,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 d9ab77c38..392b0b113 100644 --- a/main/channel.c +++ b/main/channel.c @@ -912,7 +912,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 { if (option_debug) ast_log(LOG_DEBUG, "Dropping voice to exceptionally long queue on %s\n", chan->name); @@ -1476,7 +1476,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)) { if (option_debug) diff --git a/main/rtp.c b/main/rtp.c index 658bd0891..2597fb178 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -855,8 +855,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; @@ -1134,8 +1133,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 04589a018..935e85398 100644 --- a/main/sched.c +++ b/main/sched.c @@ -282,9 +282,7 @@ int ast_sched_del(struct sched_context *con, int id) if (!s) { if (option_debug) ast_log(LOG_DEBUG, "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 718b46fb8..a9386ac09 100644 --- a/main/udptl.c +++ b/main/udptl.c @@ -639,8 +639,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; } |