zeroc-ice 3.7.0 → 3.7.5

data/ext/ice/cpp/src/Ice/Thread.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #ifdef __sun
 //
@@ -205,16 +200,24 @@ IceUtil::Thread::start(size_t, int)
     }
 
     //
-    // It's necessary to increment the reference count since
-    // pthread_create won't necessarily call the thread function until
+    // It's necessary to increment the reference count since the
+    // thread constructor won't necessarily call the thread function until
     // later. If the user does (new MyThread)->start() then the thread
     // object could be deleted before the thread object takes
     // ownership. It's also necessary to increment the reference count
-    // prior to calling pthread_create since the thread itself calls
-    // __decRef().
+    // prior to calling the thread constructor since the thread start hook
+    // itself calls __decRef().
     //
-    __incRef();
-    _thread.reset(new thread(startHook, this));
+    try
+    {
+        __incRef();
+        _thread.reset(new thread(startHook, this));
+    }
+    catch(const std::system_error&)
+    {
+        __decRef();
+        throw;
+    }
 
     _started = true;
     _running = true;
@@ -467,6 +470,7 @@ IceUtil::Thread::start(size_t stackSize, int priority)
     }
     if(SetThreadPriority(_handle, priority) == 0)
     {
+        __decRef();
         throw ThreadSyscallException(__FILE__, __LINE__, GetLastError());
     }
     if(static_cast<int>(ResumeThread(_handle)) == -1)
@@ -558,8 +562,8 @@ IceUtil::ThreadControl::join()
         throw BadThreadControlException(__FILE__, __LINE__);
     }
 
-    void* ignore = 0;
-    int rc = pthread_join(_thread, &ignore);
+    void* status = 0;
+    int rc = pthread_join(_thread, &status);
     if(rc != 0)
     {
         throw ThreadSyscallException(__FILE__, __LINE__, rc);

data/ext/ice/cpp/src/Ice/ThreadPool.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #include <Ice/ThreadPool.h>
 #include <Ice/EventHandler.h>
@@ -115,6 +110,29 @@ class ThreadPoolDestroyedException
 {
 };
 
+#ifdef ICE_SWIFT
+string
+prefixToDispatchQueueLabel(const std::string& prefix)
+{
+    if(prefix == "Ice.ThreadPool.Client")
+    {
+        return "com.zeroc.ice.client";
+    }
+
+    if(prefix == "Ice.ThreadPool.Server")
+    {
+        return "com.zeroc.ice.server";
+    }
+
+    string::size_type end = prefix.find_last_of(".ThreadPool");
+    if(end == string::npos)
+    {
+        end = prefix.size();
+    }
+
+    return "com.zeroc.ice.oa." + prefix.substr(0, end);
+}
+#endif
 }
 
 Ice::DispatcherCall::~DispatcherCall()
@@ -250,7 +268,12 @@ IceInternal::ThreadPoolWorkQueue::getNativeInfo()
 
 IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& prefix, int timeout) :
     _instance(instance),
+#ifdef ICE_SWIFT
+    _dispatchQueue(dispatch_queue_create(prefixToDispatchQueueLabel(prefix).c_str(),
+                                         DISPATCH_QUEUE_CONCURRENT_WITH_AUTORELEASE_POOL)),
+#else
     _dispatcher(_instance->initializationData().dispatcher),
+#endif
     _destroyed(false),
     _prefix(prefix),
     _selector(instance),
@@ -278,8 +301,20 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& p
     SYSTEM_INFO sysInfo;
     GetSystemInfo(&sysInfo);
     int nProcessors = sysInfo.dwNumberOfProcessors;
+#   elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+    static int ncpu[2] = { CTL_HW, HW_NCPU };
+    size_t sz = sizeof(nProcessors);
+    int nProcessors;
+    if(sysctl(ncpu, 2, &nProcessors, &sz, 0, 0) == -1)
+    {
+        nProcessors = 1;
+    }
 #   else
     int nProcessors = static_cast<int>(sysconf(_SC_NPROCESSORS_ONLN));
+    if(nProcessors == -1)
+    {
+        nProcessors = 1;
+    }
 #   endif
 #endif
 
@@ -422,6 +457,9 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& p
 IceInternal::ThreadPool::~ThreadPool()
 {
     assert(_destroyed);
+#ifdef ICE_SWIFT
+    dispatch_release(_dispatchQueue);
+#endif
 }
 
 void
@@ -506,8 +544,10 @@ IceInternal::ThreadPool::finish(const EventHandlerPtr& handler, bool closeNow)
     _workQueue->queue(new FinishedWorkItem(handler, !closeNow));
     return closeNow;
 #else
+    UNREFERENCED_PARAMETER(closeNow);
+
     // If there are no pending asynchronous operations, we can call finish on the handler now.
-    if(!(handler->_pending & SocketOperationWaitForClose))
+    if(!handler->_pending)
     {
         _workQueue->queue(new FinishedWorkItem(handler, false));
         _selector.finish(handler.get());
@@ -534,16 +574,22 @@ IceInternal::ThreadPool::ready(const EventHandlerPtr& handler, SocketOperation o
 void
 IceInternal::ThreadPool::dispatchFromThisThread(const DispatchWorkItemPtr& workItem)
 {
+#ifdef ICE_SWIFT
+    dispatch_sync(_dispatchQueue, ^
+    {
+        workItem->run();
+    });
+#else
     if(_dispatcher)
     {
         try
         {
 #ifdef ICE_CPP11_MAPPING
             _dispatcher([workItem]()
-                        {
-                            workItem->run();
-                        },
-                        workItem->getConnection());
+            {
+                workItem->run();
+            },
+            workItem->getConnection());
 #else
             _dispatcher->dispatch(workItem, workItem->getConnection());
 #endif
@@ -569,6 +615,7 @@ IceInternal::ThreadPool::dispatchFromThisThread(const DispatchWorkItemPtr& workI
     {
         workItem->run();
     }
+#endif
 }
 
 void
@@ -606,6 +653,16 @@ IceInternal::ThreadPool::prefix() const
     return _prefix;
 }
 
+#ifdef ICE_SWIFT
+
+dispatch_queue_t
+IceInternal::ThreadPool::getDispatchQueue() const ICE_NOEXCEPT
+{
+    return _dispatchQueue;
+}
+
+#endif
+
 void
 IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
 {
@@ -622,6 +679,9 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
             }
             catch(const ThreadPoolDestroyedException&)
             {
+                Lock sync(*this);
+                --_inUse;
+                thread->setState(ICE_ENUM(ThreadState, ThreadStateIdle));
                 return;
             }
             catch(const exception& ex)
@@ -702,7 +762,7 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
             // Get the next ready handler.
             //
             while(_nextHandler != _handlers.end() &&
-                  !(_nextHandler->second & ~_nextHandler->first->_disabled & _nextHandler->first->_registered))
+                    !(_nextHandler->second & ~_nextHandler->first->_disabled & _nextHandler->first->_registered))
             {
                 ++_nextHandler;
             }
@@ -763,8 +823,8 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
 #ifdef ICE_OS_UWP
             current._handler = ICE_GET_SHARED_FROM_THIS(_selector.getNextHandler(current.operation, _threadIdleTime));
 #else
-            current._handler = ICE_GET_SHARED_FROM_THIS(_selector.getNextHandler(current.operation, current._count, current._error,
-                                                                                 _threadIdleTime));
+            current._handler = ICE_GET_SHARED_FROM_THIS(_selector.getNextHandler(current.operation, current._count,
+                                                                                 current._error, _threadIdleTime));
 #endif
         }
         catch(const SelectorTimeoutException&)
@@ -815,7 +875,7 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
 #else
 
                 current._handler = ICE_GET_SHARED_FROM_THIS(_selector.getNextHandler(current.operation, current._count,
-                    current._error, _serverIdleTime));
+                                                            current._error, _serverIdleTime));
 #endif
             }
             catch(const SelectorTimeoutException&)
@@ -983,7 +1043,7 @@ IceInternal::ThreadPool::startMessage(ThreadPoolCurrent& current)
         if(!current._handler->finishAsync(current.operation)) // Returns false if the handler is finished.
         {
             current._handler->_pending = static_cast<SocketOperation>(current._handler->_pending & ~current.operation);
-            if(!(current._handler->_pending & SocketOperationWaitForClose) && current._handler->_finish)
+            if(!current._handler->_pending && current._handler->_finish)
             {
                 Lock sync(*this);
                 _workQueue->queue(new FinishedWorkItem(current._handler, false));
@@ -1002,7 +1062,7 @@ IceInternal::ThreadPool::startMessage(ThreadPoolCurrent& current)
         else if(!current._handler->startAsync(current.operation))
         {
             current._handler->_pending = static_cast<SocketOperation>(current._handler->_pending & ~current.operation);
-            if(!(current._handler->_pending & SocketOperationWaitForClose) && current._handler->_finish)
+            if(!current._handler->_pending && current._handler->_finish)
             {
                 Lock sync(*this);
                 _workQueue->queue(new FinishedWorkItem(current._handler, false));
@@ -1026,7 +1086,7 @@ IceInternal::ThreadPool::startMessage(ThreadPoolCurrent& current)
     else
     {
         current._handler->_pending = static_cast<SocketOperation>(current._handler->_pending & ~current.operation);
-        if(!(current._handler->_pending & SocketOperationWaitForClose) && current._handler->_finish)
+        if(!current._handler->_pending && current._handler->_finish)
         {
             Lock sync(*this);
             _workQueue->queue(new FinishedWorkItem(current._handler, false));
@@ -1061,7 +1121,7 @@ IceInternal::ThreadPool::finishMessage(ThreadPoolCurrent& current)
         current._handler->_pending = static_cast<SocketOperation>(current._handler->_pending & ~current.operation);
     }
 
-    if(!(current._handler->_pending & SocketOperationWaitForClose) && current._handler->_finish)
+    if(!current._handler->_pending && current._handler->_finish)
     {
         // There are no more pending async operations, it's time to call finish.
         Lock sync(*this);

data/ext/ice/cpp/src/Ice/ThreadPool.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #ifndef ICE_THREAD_POOL_H
 #define ICE_THREAD_POOL_H
@@ -115,6 +110,10 @@ public:
 
     std::string prefix() const;
 
+#ifdef ICE_SWIFT
+    dispatch_queue_t getDispatchQueue() const ICE_NOEXCEPT;
+#endif
+
 private:
 
     void run(const EventHandlerThreadPtr&);
@@ -132,10 +131,14 @@ private:
     std::string nextThreadId();
 
     const InstancePtr _instance;
-#ifdef ICE_CPP11_MAPPING
+#ifdef ICE_SWIFT
+    const dispatch_queue_t _dispatchQueue;
+#else // Ice for Swift does not support a dispatcher
+#   ifdef ICE_CPP11_MAPPING
     std::function<void(std::function<void()>, const std::shared_ptr<Ice::Connection>&)> _dispatcher;
-#else
+#   else
     const Ice::DispatcherPtr _dispatcher;
+#   endif
 #endif
     ThreadPoolWorkQueuePtr _workQueue;
     bool _destroyed;
@@ -372,11 +375,7 @@ public:
             // of the event handler. We need to lock the event handler here to call
             // finishMessage.
             //
-#if defined(__MINGW32__)
             IceUtil::LockT<T> sync(_mutex);
-#else
-            IceUtil::LockT<typename T> sync(_mutex);
-#endif
             _current.finishMessage();
         }
     }

data/ext/ice/cpp/src/Ice/Timer.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #include <IceUtil/Timer.h>
 #include <IceUtil/Exception.h>
@@ -247,6 +242,16 @@ Timer::run()
             {
                 consoleErr << "IceUtil::Timer::run(): uncaught exception" << endl;
             }
+
+            if(token.delay == IceUtil::Time())
+            {
+                //
+                // If thisthe task is not a repeated task, clear the task reference now rather than
+                // in the synchronization block above. Clearing the task reference might end up
+                // calling user code which could trigger a deadlock. See also issue #352.
+                //
+                token.task = ICE_NULLPTR;
+            }
         }
     }
 }

data/ext/ice/cpp/src/Ice/TraceLevels.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #include <Ice/TraceLevels.h>
 #include <Ice/Properties.h>

data/ext/ice/cpp/src/Ice/TraceLevels.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #ifndef ICE_TRACE_LEVELS_H
 #define ICE_TRACE_LEVELS_H

data/ext/ice/cpp/src/Ice/TraceLevelsF.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #ifndef ICE_TRACE_LEVELS_F_H
 #define ICE_TRACE_LEVELS_F_H

data/ext/ice/cpp/src/Ice/TraceUtil.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #include <IceUtil/Mutex.h>
 #include <IceUtil/MutexPtrLock.h>

data/ext/ice/cpp/src/Ice/TraceUtil.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #ifndef ICE_TRACE_UTIL_H
 #define ICE_TRACE_UTIL_H

data/ext/ice/cpp/src/Ice/Transceiver.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #include <Ice/Transceiver.h>
 

data/ext/ice/cpp/src/Ice/Transceiver.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #ifndef ICE_TRANSCEIVER_H
 #define ICE_TRANSCEIVER_H