diff options
| author | Corey Farrell <git@cfware.com> | 2015-02-19 02:01:34 +0000 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2015-02-19 02:01:34 +0000 |
| commit | eb9448a1ae18bf16074346bdaae5e0d29d3bcd38 (patch) | |
| tree | 8edb32f30e14e1450ba46c23aa67f06baa299dea /main/sched.c | |
| parent | 6d3fcfc3c2f49b3909b7ae0ebb74d99e2fedbb65 (diff) | |
Create work around for scheduler leaks during shutdown.
* Added ast_sched_clean_by_callback for cleanup of scheduled events
that have not yet fired.
* Run all pending peercnt_remove_cb and replace_callno events in chan_iax2.
Cleanup of replace_callno events is only run 11, since it no longer
releases any references or allocations in 13+.
ASTERISK-24451 #close
Reported by: Corey Farrell
Review: https://reviewboard.asterisk.org/r/4425/
........
Merged revisions 431916 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@431917 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/sched.c')
| -rw-r--r-- | main/sched.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/main/sched.c b/main/sched.c index 34f8d5369..8fdbfed36 100644 --- a/main/sched.c +++ b/main/sched.c @@ -289,6 +289,26 @@ static void sched_release(struct ast_sched_context *con, struct sched *tmp) sched_free(tmp); } +void ast_sched_clean_by_callback(struct ast_sched_context *con, ast_sched_cb match, ast_sched_cb cleanup_cb) +{ + int i = 1; + struct sched *current; + + ast_mutex_lock(&con->lock); + while ((current = ast_heap_peek(con->sched_heap, i))) { + if (current->callback != match) { + i++; + continue; + } + + ast_heap_remove(con->sched_heap, current); + + cleanup_cb(current->data); + sched_release(con, current); + } + ast_mutex_unlock(&con->lock); +} + /*! \brief * Return the number of milliseconds * until the next scheduled event |