diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-18 17:33:42 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-18 17:33:42 +0000 |
| commit | 70ab5fa3fce20b7bebc0a55652455f6085b9784f (patch) | |
| tree | faf66c80d354058deb3628508e18fdd199b6a6d4 | |
| parent | 422200b6f0f05e9767b9b40f78cd9700395ba703 (diff) | |
Spinlock within the destroy, to allow a scheduled job to continue, if it's
waiting on the mutex which the destroy thread has.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@132042 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_iax2.c | 4 | ||||
| -rw-r--r-- | include/asterisk/sched.h | 16 |
2 files changed, 18 insertions, 2 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 86775358f..44e11eea3 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -1306,8 +1306,8 @@ retry: } } if (!owner && iaxs[callno]) { - AST_SCHED_DEL(sched, iaxs[callno]->lagid); - AST_SCHED_DEL(sched, iaxs[callno]->pingid); + AST_SCHED_DEL_SPINLOCK(sched, iaxs[callno]->lagid, &iaxsl[callno]); + AST_SCHED_DEL_SPINLOCK(sched, iaxs[callno]->pingid, &iaxsl[callno]); iaxs[callno] = NULL; } diff --git a/include/asterisk/sched.h b/include/asterisk/sched.h index 0a601c7b4..5e51529b9 100644 --- a/include/asterisk/sched.h +++ b/include/asterisk/sched.h @@ -60,6 +60,22 @@ extern "C" { (_sched_res); \ }) +#define AST_SCHED_DEL_SPINLOCK(sched, id, lock) \ + ({ \ + int _count = 0; \ + int _sched_res = -1; \ + while (id > -1 && (_sched_res = ast_sched_del(sched, id)) && ++_count < 10) { \ + ast_mutex_unlock(lock); \ + usleep(1); \ + ast_mutex_lock(lock); \ + } \ + if (_count == 10 && option_debug > 2) { \ + ast_log(LOG_DEBUG, "Unable to cancel schedule ID %d.\n", id); \ + } \ + id = -1; \ + (_sched_res); \ + }) + struct sched_context; /*! \brief New schedule context |