From 3fa9ad3d13746e72f251d877111066c8c873fff4 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Fri, 18 Jul 2008 16:33:56 +0000 Subject: Merged revisions 131970 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r131970 | tilghman | 2008-07-18 11:30:31 -0500 (Fri, 18 Jul 2008) | 2 lines Make the ast_assert call within ast_sched_del report something useful. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@131982 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_iax2.c | 4 ++-- include/asterisk/sched.h | 3 ++- main/sched.c | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 45ecffc7c..885ad2845 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -1202,8 +1202,8 @@ static void __send_lagrq(const void *data) /* I am the schedule, so I'm allowed to do this */ iaxs[callno]->lagid = -1; } - } else if (option_debug > 0) { - ast_log(LOG_DEBUG, "I was supposed to send a LAGRQ with callno %d, but no such call exists (and I cannot remove lagid, either).\n", callno); + } else { + ast_log(LOG_WARNING, "I was supposed to send a LAGRQ with callno %d, but no such call exists (and I cannot remove lagid, either).\n", callno); } ast_mutex_unlock(&iaxsl[callno]); diff --git a/include/asterisk/sched.h b/include/asterisk/sched.h index 8177d4991..f8d28d1a7 100644 --- a/include/asterisk/sched.h +++ b/include/asterisk/sched.h @@ -210,7 +210,8 @@ const void *ast_sched_find_data(struct sched_context *con, int id); * \param id ID of the scheduled item to delete * \return Returns 0 on success, -1 on failure */ -int ast_sched_del(struct sched_context *con, int id) attribute_warn_unused_result; +int _ast_sched_del(struct sched_context *con, int id, const char *file, int line, const char *function) attribute_warn_unused_result; +#define ast_sched_del(a, b) _ast_sched_del(a, b, __FILE__, __LINE__, __PRETTY_FUNCTION__) /*! \brief Determines number of seconds until the next outstanding event to take place * Determine the number of seconds until the next outstanding event diff --git a/main/sched.c b/main/sched.c index ee9d43125..6cc62861b 100644 --- a/main/sched.c +++ b/main/sched.c @@ -334,7 +334,7 @@ const void *ast_sched_find_data(struct sched_context *con, int id) * would be two or more in the list with that * id. */ -int ast_sched_del(struct sched_context *con, int id) +int _ast_sched_del(struct sched_context *con, int id, const char *file, int line, const char *function) { struct sched *s, tmp; @@ -373,7 +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); - ast_assert(s != NULL); + _ast_assert(0, "s != NULL", file, line, function); return -1; } -- cgit v1.2.3