From c78b57e4ae614c522c89808dab4d359e84171ac6 Mon Sep 17 00:00:00 2001 From: file Date: Fri, 27 Mar 2009 13:59:57 +0000 Subject: Merged revisions 184628 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r184628 | file | 2009-03-27 10:57:29 -0300 (Fri, 27 Mar 2009) | 6 lines Fix a potential race condition when creating a software based mixing bridge. It was possible for no timer to become available between creating the bridge and starting it. We now open a timer when creating it and keep it open until the bridge is destroyed. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@184629 f38db490-d61c-443f-a65b-d21fe96a405b --- bridges/bridge_softmix.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'bridges') diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c index 4f1e4d76f..73ac29660 100644 --- a/bridges/bridge_softmix.c +++ b/bridges/bridge_softmix.c @@ -91,7 +91,7 @@ static int softmix_bridge_create(struct ast_bridge *bridge) return -1; } - ast_timer_close(timingfd); + bridge->bridge_pvt = (void*)(unsigned long)timingfd; return 0; } @@ -199,11 +199,7 @@ static int softmix_bridge_poke(struct ast_bridge *bridge, struct ast_bridge_chan /*! \brief Function which acts as the mixing thread */ static int softmix_bridge_thread(struct ast_bridge *bridge) { - int timingfd; - - if ((timingfd = ast_timer_open()) < 0) { - return -1; - } + int timingfd = (unsigned short)(unsigned long)bridge->bridge_pvt; ast_timer_set_rate(timingfd, (1000 / SOFTMIX_INTERVAL)); @@ -267,7 +263,6 @@ static int softmix_bridge_thread(struct ast_bridge *bridge) ao2_lock(bridge); } - ast_timer_set_rate(timingfd, 0); ast_timer_close(timingfd); return 0; -- cgit v1.2.3