diff options
| author | Matthew Jordan <mjordan@digium.com> | 2012-11-05 23:10:14 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2012-11-05 23:10:14 +0000 |
| commit | a0c363e227aa728ea0a1ddad048683a82a373cca (patch) | |
| tree | 6c89b8c6a9399b38863e8203849a4f90530bde26 /bridges | |
| parent | 5336a97f25c67220384b2c602d23748dd31c7c29 (diff) | |
Refactor ast_timer_ack to return an error and handle the error in timer users
Currently, if an acknowledgement of a timer fails Asterisk will not realize
that a serious error occurred and will continue attempting to use the timer's
file descriptor. This can lead to situations where errors stream to the
CLI/log file. This consumes significant resources, masks the actual problem
that occurred (whatever caused the timer to fail in the first place), and
can leave channels in odd states.
This patch propagates the errors in the timing resource modules up through
the timer core, and makes users of these timers handle acknowledgement
failures. It also adds some defensive coding around the use of timers
to prevent using bad file descriptors in off nominal code paths.
Note that the patch created by the issue reporter was modified slightly for
this commit and backported to 1.8, as it was originally written for
Asterisk 10.
Review: https://reviewboard.asterisk.org/r/2178/
(issue ASTERISK-20032)
Reported by: Jeremiah Gowdy
patches:
jgowdy-timerfd-6-22-2012.diff uploaded by Jeremiah Gowdy (license 6358)
........
Merged revisions 375893 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 375894 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 375895 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375896 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/bridge_softmix.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c index dba0de514..1a0b4fc18 100644 --- a/bridges/bridge_softmix.c +++ b/bridges/bridge_softmix.c @@ -300,6 +300,7 @@ static void softmix_bridge_data_destroy(void *obj) if (softmix_data->timer) { ast_timer_close(softmix_data->timer); + softmix_data->timer = NULL; } } @@ -885,7 +886,11 @@ static int softmix_bridge_thread(struct ast_bridge *bridge) softmix_translate_helper_cleanup(&trans_helper); /* Wait for the timing source to tell us to wake up and get things done */ ast_waitfor_n_fd(&timingfd, 1, &timeout, NULL); - ast_timer_ack(timer, 1); + if (ast_timer_ack(timer, 1) < 0) { + ast_log(LOG_ERROR, "Failed to acknowledge timer in softmix bridge\n"); + ao2_lock(bridge); + goto softmix_cleanup; + } ao2_lock(bridge); /* make sure to detect mixing interval changes if they occur. */ |