kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-22 04:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Finally, a method that really fixes the assertions in chan_iax2.c related to cancelling lagid.

Browse Source 
No, replacing usleep(1) with sched_yield() did not have an effect.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@277484 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-07-16 20:35:28 +00:00
parent 34bc4b1dcb
commit fe9e0e672e
2 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
main/sched.c
View File

@@ -46,6 +46,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/dlinkedlists.h"
#include "asterisk/hashtab.h"
#include "asterisk/heap.h"
#include "asterisk/threadstorage.h"
AST_THREADSTORAGE(last_del_id);
struct sched {
AST_LIST_ENTRY(sched) list;
@@ -450,7 +453,7 @@ const void *ast_sched_find_data(struct sched_context *con, int id)
return res->data;
return NULL;
}
/*! \brief
* Delete the schedule entry with number
* "id". It's nearly impossible that there
@@ -466,9 +469,14 @@ int _ast_sched_del(struct sched_context *con, int id, const char *file, int line
struct sched *s, tmp = {
.id = id,
};
int *last_id = ast_threadstorage_get(&last_del_id, sizeof(int *));
DEBUG(ast_debug(1, "ast_sched_del(%d)\n", id));
if (id < 0) {
return 0;
}
ast_mutex_lock(&con->lock);
s = ast_hashtab_lookup(con->schedq_ht, &tmp);
if (s) {
@@ -484,7 +492,7 @@ int _ast_sched_del(struct sched_context *con, int id, const char *file, int line
sched_release(con, s);
}
#ifdef DUMP_SCHEDULER
/* Dump contents of the context while we have the lock so nothing gets screwed up by accident. */
if (option_debug)
@@ -492,16 +500,23 @@ int _ast_sched_del(struct sched_context *con, int id, const char *file, int line
#endif
ast_mutex_unlock(&con->lock);
if (!s) {
if (!s && *last_id != id) {
ast_debug(1, "Attempted to delete nonexistent schedule entry %d!\n", id);
#ifndef AST_DEVMODE
ast_assert(s != NULL);
#else
_ast_assert(0, "s != NULL", file, line, function);
{
char buf[100];
snprintf(buf, sizeof(buf), "s != NULL, id=%d", id);
_ast_assert(0, buf, file, line, function);
}
#endif
*last_id = id;
return -1;
} else if (!s) {
return -1;
}
return 0;
}