Merge commit 'jacek/next' into gst-revamp

3 files changed, 11 insertions, 13 deletions

diff --git a/linden/indra/llcommon/llerror.cpp b/linden/indra/llcommon/llerror.cpp
index 5c7c3cd..b95b325 100644
--- a/linden/indra/llcommon/llerror.cpp
+++ b/linden/indra/llcommon/llerror.cpp
@@ -902,7 +902,7 @@ namespace {
                         return;
                 }
                 
-                const int MAX_RETRIES = 5;
+                const int MAX_RETRIES = 10;
                 for (int attempts = 0; attempts < MAX_RETRIES; ++attempts)
                 {
                         apr_status_t s = apr_thread_mutex_trylock(gLogMutexp);
@@ -914,9 +914,7 @@ namespace {
                         }
 
                         ms_sleep(1);
-                        //apr_thread_yield();
-                                // Just yielding won't necessarily work, I had problems with
-                                // this on Linux - doug 12/02/04
+                        apr_thread_yield();
                 }
 
                 // We're hosed, we can't get the mutex.  Blah.
diff --git a/linden/indra/llcommon/llthread.cpp b/linden/indra/llcommon/llthread.cpp
index 822adc2..4879d58 100644
--- a/linden/indra/llcommon/llthread.cpp
+++ b/linden/indra/llcommon/llthread.cpp
@@ -84,7 +84,7 @@ void *APR_THREAD_FUNC LLThread::staticRun(apr_thread_t *apr_threadp, void *datap
 
 
 LLThread::LLThread(const std::string& name, apr_pool_t *poolp) :
-        mPaused(FALSE),
+        mPaused(false),
         mName(name),
         mAPRThreadp(NULL),
         mStatus(STOPPED)
@@ -92,12 +92,12 @@ LLThread::LLThread(const std::string& name, apr_pool_t *poolp) :
         // Thread creation probably CAN be paranoid about APR being initialized, if necessary
         if (poolp)
         {
-                mIsLocalPool = FALSE;
+                mIsLocalPool = false;
                 mAPRPoolp = poolp;
         }
         else
         {
-                mIsLocalPool = TRUE;
+                mIsLocalPool = true;
                 apr_pool_create(&mAPRPoolp, NULL); // Create a subpool for this thread
         }
         mRunCondition = new LLCondition(mAPRPoolp);
@@ -268,12 +268,12 @@ LLMutex::LLMutex(apr_pool_t *poolp) :
 {
         //if (poolp)
         //{
-        //      mIsLocalPool = FALSE;
+        //      mIsLocalPool = false;
         //      mAPRPoolp = poolp;
         //}
         //else
         {
-                mIsLocalPool = TRUE;
+                mIsLocalPool = true;
                 apr_pool_create(&mAPRPoolp, NULL); // Create a subpool for this thread
         }
         apr_thread_mutex_create(&mAPRMutexp, APR_THREAD_MUTEX_UNNESTED, mAPRPoolp);
diff --git a/linden/indra/llcommon/llthread.h b/linden/indra/llcommon/llthread.h
index 9da3134..a0b22f2 100644
--- a/linden/indra/llcommon/llthread.h
+++ b/linden/indra/llcommon/llthread.h
@@ -67,7 +67,7 @@ public:
         // Called from MAIN THREAD.
         void pause();
         void unpause();
-        bool isPaused() { return isStopped() || mPaused == TRUE; }
+        bool isPaused() { return isStopped() || mPaused; }
         
         // Cause the thread to wake up and check its condition
         void wake();
@@ -84,7 +84,7 @@ public:
         apr_pool_t *getAPRPool() { return mAPRPoolp; }
         
 private:
-        BOOL                            mPaused;
+        bool                            mPaused;
         
         // static function passed to APR thread creation routine
         static void *APR_THREAD_FUNC staticRun(apr_thread_t *apr_threadp, void *datap);
@@ -95,7 +95,7 @@ protected:
 
         apr_thread_t            *mAPRThreadp;
         apr_pool_t                      *mAPRPoolp;
-        BOOL                            mIsLocalPool;
+        bool                            mIsLocalPool;
         EThreadStatus           mStatus;
 
         void setQuitting();
@@ -137,7 +137,7 @@ public:
 protected:
         apr_thread_mutex_t *mAPRMutexp;
         apr_pool_t                      *mAPRPoolp;
-        BOOL                            mIsLocalPool;
+        bool                            mIsLocalPool;
 };
 
 // Actually a condition/mutex pair (since each condition needs to be associated with a mutex).