aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcommon
diff options
context:
space:
mode:
authorJacek Antonelli2009-04-06 18:14:26 -0500
committerJacek Antonelli2009-04-06 18:14:26 -0500
commitf042e95a1c66adff282759b259ee029901904ebd (patch)
treecf70071856aa86fdbdf257318e1523e9f0ca5367 /linden/indra/llcommon
parentMerge branch 'mac-1.1.0' into next (diff)
downloadmeta-impy-f042e95a1c66adff282759b259ee029901904ebd.zip
meta-impy-f042e95a1c66adff282759b259ee029901904ebd.tar.gz
meta-impy-f042e95a1c66adff282759b259ee029901904ebd.tar.bz2
meta-impy-f042e95a1c66adff282759b259ee029901904ebd.tar.xz
Made LogLock mutex less likely to fail, hopefully.
Diffstat (limited to 'linden/indra/llcommon')
-rw-r--r--linden/indra/llcommon/llerror.cpp6
1 files changed, 2 insertions, 4 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 {
902 return; 902 return;
903 } 903 }
904 904
905 const int MAX_RETRIES = 5; 905 const int MAX_RETRIES = 10;
906 for (int attempts = 0; attempts < MAX_RETRIES; ++attempts) 906 for (int attempts = 0; attempts < MAX_RETRIES; ++attempts)
907 { 907 {
908 apr_status_t s = apr_thread_mutex_trylock(gLogMutexp); 908 apr_status_t s = apr_thread_mutex_trylock(gLogMutexp);
@@ -914,9 +914,7 @@ namespace {
914 } 914 }
915 915
916 ms_sleep(1); 916 ms_sleep(1);
917 //apr_thread_yield(); 917 apr_thread_yield();
918 // Just yielding won't necessarily work, I had problems with
919 // this on Linux - doug 12/02/04
920 } 918 }
921 919
922 // We're hosed, we can't get the mutex. Blah. 920 // We're hosed, we can't get the mutex. Blah.