Robin Cornelius, Aleric Inglewood: SNOW-196 missing mutexes for texture fetch

Applys a trylock() abort system to allow the worker thread to avoid deadlocks
due to a race between mQueueMutex and mWorkerMutex.

1 files changed, 11 insertions, 0 deletions

diff --git a/linden/indra/llcommon/llthread.cpp b/linden/indra/llcommon/llthread.cpp
index b39ffb6..60ccd5c 100644
--- a/linden/indra/llcommon/llthread.cpp
+++ b/linden/indra/llcommon/llthread.cpp
@@ -322,6 +322,17 @@ bool LLMutex::isLocked()
         }
 }
 
+//trys to grab a lock and if sucessful returns true
+bool LLMutex::tryLock()
+{
+        apr_status_t status = apr_thread_mutex_trylock(mAPRMutexp);
+        if (APR_STATUS_IS_EBUSY(status))
+        {       
+                return false;
+        }
+        return true;
+}
+
 //============================================================================
 
 LLCondition::LLCondition(apr_pool_t *poolp) :