4 files changed, 77 insertions, 1 deletions

diff --git a/linden/indra/llcommon/llapr.cpp b/linden/indra/llcommon/llapr.cpp
index 82530b1..669afc5 100644
--- a/linden/indra/llcommon/llapr.cpp
+++ b/linden/indra/llcommon/llapr.cpp
@@ -38,6 +38,7 @@
 apr_pool_t *gAPRPoolp = NULL; // Global APR memory pool
 LLVolatileAPRPool *LLAPRFile::sAPRFilePoolp = NULL ; //global volatile APR memory pool.
 apr_thread_mutex_t *gLogMutexp = NULL;
+apr_thread_mutex_t *gCallStacksLogMutexp = NULL;
 
 const S32 FULL_VOLATILE_APR_POOL = 1024 ; //number of references to LLVolatileAPRPool
 
@@ -51,6 +52,7 @@ void ll_init_apr()
                 
                 // Initialize the logging mutex
                 apr_thread_mutex_create(&gLogMutexp, APR_THREAD_MUTEX_UNNESTED, gAPRPoolp);
+                apr_thread_mutex_create(&gCallStacksLogMutexp, APR_THREAD_MUTEX_UNNESTED, gAPRPoolp);
         }
 
         if(!LLAPRFile::sAPRFilePoolp)
@@ -72,6 +74,14 @@ void ll_cleanup_apr()
                 apr_thread_mutex_destroy(gLogMutexp);
                 gLogMutexp = NULL;
         }
+        if (gCallStacksLogMutexp)
+        {
+                // Clean up the logging mutex
+
+                // All other threads NEED to be done before we clean up APR, so this is okay.
+                apr_thread_mutex_destroy(gCallStacksLogMutexp);
+                gCallStacksLogMutexp = NULL;
+        }
         if (gAPRPoolp)
         {
                 apr_pool_destroy(gAPRPoolp);
diff --git a/linden/indra/llcommon/llapr.h b/linden/indra/llcommon/llapr.h
index 44ad2dd..63130a8 100644
--- a/linden/indra/llcommon/llapr.h
+++ b/linden/indra/llcommon/llapr.h
@@ -49,6 +49,7 @@
 #include "llstring.h"
 
 extern apr_thread_mutex_t* gLogMutexp;
+extern apr_thread_mutex_t* gCallStacksLogMutexp;
 
 /** 
  * @brief initialize the common apr constructs -- apr itself, the
diff --git a/linden/indra/llcommon/llerror.cpp b/linden/indra/llcommon/llerror.cpp
index 5e520af..a0e42c1 100644
--- a/linden/indra/llcommon/llerror.cpp
+++ b/linden/indra/llcommon/llerror.cpp
@@ -1242,9 +1242,62 @@ namespace LLError
         char** LLCallStacks::sBuffer = NULL ;
         S32    LLCallStacks::sIndex  = 0 ;
 
+        class CallStacksLogLock
+        {
+        public:
+                CallStacksLogLock();
+                ~CallStacksLogLock();
+                bool ok() const { return mOK; }
+        private:
+                bool mLocked;
+                bool mOK;
+        };
+        
+        CallStacksLogLock::CallStacksLogLock()
+                : mLocked(false), mOK(false)
+        {
+                if (!gCallStacksLogMutexp)
+                {
+                        mOK = true;
+                        return;
+                }
+                
+                const int MAX_RETRIES = 5;
+                for (int attempts = 0; attempts < MAX_RETRIES; ++attempts)
+                {
+                        apr_status_t s = apr_thread_mutex_trylock(gCallStacksLogMutexp);
+                        if (!APR_STATUS_IS_EBUSY(s))
+                        {
+                                mLocked = true;
+                                mOK = true;
+                                return;
+                        }
+
+                        ms_sleep(1);
+                }
+
+                // We're hosed, we can't get the mutex.  Blah.
+                std::cerr << "CallStacksLogLock::CallStacksLogLock: failed to get mutex for log"
+                                        << std::endl;
+        }
+        
+        CallStacksLogLock::~CallStacksLogLock()
+        {
+                if (mLocked)
+                {
+                        apr_thread_mutex_unlock(gCallStacksLogMutexp);
+                }
+        }
+
         //static
    void LLCallStacks::push(const char* function, const int line)
    {
+           CallStacksLogLock lock;
+       if (!lock.ok())
+       {
+           return;
+       }
+
            if(!sBuffer)
            {
                    sBuffer = new char*[512] ;
@@ -1280,6 +1333,12 @@ namespace LLError
    //static
    void LLCallStacks::end(std::ostringstream* _out)
    {
+           CallStacksLogLock lock;
+       if (!lock.ok())
+       {
+           return;
+       }
+
            if(!sBuffer)
            {
                    sBuffer = new char*[512] ;
@@ -1302,6 +1361,12 @@ namespace LLError
    //static
    void LLCallStacks::print()
    {
+           CallStacksLogLock lock;
+       if (!lock.ok())
+       {
+           return;
+       }
+
        if(sIndex > 0)
        {
            llinfos << " ************* PRINT OUT LL CALL STACKS ************* " << llendl ;
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index a393a4e..e18befc 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -35,7 +35,7 @@
 
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 23;
-const S32 LL_VERSION_PATCH = 1;
+const S32 LL_VERSION_PATCH = 2;
 const S32 LL_VERSION_BUILD = 0;
 
 const char * const LL_CHANNEL = "Second Life Release";