zeroc-ice 3.7.9.1 → 3.7.10

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

@@ -18,10 +18,6 @@
 #include <climits>
 #include <exception>
 
-#ifdef ICE_OS_UWP
-#   include <thread>
-#endif
-
 #ifndef _WIN32
     #include <sys/time.h>
     #include <sys/resource.h>
@@ -30,245 +26,7 @@
 using namespace std;
 using namespace IceInternal;
 
-#ifdef ICE_OS_UWP
-
-IceUtil::ThreadControl::ThreadControl() :
-    _id(this_thread::get_id())
-{
-}
-
-IceUtil::ThreadControl::ThreadControl(const shared_ptr<thread>& thread) :
-    _thread(thread),
-    _id(_thread->get_id())
-{
-}
-
-bool
-IceUtil::ThreadControl::operator==(const ThreadControl& rhs) const
-{
-    return id() == rhs.id();
-}
-
-bool
-IceUtil::ThreadControl::operator!=(const ThreadControl& rhs) const
-{
-    return id() != rhs.id();
-}
-
-void
-IceUtil::ThreadControl::join()
-{
-    if(!_thread)
-    {
-        throw BadThreadControlException(__FILE__, __LINE__);
-    }
-
-    try
-    {
-        _thread->join();
-    }
-    catch(const system_error& ex)
-    {
-        throw ThreadSyscallException(__FILE__, __LINE__, ex.code().value());
-    }
-}
-
-void
-IceUtil::ThreadControl::detach()
-{
-    if(!_thread)
-    {
-        throw BadThreadControlException(__FILE__, __LINE__);
-    }
-
-    try
-    {
-        _thread->detach();
-    }
-    catch(const system_error& ex)
-    {
-        throw ThreadSyscallException(__FILE__, __LINE__, ex.code().value());
-    }
-}
-
-IceUtil::ThreadControl::ID
-IceUtil::ThreadControl::id() const
-{
-    return _id;
-}
-
-void
-IceUtil::ThreadControl::sleep(const Time& timeout)
-{
-    IceUtil::Int64 msTimeout = timeout.toMilliSeconds();
-    if(msTimeout < 0 || msTimeout > 0x7FFFFFFF)
-    {
-        throw IceUtil::InvalidTimeoutException(__FILE__, __LINE__, timeout);
-    }
-    this_thread::sleep_for(chrono::microseconds(timeout.toMicroSeconds()));
-}
-
-void
-IceUtil::ThreadControl::yield()
-{
-    this_thread::yield();
-}
-
-IceUtil::Thread::Thread() :
-    _started(false),
-    _running(false)
-{
-}
-
-IceUtil::Thread::Thread(const string& name) :
-    _name(name),
-    _started(false),
-    _running(false)
-{
-}
-
-IceUtil::Thread::~Thread()
-{
-}
-
-static unsigned int
-WINAPI startHook(void* arg)
-{
-    // Ensure that the thread doesn't go away until run() has
-    // completed.
-    //
-    IceUtil::ThreadPtr thread;
-
-    try
-    {
-        IceUtil::Thread* rawThread = static_cast<IceUtil::Thread*>(arg);
-
-        //
-        // Ensure that the thread doesn't go away until run() has
-        // completed.
-        //
-        thread = rawThread;
-
-        //
-        // Initialize the random number generator in each thread on
-        // Windows (the rand() seed is thread specific).
-        //
-        unsigned int seed = static_cast<unsigned int>(IceUtil::Time::now().toMicroSeconds());
-        srand(seed ^ static_cast<unsigned int>(hash<thread::id>()(thread->getThreadControl().id())));
-
-        //
-        // See the comment in IceUtil::Thread::start() for details.
-        //
-        rawThread->__decRef();
-        thread->run();
-    }
-    catch(...)
-    {
-        if(!thread->name().empty())
-        {
-            consoleErr << thread->name() << " terminating" << endl;
-        }
-        std::terminate();
-    }
-
-    thread->_done();
-
-    return 0;
-}
-
-#include <process.h>
-
-IceUtil::ThreadControl
-IceUtil::Thread::start(size_t)
-{
-    return start(0, 0);
-}
-
-IceUtil::ThreadControl
-IceUtil::Thread::start(size_t, int)
-{
-    //
-    // Keep this alive for the duration of start
-    //
-    IceUtil::ThreadPtr keepMe = this;
-
-    IceUtil::Mutex::Lock lock(_stateMutex);
-
-    if(_started)
-    {
-        throw ThreadStartedException(__FILE__, __LINE__);
-    }
-
-    //
-    // 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 the thread constructor since the thread start hook
-    // itself calls __decRef().
-    //
-    try
-    {
-        __incRef();
-        _thread.reset(new thread(startHook, this));
-    }
-    catch(const std::system_error&)
-    {
-        __decRef();
-        throw;
-    }
-
-    _started = true;
-    _running = true;
-
-    return ThreadControl(_thread);
-}
-
-IceUtil::ThreadControl
-IceUtil::Thread::getThreadControl() const
-{
-    IceUtil::Mutex::Lock lock(_stateMutex);
-    if(!_started)
-    {
-        throw ThreadNotStartedException(__FILE__, __LINE__);
-    }
-    return ThreadControl(_thread);
-}
-
-bool
-IceUtil::Thread::operator==(const Thread& rhs) const
-{
-    return this == &rhs;
-}
-
-bool
-IceUtil::Thread::operator<(const Thread& rhs) const
-{
-    return this < &rhs;
-}
-
-bool
-IceUtil::Thread::isAlive() const
-{
-    IceUtil::Mutex::Lock lock(_stateMutex);
-    return _running;
-}
-
-void
-IceUtil::Thread::_done()
-{
-    IceUtil::Mutex::Lock lock(_stateMutex);
-    _running = false;
-}
-
-const string&
-IceUtil::Thread::name() const
-{
-    return _name;
-}
-
-#elif defined(_WIN32)
+#if defined(_WIN32)
 
 IceUtil::ThreadControl::ThreadControl() :
     _handle(0),

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

@@ -13,10 +13,6 @@
 #include <Ice/Properties.h>
 #include <Ice/TraceLevels.h>
 
-#if defined(ICE_OS_UWP)
-#   include <Ice/StringConverter.h>
-#endif
-
 #if defined(__FreeBSD__)
 #   include <sys/sysctl.h>
 #endif
@@ -177,7 +173,7 @@ IceInternal::ThreadPoolWorkQueue::destroy()
     //Lock sync(*this); Called with the thread pool locked
     assert(!_destroyed);
     _destroyed = true;
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
     _threadPool._selector.completed(this, SocketOperationRead);
 #else
     _threadPool._selector.ready(this, SocketOperationRead, true);
@@ -189,7 +185,7 @@ IceInternal::ThreadPoolWorkQueue::queue(const ThreadPoolWorkItemPtr& item)
 {
     //Lock sync(*this); Called with the thread pool locked
     _workItems.push_back(item);
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
     _threadPool._selector.completed(this, SocketOperationRead);
 #else
     if(_workItems.size() == 1)
@@ -199,7 +195,7 @@ IceInternal::ThreadPoolWorkQueue::queue(const ThreadPoolWorkItemPtr& item)
 #endif
 }
 
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
 bool
 IceInternal::ThreadPoolWorkQueue::startAsync(SocketOperation)
 {
@@ -226,7 +222,7 @@ IceInternal::ThreadPoolWorkQueue::message(ThreadPoolCurrent& current)
             workItem = _workItems.front();
             _workItems.pop_front();
         }
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
         else
         {
             assert(_destroyed);
@@ -293,19 +289,18 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& p
     _threadIdleTime(0),
     _stackSize(0),
     _inUse(0),
-#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP)
+#if !defined(ICE_USE_IOCP)
     _inUseIO(0),
     _nextHandler(_handlers.end()),
 #endif
     _promote(true)
 {
     PropertiesPtr properties = _instance->initializationData().properties;
-#ifndef ICE_OS_UWP
-#   ifdef _WIN32
+#ifdef _WIN32
     SYSTEM_INFO sysInfo;
     GetSystemInfo(&sysInfo);
     int nProcessors = sysInfo.dwNumberOfProcessors;
-#   elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
     static int ncpu[2] = { CTL_HW, HW_NCPU };
     int nProcessors;
     size_t sz = sizeof(nProcessors);
@@ -313,13 +308,12 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& p
     {
         nProcessors = 1;
     }
-#   else
+#else
     int nProcessors = static_cast<int>(sysconf(_SC_NPROCESSORS_ONLN));
     if(nProcessors == -1)
     {
         nProcessors = 1;
     }
-#   endif
 #endif
 
     //
@@ -336,12 +330,11 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& p
     }
 
     int sizeMax = properties->getPropertyAsIntWithDefault(_prefix + ".SizeMax", size);
-#ifndef ICE_OS_UWP
     if(sizeMax == -1)
     {
         sizeMax = nProcessors;
     }
-#endif
+
     if(sizeMax < size)
     {
         Warning out(_instance->initializationData().logger);
@@ -374,11 +367,7 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& p
     const_cast<int&>(_size) = size;
     const_cast<int&>(_sizeMax) = sizeMax;
     const_cast<int&>(_sizeWarn) = sizeWarn;
-#ifndef ICE_OS_UWP
     const_cast<int&>(_sizeIO) = min(sizeMax, nProcessors);
-#else
-    const_cast<int&>(_sizeIO) = sizeMax;
-#endif
     const_cast<int&>(_threadIdleTime) = threadIdleTime;
 
 #ifdef ICE_USE_IOCP
@@ -543,7 +532,7 @@ IceInternal::ThreadPool::finish(const EventHandlerPtr& handler, bool closeNow)
 {
     Lock sync(*this);
     assert(!_destroyed);
-#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP)
+#if !defined(ICE_USE_IOCP)
     closeNow = _selector.finish(handler.get(), closeNow); // This must be called before!
     _workQueue->queue(new FinishedWorkItem(handler, !closeNow));
     return closeNow;
@@ -670,7 +659,7 @@ IceInternal::ThreadPool::getDispatchQueue() const ICE_NOEXCEPT
 void
 IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
 {
-#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP)
+#if !defined(ICE_USE_IOCP)
     ThreadPoolCurrent current(_instance, this, thread);
     bool select = false;
     while(true)
@@ -824,12 +813,8 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
         try
         {
             current._ioCompleted = false;
-#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));
-#endif
         }
         catch(const SelectorTimeoutException&)
         {
@@ -843,14 +828,13 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
                 }
                 else if(_inUse < static_cast<int>(_threads.size() - 1)) // If not the last idle thread, we can exit.
                 {
-#ifndef ICE_OS_UWP
                     BOOL hasIO = false;
                     GetThreadIOPendingFlag(GetCurrentThread(), &hasIO);
                     if(hasIO)
                     {
                         continue;
                     }
-#endif
+
                     if(_instance->traceLevels()->threadPool >= 1)
                     {
                         Trace out(_instance->initializationData().logger, _instance->traceLevels()->threadPoolCat);
@@ -874,13 +858,8 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
 
             try
             {
-#ifdef ICE_OS_UWP
-                current._handler = ICE_GET_SHARED_FROM_THIS(_selector.getNextHandler(current.operation, _serverIdleTime));
-#else
-
                 current._handler = ICE_GET_SHARED_FROM_THIS(_selector.getNextHandler(current.operation, current._count,
                                                             current._error, _serverIdleTime));
-#endif
             }
             catch(const SelectorTimeoutException&)
             {
@@ -912,19 +891,6 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
             Error out(_instance->initializationData().logger);
             out << "exception in `" << _prefix << "':\n" << ex << "\nevent handler: " << current._handler->toString();
         }
-#ifdef ICE_OS_UWP
-        catch(Platform::Exception^ ex)
-        {
-            //
-            // We don't need to pass the wide string converter in the call to wstringToString
-            // because the wide string is using the platform default encoding.
-            //
-            Error out(_instance->initializationData().logger);
-            out << "exception in `" << _prefix << "':\n"
-                << wstringToString(ex->Message->Data(), _instance->getStringConverter())
-                << "\nevent handler: " << current._handler->toString();
-        }
-#endif
         catch(...)
         {
             Error out(_instance->initializationData().logger);
@@ -956,7 +922,7 @@ IceInternal::ThreadPool::ioCompleted(ThreadPoolCurrent& current)
     if(_sizeMax > 1)
     {
 
-#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP)
+#if !defined(ICE_USE_IOCP)
         --_inUseIO;
 
         if(!_destroyed)
@@ -1026,7 +992,7 @@ IceInternal::ThreadPool::ioCompleted(ThreadPoolCurrent& current)
     return _serialize && current._handler.get() != _workQueue.get();
 }
 
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
 bool
 IceInternal::ThreadPool::startMessage(ThreadPoolCurrent& current)
 {
@@ -1038,11 +1004,9 @@ IceInternal::ThreadPool::startMessage(ThreadPoolCurrent& current)
         current._handler->_completed = static_cast<SocketOperation>(current._handler->_completed | current.operation);
         current._handler->_started = static_cast<SocketOperation>(current._handler->_started & ~current.operation);
 
-#ifndef ICE_OS_UWP
         AsyncInfo* info = current._handler->getNativeInfo()->getAsyncInfo(current.operation);
         info->count = current._count;
         info->error = current._error;
-#endif
 
         if(!current._handler->finishAsync(current.operation)) // Returns false if the handler is finished.
         {
@@ -1321,7 +1285,7 @@ ThreadPoolCurrent::ThreadPoolCurrent(const InstancePtr& instance,
     _threadPool(threadPool.get()),
     _thread(thread),
     _ioCompleted(false)
-#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP)
+#if !defined(ICE_USE_IOCP)
     , _leader(false)
 #endif
 {

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

@@ -120,7 +120,7 @@ private:
 
     bool ioCompleted(ThreadPoolCurrent&);
 
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
     bool startMessage(ThreadPoolCurrent&);
     void finishMessage(ThreadPoolCurrent&);
 #else
@@ -163,7 +163,7 @@ private:
 
     std::set<EventHandlerThreadPtr> _threads; // All threads, running or not.
     int _inUse; // Number of threads that are currently in use.
-#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP)
+#if !defined(ICE_USE_IOCP)
     int _inUseIO; // Number of threads that are currently performing IO.
     std::vector<std::pair<EventHandler*, SocketOperation> > _handlers;
     std::vector<std::pair<EventHandler*, SocketOperation> >::const_iterator _nextHandler;
@@ -186,7 +186,7 @@ public:
         return _threadPool->ioCompleted(const_cast<ThreadPoolCurrent&>(*this));
     }
 
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
     bool startMessage()
     {
         return _threadPool->startMessage(const_cast<ThreadPoolCurrent&>(*this));
@@ -214,7 +214,7 @@ private:
     ThreadPool::EventHandlerThreadPtr _thread;
     EventHandlerPtr _handler;
     bool _ioCompleted;
-#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP)
+#if !defined(ICE_USE_IOCP)
     bool _leader;
 #else
     DWORD _count;
@@ -232,7 +232,7 @@ public:
     void destroy();
     void queue(const ThreadPoolWorkItemPtr&);
 
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
     bool startAsync(SocketOperation);
     bool finishAsync(SocketOperation);
 #endif
@@ -259,7 +259,7 @@ private:
 // the IOCP implementation and ensures that finishMessage isn't called multiple
 // times.
 //
-#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP)
+#if !defined(ICE_USE_IOCP)
 template<class T> class ThreadPoolMessage
 {
 public:

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

@@ -29,7 +29,7 @@ public:
     virtual EndpointIPtr bind();
     virtual SocketOperation write(Buffer&) = 0;
     virtual SocketOperation read(Buffer&) = 0;
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
     virtual bool startWrite(Buffer&) = 0;
     virtual void finishWrite(Buffer&) = 0;
     virtual void startRead(Buffer&) = 0;

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

@@ -119,16 +119,11 @@ IceInternal::UdpConnector::UdpConnector(const ProtocolInstancePtr& instance, con
                                         const std::string& connectionId) :
     _instance(instance),
     _addr(addr),
-#ifndef ICE_OS_UWP
     _sourceAddr(sourceAddr),
-#endif
     _mcastInterface(mcastInterface),
     _mcastTtl(mcastTtl),
     _connectionId(connectionId)
 {
-#ifdef ICE_OS_UWP
-    UNREFERENCED_PARAMETER(sourceAddr);
-#endif
 }
 
 IceInternal::UdpConnector::~UdpConnector()