Remove MutexPtrLock (#1712)

cpp/include/IceUtil/IceUtil.h

@@ -24,7 +24,6 @@
 #include <IceUtil/Monitor.h>
 #include <IceUtil/MutexProtocol.h>
 #include <IceUtil/Mutex.h>
-#include <IceUtil/MutexPtrLock.h>
 #include <IceUtil/RecMutex.h>
 #include <IceUtil/ScopedArray.h>
 #include <IceUtil/Shared.h>

cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp

@@ -9,9 +9,9 @@
 #include <IceUtil/FileUtil.h>
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/InputUtil.h>
-#include <IceUtil/Mutex.h>
 
 #include <fstream>
+#include <mutex>
 
 #if defined(__GLIBC__) || defined(_AIX)
 #   include <crypt.h>
@@ -501,29 +501,8 @@ namespace
 
 #if defined(__FreeBSD__) && !defined(__GLIBC__)
 
-//
-// FreeBSD crypt is no reentrat we use this global mutex
-// to serialize access.
-//
-IceUtil::Mutex* _staticMutex = 0;
-
-class Init
-{
-public:
-
-    Init()
-    {
-        _staticMutex = new IceUtil::Mutex;
-    }
-
-    ~Init()
-    {
-        delete _staticMutex;
-        _staticMutex = 0;
-    }
-};
-
-Init init;
+// FreeBSD crypt is no reentrat we use this global mutex to serialize access.
+mutex staticMutex;
 
 #elif defined(__APPLE__)
 
@@ -731,7 +710,7 @@ CryptPermissionsVerifierI::checkPermissions(const string& userId, const string&
     data.initialized = 0;
     return p->second == crypt_r(password.c_str(), salt.c_str(), &data);
 #   else
-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(_staticMutex);
+    lock_guard lock(staticMutex);
     return p->second == crypt(password.c_str(), salt.c_str());
 #   endif
 #elif defined(__APPLE__) || defined(_WIN32)

cpp/src/Ice/CommunicatorI.cpp

@@ -15,8 +15,6 @@
 #include <Ice/TraceLevels.h>
 #include <Ice/Router.h>
 #include <Ice/OutgoingAsync.h>
-#include <IceUtil/Mutex.h>
-#include <IceUtil/MutexPtrLock.h>
 #include <Ice/UUID.h>
 #ifdef ICE_SWIFT
 #   include <Ice/ThreadPool.h>

cpp/src/Ice/FactoryTableInit.cpp

@@ -4,8 +4,10 @@
 
 #include <Ice/FactoryTableInit.h>
 #include <Ice/UserExceptionFactory.h>
-#include <IceUtil/Mutex.h>
-#include <IceUtil/MutexPtrLock.h>
+
+#include <atomic>
+
+using namespace std;
 
 namespace IceInternal
 {
@@ -21,26 +23,7 @@ ICE_API FactoryTable* factoryTable;
 namespace
 {
 
-int initCount = 0;   // Initialization count
-IceUtil::Mutex* initCountMutex = 0;
-
-class Init
-{
-public:
-
-    Init()
-    {
-        initCountMutex = new IceUtil::Mutex;
-    }
-
-    ~Init()
-    {
-        delete initCountMutex;
-        initCountMutex = 0;
-    }
-};
-
-Init init;
+atomic<int> initCount = 0;   // Initialization count
 
 }
 
@@ -55,7 +38,6 @@ Init init;
 //
 IceInternal::FactoryTableInit::FactoryTableInit()
 {
-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(initCountMutex);
     if(0 == initCount++)
     {
         factoryTable = new FactoryTable;
@@ -68,7 +50,6 @@ IceInternal::FactoryTableInit::FactoryTableInit()
 //
 IceInternal::FactoryTableInit::~FactoryTableInit()
 {
-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(initCountMutex);
     if(0 == --initCount)
     {
         delete factoryTable;

cpp/src/Ice/IPEndpointI.cpp

@@ -10,7 +10,6 @@
 #include <Ice/LoggerUtil.h>
 #include <Ice/HashUtil.h>
 #include <Ice/NetworkProxy.h>
-#include <IceUtil/MutexPtrLock.h>
 
 using namespace std;
 using namespace Ice;

cpp/src/Ice/ImplicitContextI.cpp

@@ -5,8 +5,8 @@
 #include <Ice/ImplicitContextI.h>
 #include <Ice/OutputStream.h>
 #include <Ice/Object.h>
-#include <IceUtil/Mutex.h>
-#include <IceUtil/MutexPtrLock.h>
+
+#include <mutex>
 
 using namespace std;
 using namespace Ice;
@@ -75,7 +75,7 @@ class PerThreadImplicitContext : public ImplicitContextI
     //
     typedef std::vector<bool> IndexInUse;
     static IndexInUse* _indexInUse;
-    static IceUtil::Mutex* _mutex;
+    static mutex _mutex;
 
     static long _nextId;
     static long _destroyedIds;
@@ -249,30 +249,7 @@ long PerThreadImplicitContext::_nextId;
 long PerThreadImplicitContext::_destroyedIds;
 size_t PerThreadImplicitContext::_slotVectors;
 PerThreadImplicitContext::IndexInUse* PerThreadImplicitContext::_indexInUse;
-IceUtil::Mutex* PerThreadImplicitContext::_mutex = 0;
-
-namespace
-{
-
-class Init
-{
-public:
-
-    Init()
-    {
-        PerThreadImplicitContext::_mutex = new IceUtil::Mutex;
-    }
-
-    ~Init()
-    {
-        delete PerThreadImplicitContext::_mutex;
-        PerThreadImplicitContext::_mutex = 0;
-    }
-};
-
-Init init;
-
-}
+mutex PerThreadImplicitContext::_mutex;
 
 #   ifdef _WIN32
 DWORD PerThreadImplicitContext::_key;
@@ -282,7 +259,7 @@ pthread_key_t PerThreadImplicitContext::_key;
 
 PerThreadImplicitContext::PerThreadImplicitContext()
 {
-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(_mutex);
+    lock_guard lock(_mutex);
     _id = _nextId++;
     if(_id == 0)
     {
@@ -324,7 +301,7 @@ PerThreadImplicitContext::PerThreadImplicitContext()
 
 PerThreadImplicitContext::~PerThreadImplicitContext()
 {
-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(_mutex);
+    lock_guard lock(_mutex);
     (*_indexInUse)[_index] = false;
 
     if(find(_indexInUse->begin(), _indexInUse->end(), true) == _indexInUse->end())
@@ -371,7 +348,7 @@ PerThreadImplicitContext::getThreadContext(bool allocate) const
         }
 
         {
-             IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(_mutex);
+             lock_guard lock(_mutex);
              sv = new SlotVector(_index + 1);
              _slotVectors++;
         }
@@ -480,7 +457,7 @@ PerThreadImplicitContext::clearThreadContext() const
             }
 
             {
-                IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(_mutex);
+                lock_guard lock(_mutex);
                 _slotVectors--;
             }
 #   endif
@@ -647,7 +624,7 @@ extern "C" void iceImplicitContextThreadDestructor(void* v)
         delete sv;
 
         {
-            IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(PerThreadImplicitContext::_mutex);
+            lock_guard lock(PerThreadImplicitContext::_mutex);
             PerThreadImplicitContext::_slotVectors--;
             PerThreadImplicitContext::tryCleanupKey();
         }

cpp/src/Ice/IncomingAsync.cpp

@@ -11,8 +11,6 @@
 #include <Ice/Instance.h>
 #include <Ice/Properties.h>
 #include <Ice/ReplyStatus.h>
-#include <IceUtil/Mutex.h>
-#include <IceUtil/MutexPtrLock.h>
 
 using namespace std;
 using namespace Ice;