diff options
Diffstat (limited to 'cpp/src/IceUtil/StaticMutex.cpp')
| -rw-r--r-- | cpp/src/IceUtil/StaticMutex.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/cpp/src/IceUtil/StaticMutex.cpp b/cpp/src/IceUtil/StaticMutex.cpp index 53fa1f812b3..8084d79c666 100644 --- a/cpp/src/IceUtil/StaticMutex.cpp +++ b/cpp/src/IceUtil/StaticMutex.cpp @@ -18,11 +18,7 @@ using namespace std; static CRITICAL_SECTION _criticalSection; -# if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0400 typedef list<CRITICAL_SECTION*> MutexList; -# else -typedef list<HANDLE> MutexList; -# endif static MutexList* _mutexList; @@ -53,17 +49,12 @@ Init::Init() Init::~Init() { -# if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0400 for(MutexList::iterator p = _mutexList->begin(); p != _mutexList->end(); ++p) { DeleteCriticalSection(*p); delete *p; } -# else - for_each(_mutexList->begin(), _mutexList->end(), - CloseHandle); -# endif delete _mutexList; DeleteCriticalSection(&_criticalSection); } @@ -82,19 +73,8 @@ void IceUtil::StaticMutex::initialize() const // if(_mutex == 0) { -# if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0400 CRITICAL_SECTION* newMutex = new CRITICAL_SECTION; InitializeCriticalSection(newMutex); -# else - _recursionCount = 0; - - HANDLE newMutex = CreateMutex(0, false, 0); - if(newMutex == 0) - { - LeaveCriticalSection(&_criticalSection); - throw ThreadSyscallException(__FILE__, __LINE__, GetLastError()); - } -# endif // // _mutex is written after the new initialized CRITICAL_SECTION/Mutex @@ -106,6 +86,26 @@ void IceUtil::StaticMutex::initialize() const } LeaveCriticalSection(&_criticalSection); } + +bool +IceUtil::StaticMutex::tryLock() const +{ + if(!initialized()) + { + initialize(); + } + if(!TryEnterCriticalSection(_mutex)) + { + return false; + } + if(_mutex->RecursionCount > 1) + { + LeaveCriticalSection(_mutex); + throw ThreadLockedException(__FILE__, __LINE__); + } + return true; +} + #endif IceUtil::StaticMutex IceUtil::globalMutex = ICE_STATIC_MUTEX_INITIALIZER; |