From 9d43f99be12ad40d3bfca75854bf3e09b59b675e Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Sun, 30 Sep 2007 03:05:04 +0000 Subject: [PATCH] * The documentation for the LOCK() function says that it will block for up to 3 seconds while waiting on a lock when other locks are currently held to avoid deadlocks. Change the code to reflect this. * Since trying to grab a lock may block for some time, put the channel in autoservice so that audio is still read from the channel and that any active generators on the channel don't pause. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84143 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- funcs/func_lock.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/funcs/func_lock.c b/funcs/func_lock.c index 8c08f85c6c..b8c6853406 100644 --- a/funcs/func_lock.c +++ b/funcs/func_lock.c @@ -187,11 +187,12 @@ static int get_lock(struct ast_channel *chan, char *lockname, int try) /* Okay, we have both frames, so now we need to try to lock the mutex. */ if (count_channel_locks > 1) { - /* If we fail after a certain number of attempts, assume a possible deadlock and bail. */ - int x; - for (x = 0; x < 30; x++) { + struct timeval start = ast_tvnow(); + for (;;) { if ((res = ast_mutex_trylock(¤t->mutex)) == 0) break; + if (ast_tvdiff_ms(ast_tvnow(), start) > 3000) + break; /* bail after 3 seconds of waiting */ usleep(1); } } else { @@ -256,13 +257,19 @@ static int unlock_read(struct ast_channel *chan, const char *cmd, char *data, ch static int lock_read(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len) { + ast_autoservice_start(chan); ast_copy_string(buf, get_lock(chan, data, 0) ? "0" : "1", len); + ast_autoservice_stop(chan); + return 0; } static int trylock_read(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len) { + ast_autoservice_start(chan); ast_copy_string(buf, get_lock(chan, data, 1) ? "0" : "1", len); + ast_autoservice_stop(chan); + return 0; }