diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index 20e1fc4798f50390fb5c34c3fef60397d33333bb..decf022c45f6a4dca9237da9d47543dac94c2733 100644
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -1008,7 +1008,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 9fdc6deb7b08980d785f1304e943b12b09dc092c..5177734a490fc7394fd61c6ac74be1fe737f0c5c 100644
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -1597,18 +1597,10 @@ static inline enum ast_t38_state ast_channel_get_t38_state(struct ast_channel *c
return state;
}
-
-#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 be7d3fbfd402f52dea43bde5204a8f1f33da6f10..0de0727a7edca1cdc97ba17e97c38d421f47b4e4 100644
--- a/include/asterisk/utils.h
+++ b/include/asterisk/utils.h
@@ -654,6 +654,33 @@ int ast_mkdir(const char *path, int mode);
#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
+
#include "asterisk/strings.h"
#endif /* _ASTERISK_UTILS_H */
diff --git a/main/abstract_jb.c b/main/abstract_jb.c
index df822f5ea966068c00e983ecfccf4e20f3c38421..e51187d7b7294cf39d3746ea3ee220439f559362 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 099924470a6a224688efd88c7098b0a0cf685bb5..745d0cf9182e60671aa083924bb52365ca8d2dc4 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 e7f8496867349d46fdc727303aa74fcdd9caee0e..647ed808c944d64b86ffbba28e53cbbe0ae084c6 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 64ef413eab0f85d26348aeecc353409808cabc90..91d86164e55c9c7583deada54188cbe1a9b0cfc5 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 7dea4d89f37aa1d04ea61b398ae4aee79d8cb3c7..ea78f094a81e8e4b3e90cd6e4c65ca19f9dea47f 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;
}