zeroc-ice 3.6b1 → 3.6.0

data/ext/ice/cpp/src/IceUtil/FileUtil.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -498,6 +498,7 @@ IceUtilInternal::FileLock::FileLock(const std::string& path) :
 IceUtilInternal::FileLock::~FileLock()
 {
     assert(_fd > -1);
+    ::close(_fd);
     unlink(_path);
 }
 

data/ext/ice/cpp/src/IceUtil/FileUtil.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -129,6 +129,10 @@ public:
     using std::ifstream::open;
 #endif
 
+#if defined(_MSC_VER) && (_MSC_VER >= 1900)
+    ifstream(const ifstream&) = delete;
+#endif 
+
 private:
 
     // Hide const char* definitions since they shouldn't be used.
@@ -148,6 +152,10 @@ public:
     using std::ofstream::open;
 #endif
 
+#if defined(_MSC_VER) && (_MSC_VER >= 1900)
+    ofstream(const ofstream&) = delete;
+#endif 
+
 private:
 
     // Hide const char* definitions since they shouldn't be used.

data/ext/ice/cpp/src/IceUtil/InputUtil.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/IceUtil/MutexProtocol.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/IceUtil/Options.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -70,7 +70,7 @@ IceUtilInternal::OutputBase::OutputBase(ostream& os) :
 }
 
 
-IceUtilInternal::OutputBase::OutputBase(const char* s) :
+IceUtilInternal::OutputBase::OutputBase(const string& s) :
     _out(_fout),
     _pos(0),
     _indent(0),
@@ -86,14 +86,14 @@ IceUtilInternal::OutputBase::~OutputBase()
 }
 
 void
-IceUtilInternal::OutputBase::open(const char* s)
+IceUtilInternal::OutputBase::open(const string& s)
 {
     //
     // Remove any existing file first. This prevents file name
     // mismatches on case-insensitive OSs.
     //
     IceUtilInternal::unlink(s);
-    _fout.open(s);
+    _fout.open(s.c_str());
 }
 
 void
@@ -112,9 +112,10 @@ IceUtilInternal::OutputBase::isOpen()
 }
 
 void
-IceUtilInternal::OutputBase::print(const char* s)
+IceUtilInternal::OutputBase::print(const string& s)
 {
-    for(unsigned int i = 0; i < strlen(s); ++i)
+    size_t len = s.size();
+    for(unsigned int i = 0; i < len; ++i)
     {
         if(s[i] == '\n')
         {
@@ -125,7 +126,6 @@ IceUtilInternal::OutputBase::print(const char* s)
             ++_pos;
         }
     }
-
     _out << s;
 }
 
@@ -264,7 +264,7 @@ IceUtilInternal::Output::Output(const char* s) :
 }
 
 void
-IceUtilInternal::Output::print(const char* s)
+IceUtilInternal::Output::print(const string& s)
 {
     if(_par >= 0)
     {
@@ -276,18 +276,6 @@ IceUtilInternal::Output::print(const char* s)
     OutputBase::print(s);
 }
 
-void 
-IceUtilInternal::Output::setBeginBlock(const char *bb)
-{
-    _blockStart = bb;
-}
-
-void 
-IceUtilInternal::Output::setEndBlock(const char *eb)
-{
-    _blockEnd = eb;
-}
-
 void
 IceUtilInternal::Output::sb()
 {
@@ -332,7 +320,7 @@ IceUtilInternal::operator<<(Output& out, ios_base& (*val)(ios_base&))
 {
     ostringstream s;
     s << val;
-    out.print(s.str().c_str());
+    out.print(s.str());
     return out;
 }
 
@@ -365,7 +353,7 @@ IceUtilInternal::XMLOutput::XMLOutput(const char* s) :
 }
 
 void
-IceUtilInternal::XMLOutput::print(const char* s)
+IceUtilInternal::XMLOutput::print(const string& s)
 {
     if(_se)
     {
@@ -376,8 +364,7 @@ IceUtilInternal::XMLOutput::print(const char* s)
 
     if(_escape)
     {
-        string escaped = escape(s);
-        OutputBase::print(escaped.c_str());
+        OutputBase::print(escape(s));
     }
     else
     {
@@ -557,7 +544,7 @@ IceUtilInternal::operator<<(XMLOutput& out, ios_base& (*val)(ios_base&))
 {
     ostringstream s;
     s << val;
-    out.print(s.str().c_str());
+    out.print(s.str());
     return out;
 }
 

data/ext/ice/cpp/src/IceUtil/Random.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/IceUtil/RecMutex.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/IceUtil/SHA1.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -9,14 +9,55 @@
 
 #include <IceUtil/SHA1.h>
 
-#if defined(_WIN32) && !defined(ICE_OS_WINRT)
-#   include <IceUtil/Exception.h>
+#ifndef ICE_OS_WINRT
+#   if defined(_WIN32)
+#      include <Wincrypt.h>
+#      include <IceUtil/Exception.h>
+#   elif defined(__APPLE__)
+#      include <CommonCrypto/CommonDigest.h>
+#   else
+#      include <openssl/sha.h>
+#   endif
 #endif
 
 using namespace std;
 using namespace IceUtil;
 
 #ifndef ICE_OS_WINRT
+
+namespace IceUtilInternal
+{
+
+class SHA1::Hasher
+{
+public:
+    
+    Hasher();
+#   ifdef _WIN32
+    ~Hasher();
+#endif
+    
+    void update(const unsigned char*, std::size_t);
+    void finalize(std::vector<unsigned char>&);
+    
+private:
+
+    // noncopyable
+    Hasher(const Hasher&);
+    Hasher operator=(const Hasher&);
+    
+#   if defined (_WIN32)
+    HCRYPTPROV _ctx;
+    HCRYPTHASH _hash;
+#   elif defined(__APPLE__)
+    CC_SHA1_CTX _ctx;
+#   else
+    SHA_CTX _ctx;
+#   endif
+};
+
+}
+
 #   if defined(_WIN32)
 
 namespace
@@ -24,7 +65,7 @@ namespace
 const int SHA_DIGEST_LENGTH = 20;
 }
 
-IceUtil::SHA1::SHA1() :
+IceUtilInternal::SHA1::Hasher::Hasher() :
     _ctx(0),
     _hash(0)
 {
@@ -39,7 +80,7 @@ IceUtil::SHA1::SHA1() :
     }
 }
 
-IceUtil::SHA1::~SHA1()
+IceUtilInternal::SHA1::Hasher::~Hasher()
 {
     if(_hash)
     {
@@ -52,19 +93,19 @@ IceUtil::SHA1::~SHA1()
     }
 }
 #   elif defined(__APPLE__)
-IceUtil::SHA1::SHA1()
+IceUtilInternal::SHA1::Hasher::Hasher()
 {
     CC_SHA1_Init(&_ctx);
 }
 #   else
-IceUtil::SHA1::SHA1()
+IceUtilInternal::SHA1::Hasher::Hasher()
 {
     SHA1_Init(&_ctx);
 }
 #   endif
 
 void
-IceUtil::SHA1::update(const unsigned char* data, size_t length)
+IceUtilInternal::SHA1::Hasher::update(const unsigned char* data, size_t length)
 {
 #   if defined(_WIN32)
     if(!CryptHashData(_hash, data, static_cast<DWORD>(length), 0))
@@ -79,7 +120,7 @@ IceUtil::SHA1::update(const unsigned char* data, size_t length)
 }
 
 void
-IceUtil::SHA1::finalize(vector<unsigned char>& md)
+IceUtilInternal::SHA1::Hasher::finalize(vector<unsigned char>& md)
 {
 #   if defined(_WIN32)
     md.resize(SHA_DIGEST_LENGTH);
@@ -96,10 +137,31 @@ IceUtil::SHA1::finalize(vector<unsigned char>& md)
     SHA1_Final(&md[0], &_ctx);
 #   endif
 }
+
+IceUtilInternal::SHA1::SHA1() :
+    _hasher(new Hasher())
+{
+}
+
+IceUtilInternal::SHA1::~SHA1()
+{
+}
+
+void
+IceUtilInternal::SHA1::update(const unsigned char* data, std::size_t length)
+{
+    _hasher->update(data, length);
+}
+
+void
+IceUtilInternal::SHA1::finalize(std::vector<unsigned char>& md)
+{
+    _hasher->finalize(md);
+}
 #endif
 
 void
-IceUtil::sha1(const unsigned char* data, size_t length, vector<unsigned char>& md)
+IceUtilInternal::sha1(const unsigned char* data, size_t length, vector<unsigned char>& md)
 {
 #if defined(ICE_OS_WINRT)
     auto dataA =

data/ext/ice/cpp/src/IceUtil/Shared.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -11,78 +11,6 @@
 
 using namespace IceUtil;
 
-#ifdef ICE_HAS_ATOMIC_FUNCTIONS
-
-namespace IceUtilInternal
-{
-
-//
-// Linux only. Unfortunately, asm/atomic.h builds non-SMP safe code
-// with non-SMP kernels. This means that executables compiled with a
-// non-SMP kernel would fail randomly due to concurrency errors with
-// reference counting on SMP hosts. Therefore the relevent pieces of
-// atomic.h are more-or-less duplicated.
-//
-
-/*
- * atomicInc - increment ice_atomic variable
- * @v: pointer of type AtomicCounter
- * 
- * Atomically increments @v by 1. Note that the guaranteed useful
- * range of an AtomicCounter is only 24 bits.
- *
- * Inlined because this operation is performance critical.
- */
-static inline void atomicInc(volatile int* counter)
-{
-    __asm__ __volatile__(
-        "lock ; incl %0"
-        :"=m" (*counter)
-        :"m" (*counter));
-}
-
-/**
- * atomicDecAndTest - decrement and test
- * @v: pointer of type AtomicCounter
- * 
- * Atomically decrements @v by 1 and returns true if the result is 0,
- * or false for all other cases. Note that the guaranteed useful
- * range of an AtomicCounter is only 24 bits.
- *
- * Inlined because this operation is performance critical.
- */
-static inline int atomicDecAndTest(volatile int* counter)
-{
-    unsigned char c;
-    __asm__ __volatile__(
-        "lock ; decl %0; sete %1"
-        :"=m" (*counter), "=qm" (c)
-        :"m" (*counter) : "memory");
-    return c != 0;
-}
-
-/**
- * atomicExchangeAdd - same as InterlockedExchangeAdd. This
- * didn't come from atomic.h (the code was derived from similar code
- * in /usr/include/asm/rwsem.h)
- *
- * Inlined because this operation is performance critical.
- */
-static inline int atomicExchangeAdd(volatile int* counter, int i)
-{
-    int tmp = i;
-    __asm__ __volatile__(
-        "lock ; xadd %0,(%2)"
-        :"+r"(tmp), "=m"(*counter)
-        :"r"(counter), "m"(*counter)
-        : "memory");
-    return tmp + i;
-}
-
-}
-
-#endif
-
 //
 // Flag constant used by the Shared class. Derived classes
 // such as GCObject define more flag constants.
@@ -116,81 +44,24 @@ IceUtil::Shared::Shared(const Shared&) :
 void 
 IceUtil::Shared::__incRef()
 {
-#if defined(_WIN32)
-    assert(InterlockedExchangeAdd(&_ref, 0) >= 0);
-    InterlockedIncrement(&_ref);
-#elif defined(ICE_HAS_GCC_BUILTINS)
-
-#   ifndef NDEBUG
-    int c = 
-#   endif
-        __sync_fetch_and_add(&_ref, 1);
-    assert(c >= 0);
-#elif defined(ICE_HAS_ATOMIC_FUNCTIONS)
-    assert(IceUtilInternal::atomicExchangeAdd(&_ref, 0) >= 0);
-    IceUtilInternal::atomicInc(&_ref);
-#else
-    _mutex.lock();
     assert(_ref >= 0);
     ++_ref;
-    _mutex.unlock();
-#endif
 }
 
 void 
 IceUtil::Shared::__decRef()
 {
-#if defined(_WIN32)
-    assert(InterlockedExchangeAdd(&_ref, 0) > 0);
-    if(InterlockedDecrement(&_ref) == 0 && !(_flags & NoDelete))
-    {
-        delete this;
-    }
-#elif defined(ICE_HAS_GCC_BUILTINS)
-    int c = __sync_fetch_and_sub(&_ref, 1);
-    assert(c > 0);
-    if(c == 1 && !(_flags & NoDelete))
-    {
-        delete this;
-    }
-#elif defined(ICE_HAS_ATOMIC_FUNCTIONS)
-    assert(IceUtilInternal::atomicExchangeAdd(&_ref, 0) > 0);
-    if(IceUtilInternal::atomicDecAndTest(&_ref) && !(_flags & NoDelete))
-    {
-        delete this;
-    }
-#else
-    _mutex.lock();
-    bool doDelete = false;
     assert(_ref > 0);
-    if(--_ref == 0)
-    {
-        doDelete = !(_flags & NoDelete);
-        _flags |= NoDelete;
-    }
-    _mutex.unlock();
-    if(doDelete)
+    if(--_ref == 0 && !(_flags & NoDelete))
     {
         delete this;
     }
-#endif
 }
 
 int
 IceUtil::Shared::__getRef() const
 {
-#if defined(_WIN32)
-    return InterlockedExchangeAdd(const_cast<LONG*>(&_ref), 0);
-#elif defined(ICE_HAS_GCC_BUILTINS)
-    return __sync_fetch_and_sub(const_cast<volatile int*>(&_ref), 0);
-#elif defined(ICE_HAS_ATOMIC_FUNCTIONS)
-    return IceUtilInternal::atomicExchangeAdd(const_cast<volatile int*>(&_ref), 0);
-#else
-    _mutex.lock();
-    int ref = _ref;
-    _mutex.unlock();
-    return ref;
-#endif
+    return _ref;
 }
 
 void