Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows compile and linker fixes.

Browse Source 
* Do not include aithreadid.h from debug.h, because the latter is
  included everywhere (from linden_common.h) and aithreadid.h is
  heavy (includes among others windows.h).
* On windows, thread local members cannot be exported.
This commit is contained in:
Aleric Inglewood
2012-08-11 03:23:31 +02:00
parent 70717cb6c8
commit 3469d65f95
8 changed files with 78 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
indra/llcommon/llthread.cpp
View File

@@ -72,7 +72,7 @@ LLAtomicS32 LLThread::sRunning = 0;
LL_COMMON_API void assert_main_thread()
{
if (!AIThreadID::in_main_thread())
if (!AIThreadID::in_main_thread_inline())
{
llerrs << "Illegal execution outside main thread." << llendl;
}
@@ -407,12 +407,12 @@ LLMutexBase::LLMutexBase() :
bool LLMutexBase::isSelfLocked() const
{
return mLockingThread.equals_current_thread();
return mLockingThread.equals_current_thread_inline();
}
void LLMutexBase::lock()
{
if (mLockingThread.equals_current_thread())
if (mLockingThread.equals_current_thread_inline())
{ //redundant lock
mCount++;
return;
@@ -420,12 +420,12 @@ void LLMutexBase::lock()
apr_thread_mutex_lock(mAPRMutexp);
mLockingThread.reset();
mLockingThread.reset_inline();
}
bool LLMutexBase::tryLock()
{
if (mLockingThread.equals_current_thread())
if (mLockingThread.equals_current_thread_inline())
{ //redundant lock
mCount++;
return true;
@@ -433,7 +433,7 @@ bool LLMutexBase::tryLock()
bool success = !APR_STATUS_IS_EBUSY(apr_thread_mutex_trylock(mAPRMutexp));
if (success)
{
mLockingThread.reset();
mLockingThread.reset_inline();
}
return success;
}
@@ -441,7 +441,7 @@ bool LLMutexBase::tryLock()
// non-blocking, but does do a lock/unlock so not free
bool LLMutexBase::isLocked() const
{
if (mLockingThread.equals_current_thread())
if (mLockingThread.equals_current_thread_inline())
return false; // A call to lock() won't block.
if (APR_STATUS_IS_EBUSY(apr_thread_mutex_trylock(mAPRMutexp)))
return true;