kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make the ast_assert call within ast_sched_del report something useful.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@131970 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-07-18 16:30:31 +00:00
parent ced50934cb
commit 64bbce9b9b
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
channels/chan_iax2.c
View File

@@ -1051,8 +1051,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]);

3
include/asterisk/sched.h
View File

@@ -118,7 +118,8 @@ int ast_sched_add_variable(struct sched_context *con, int when, ast_sched_cb cal
* \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);
int _ast_sched_del(struct sched_context *con, int id, const char *file, int line, const char *function);
#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

4
main/sched.c
View File

@@ -255,7 +255,7 @@ int ast_sched_add(struct sched_context *con, int when, ast_sched_cb callback, co
* 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;
@@ -282,7 +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);
ast_assert(s != NULL);
_ast_assert(0, "s != NULL", file, line, function);
return -1;
}