Fix hash implementation to not use a global mutex

cpp/src/Ice/IPEndpointI.cpp

@@ -17,31 +17,6 @@ using namespace Ice;
 using namespace Ice::Instrumentation;
 using namespace IceInternal;
 
-namespace
-{
-
-IceUtil::Mutex* hashMutex = 0;
-
-class Init
-{
-public:
-
-    Init()
-    {
-        hashMutex = new IceUtil::Mutex;
-    }
-
-    ~Init()
-    {
-        delete hashMutex;
-        hashMutex = 0;
-    }
-};
-
-Init init;
-
-}
-
 #ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(IPEndpointI* p) { return p; }
 #endif
@@ -213,7 +188,7 @@ IceInternal::IPEndpointI::equivalent(const EndpointIPtr& endpoint) const
 Ice::Int
 IceInternal::IPEndpointI::hash() const
 {
-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(hashMutex);
+    lock_guard lock(_hashMutex);
     if(!_hashInitialized)
     {
         _hashValue = 5381;

cpp/src/Ice/IPEndpointI.h

@@ -16,6 +16,7 @@
 #include <Ice/ObserverHelper.h>
 
 #include <deque>
+#include <mutex>
 
 namespace IceInternal
 {
@@ -100,6 +101,7 @@ class ICE_API IPEndpointI : public EndpointI
 
     mutable bool _hashInitialized;
     mutable Ice::Int _hashValue;
+    mutable std::mutex _hashMutex;
 };
 
 class ICE_API EndpointHostResolver : public IceUtil::Thread, public IceUtil::Monitor<IceUtil::Mutex>

cpp/src/Ice/Reference.cpp

@@ -25,7 +25,6 @@
 #include <Ice/StringUtil.h>
 
 #include <IceUtil/Random.h>
-#include <IceUtil/MutexPtrLock.h>
 
 #include <functional>
 #include <algorithm>
@@ -36,31 +35,6 @@ using namespace IceInternal;
 
 IceUtil::Shared* IceInternal::upCast(IceInternal::Reference* p) { return p; }
 
-namespace
-{
-
-IceUtil::Mutex* hashMutex = 0;
-
-class Init
-{
-public:
-
-    Init()
-    {
-        hashMutex = new IceUtil::Mutex;
-    }
-
-    ~Init()
-    {
-        delete hashMutex;
-        hashMutex = 0;
-    }
-};
-
-Init init;
-
-}
-
 CommunicatorPtr
 IceInternal::Reference::getCommunicator() const
 {
@@ -182,7 +156,7 @@ IceInternal::Reference::getCompressOverride(bool& compress) const
 Int
 Reference::hash() const
 {
-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(hashMutex);
+    lock_guard lock(_hashMutex);
     if(!_hashInitialized)
     {
         _hashValue = hashInit();
@@ -503,14 +477,14 @@ IceInternal::Reference::Reference(const InstancePtr& instance,
                                   const EncodingVersion& encoding,
                                   int invocationTimeout,
                                   const Ice::Context& ctx) :
-    _hashInitialized(false),
     _instance(instance),
     _communicator(communicator),
     _mode(mode),
     _secure(secure),
     _identity(id),
     _context(new SharedContext(ctx)),
     _facet(facet),
+    _hashInitialized(false),
     _protocol(protocol),
     _encoding(encoding),
     _invocationTimeout(invocationTimeout),
@@ -521,14 +495,14 @@ IceInternal::Reference::Reference(const InstancePtr& instance,
 
 IceInternal::Reference::Reference(const Reference& r) :
     IceUtil::Shared(),
-    _hashInitialized(false),
     _instance(r._instance),
     _communicator(r._communicator),
     _mode(r._mode),
     _secure(r._secure),
     _identity(r._identity),
     _context(r._context),
     _facet(r._facet),
+    _hashInitialized(false),
     _protocol(r._protocol),
     _encoding(r._encoding),
     _invocationTimeout(r._invocationTimeout),

cpp/src/Ice/Reference.h

@@ -22,6 +22,8 @@
 #include <Ice/Protocol.h>
 #include <Ice/Properties.h>
 
+#include <mutex>
+
 namespace Ice
 {
 
@@ -158,9 +160,6 @@ class Reference : public IceUtil::Shared
 
     virtual Ice::Int hashInit() const;
 
-    mutable Ice::Int _hashValue;
-    mutable bool _hashInitialized;
-
 private:
 
     const InstancePtr _instance;
@@ -171,6 +170,9 @@ class Reference : public IceUtil::Shared
     Ice::Identity _identity;
     SharedContextPtr _context;
     std::string _facet;
+    mutable Ice::Int _hashValue;
+    mutable bool _hashInitialized;
+    mutable std::mutex _hashMutex;
     Ice::ProtocolVersion _protocol;
     Ice::EncodingVersion _encoding;
     int _invocationTimeout;