aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.txt4
-rw-r--r--linden/indra/llcommon/llerror.cpp6
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 4c485d4..2191d3c 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,9 @@
12009-04-06 Jacek Antonelli <jacek.antonelli@gmail.com> 12009-04-06 Jacek Antonelli <jacek.antonelli@gmail.com>
2 2
3 * linden/indra/llcommon/llerror.cpp:
4 Made LogLock mutex less likely to fail, hopefully.
5
6
3 * linden/indra/llcommon/llthread.cpp: 7 * linden/indra/llcommon/llthread.cpp:
4 Converted BOOLs to bools in llthread. 8 Converted BOOLs to bools in llthread.
5 * linden/indra/llcommon/llthread.h: 9 * linden/indra/llcommon/llthread.h:
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.