zeroc-ice 3.7.10 → 3.8.0

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

@@ -1,393 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#ifndef ICE_THREAD_POOL_H
-#define ICE_THREAD_POOL_H
-
-#include <IceUtil/Shared.h>
-#include <IceUtil/Mutex.h>
-#include <IceUtil/Monitor.h>
-#include <IceUtil/Thread.h>
-
-#include <Ice/Config.h>
-#include <Ice/Dispatcher.h>
-#include <Ice/ThreadPoolF.h>
-#include <Ice/InstanceF.h>
-#include <Ice/LoggerF.h>
-#include <Ice/PropertiesF.h>
-#include <Ice/EventHandler.h>
-#include <Ice/Selector.h>
-#include <Ice/InputStream.h>
-#include <Ice/ObserverHelper.h>
-
-#include <set>
-#include <list>
-
-namespace IceInternal
-{
-
-class ThreadPoolCurrent;
-
-class ThreadPoolWorkQueue;
-ICE_DEFINE_PTR(ThreadPoolWorkQueuePtr, ThreadPoolWorkQueue);
-
-class ThreadPoolWorkItem : public virtual IceUtil::Shared
-{
-public:
-
-    virtual void execute(ThreadPoolCurrent&) = 0;
-};
-typedef IceUtil::Handle<ThreadPoolWorkItem> ThreadPoolWorkItemPtr;
-
-class DispatchWorkItem : public ThreadPoolWorkItem, public Ice::DispatcherCall
-{
-public:
-
-    DispatchWorkItem();
-    DispatchWorkItem(const Ice::ConnectionPtr& connection);
-
-    const Ice::ConnectionPtr&
-    getConnection()
-    {
-        return _connection;
-    }
-
-private:
-
-    virtual void execute(ThreadPoolCurrent&);
-
-    const Ice::ConnectionPtr _connection;
-};
-typedef IceUtil::Handle<DispatchWorkItem> DispatchWorkItemPtr;
-
-class ThreadPool : public IceUtil::Shared, private IceUtil::Monitor<IceUtil::Mutex>
-{
-    class EventHandlerThread : public IceUtil::Thread
-    {
-    public:
-
-        EventHandlerThread(const ThreadPoolPtr&, const std::string&);
-        virtual void run();
-
-        void updateObserver();
-        void setState(Ice::Instrumentation::ThreadState);
-
-    private:
-
-        ThreadPoolPtr _pool;
-        ObserverHelperT<Ice::Instrumentation::ThreadObserver> _observer;
-        Ice::Instrumentation::ThreadState _state;
-    };
-    typedef IceUtil::Handle<EventHandlerThread> EventHandlerThreadPtr;
-
-public:
-
-    ThreadPool(const InstancePtr&, const std::string&, int);
-    virtual ~ThreadPool();
-
-    void destroy();
-
-    void updateObservers();
-
-    void initialize(const EventHandlerPtr&);
-    void _register(const EventHandlerPtr& handler, SocketOperation status)
-    {
-        update(handler, SocketOperationNone, status);
-    }
-    void update(const EventHandlerPtr&, SocketOperation, SocketOperation);
-    void unregister(const EventHandlerPtr& handler, SocketOperation status)
-    {
-        update(handler, status, SocketOperationNone);
-    }
-    bool finish(const EventHandlerPtr&, bool);
-    void ready(const EventHandlerPtr&, SocketOperation, bool);
-
-    void dispatchFromThisThread(const DispatchWorkItemPtr&);
-    void dispatch(const DispatchWorkItemPtr&);
-
-    void joinWithAllThreads();
-
-    std::string prefix() const;
-
-#ifdef ICE_SWIFT
-    dispatch_queue_t getDispatchQueue() const ICE_NOEXCEPT;
-#endif
-
-private:
-
-    void run(const EventHandlerThreadPtr&);
-
-    bool ioCompleted(ThreadPoolCurrent&);
-
-#if defined(ICE_USE_IOCP)
-    bool startMessage(ThreadPoolCurrent&);
-    void finishMessage(ThreadPoolCurrent&);
-#else
-    void promoteFollower(ThreadPoolCurrent&);
-    bool followerWait(ThreadPoolCurrent&);
-#endif
-
-    std::string nextThreadId();
-
-    const InstancePtr _instance;
-#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
-    const Ice::DispatcherPtr _dispatcher;
-#   endif
-#endif
-    ThreadPoolWorkQueuePtr _workQueue;
-    bool _destroyed;
-    const std::string _prefix;
-    Selector _selector;
-    int _nextThreadId;
-
-    friend class EventHandlerThread;
-    friend class ThreadPoolCurrent;
-    friend class ThreadPoolWorkQueue;
-
-    const int _size; // Number of threads that are pre-created.
-    const int _sizeIO; // Maximum number of threads that can concurrently perform IO.
-    const int _sizeMax; // Maximum number of threads.
-    const int _sizeWarn; // If _inUse reaches _sizeWarn, a "low on threads" warning will be printed.
-    const bool _serialize; // True if requests need to be serialized over the connection.
-    const bool _hasPriority;
-    const int _priority;
-    const int _serverIdleTime;
-    const int _threadIdleTime;
-    const size_t _stackSize;
-
-    std::set<EventHandlerThreadPtr> _threads; // All threads, running or not.
-    int _inUse; // Number of threads that are currently in use.
-#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;
-#endif
-
-    bool _promote;
-};
-
-class ThreadPoolCurrent
-{
-public:
-
-    ThreadPoolCurrent(const InstancePtr&, const ThreadPoolPtr&, const ThreadPool::EventHandlerThreadPtr&);
-
-    SocketOperation operation;
-    Ice::InputStream stream; // A per-thread stream to be used by event handlers for optimization.
-
-    bool ioCompleted() const
-    {
-        return _threadPool->ioCompleted(const_cast<ThreadPoolCurrent&>(*this));
-    }
-
-#if defined(ICE_USE_IOCP)
-    bool startMessage()
-    {
-        return _threadPool->startMessage(const_cast<ThreadPoolCurrent&>(*this));
-    }
-
-    void finishMessage()
-    {
-        _threadPool->finishMessage(const_cast<ThreadPoolCurrent&>(*this));
-    }
-#else
-    bool ioReady()
-    {
-        return (_handler->_registered & operation) != 0;
-    }
-#endif
-
-    void dispatchFromThisThread(const DispatchWorkItemPtr& workItem)
-    {
-        _threadPool->dispatchFromThisThread(workItem);
-    }
-
-private:
-
-    ThreadPool* _threadPool;
-    ThreadPool::EventHandlerThreadPtr _thread;
-    EventHandlerPtr _handler;
-    bool _ioCompleted;
-#if !defined(ICE_USE_IOCP)
-    bool _leader;
-#else
-    DWORD _count;
-    int _error;
-#endif
-    friend class ThreadPool;
-};
-
-class ThreadPoolWorkQueue : public EventHandler
-{
-public:
-
-    ThreadPoolWorkQueue(ThreadPool&);
-
-    void destroy();
-    void queue(const ThreadPoolWorkItemPtr&);
-
-#if defined(ICE_USE_IOCP)
-    bool startAsync(SocketOperation);
-    bool finishAsync(SocketOperation);
-#endif
-
-    virtual void message(ThreadPoolCurrent&);
-    virtual void finished(ThreadPoolCurrent&, bool);
-    virtual std::string toString() const;
-    virtual NativeInfoPtr getNativeInfo();
-
-private:
-
-    ThreadPool& _threadPool;
-    bool _destroyed;
-    std::list<ThreadPoolWorkItemPtr> _workItems;
-};
-
-//
-// The ThreadPoolMessage class below hides the IOCP implementation details from
-// the event handler implementations. Only event handler implementation that
-// require IO need to use this class.
-//
-// An instance of the IOScope subclass must be created within the synchronization
-// of the event handler. It takes care of calling startMessage/finishMessage for
-// the IOCP implementation and ensures that finishMessage isn't called multiple
-// times.
-//
-#if !defined(ICE_USE_IOCP)
-template<class T> class ThreadPoolMessage
-{
-public:
-
-    class IOScope
-    {
-    public:
-
-        IOScope(ThreadPoolMessage<T>& message) : _message(message)
-        {
-            // Nothing to do.
-        }
-
-        ~IOScope()
-        {
-            // Nothing to do.
-        }
-
-        operator bool()
-        {
-            return _message._current.ioReady(); // Ensure the handler is still interested in the operation.
-        }
-
-        void completed()
-        {
-            _message._current.ioCompleted();
-        }
-
-    private:
-
-        ThreadPoolMessage<T>& _message;
-    };
-    friend class IOScope;
-
-    ThreadPoolMessage(ThreadPoolCurrent& current, const T&) : _current(current)
-    {
-    }
-
-    ~ThreadPoolMessage()
-    {
-        // Nothing to do.
-    }
-
-private:
-
-    ThreadPoolCurrent& _current;
-};
-
-#else
-
-template<class T> class ThreadPoolMessage
-{
-public:
-
-    class IOScope
-    {
-    public:
-
-        IOScope(ThreadPoolMessage& message) : _message(message)
-        {
-            // This must be called with the handler locked.
-            _finish = _message._current.startMessage();
-        }
-
-        ~IOScope()
-        {
-            if(_finish)
-            {
-                // This must be called with the handler locked.
-                _message._current.finishMessage();
-            }
-        }
-
-        operator bool()
-        {
-            return _finish;
-        }
-
-        void
-        completed()
-        {
-            //
-            // Call finishMessage once IO is completed only if serialization is not enabled.
-            // Otherwise, finishMessage will be called when the event handler is done with
-            // the message (it will be called from ~ThreadPoolMessage below).
-            //
-            assert(_finish);
-            if(_message._current.ioCompleted())
-            {
-                _finish = false;
-                _message._finish = true;
-            }
-        }
-
-    private:
-
-        ThreadPoolMessage& _message;
-        bool _finish;
-    };
-    friend class IOScope;
-
-    ThreadPoolMessage(ThreadPoolCurrent& current, const T& mutex) :
-        _current(current), _mutex(mutex), _finish(false)
-    {
-    }
-
-    ~ThreadPoolMessage()
-    {
-        if(_finish)
-        {
-            //
-            // A ThreadPoolMessage instance must be created outside the synchronization
-            // of the event handler. We need to lock the event handler here to call
-            // finishMessage.
-            //
-            IceUtil::LockT<T> sync(_mutex);
-            _current.finishMessage();
-        }
-    }
-
-private:
-
-    ThreadPoolCurrent& _current;
-    const T& _mutex;
-    bool _finish;
-};
-#endif
-
-};
-
-#endif

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

@@ -1,263 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#include <IceUtil/Timer.h>
-#include <IceUtil/Exception.h>
-#include <Ice/ConsoleUtil.h>
-
-using namespace std;
-using namespace IceUtil;
-using namespace IceInternal;
-
-TimerTask::~TimerTask()
-{
-    // Out of line to avoid weak vtable
-}
-
-Timer::Timer() :
-    Thread("IceUtil timer thread"),
-    _destroyed(false)
-{
-    __setNoDelete(true);
-    start();
-    __setNoDelete(false);
-}
-
-Timer::Timer(int priority) :
-    Thread("IceUtil timer thread"),
-    _destroyed(false)
-{
-    __setNoDelete(true);
-    start(0, priority);
-    __setNoDelete(false);
-}
-
-void
-Timer::destroy()
-{
-    {
-        IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
-        if(_destroyed)
-        {
-            return;
-        }
-        _destroyed = true;
-        _monitor.notify();
-        _tasks.clear();
-        _tokens.clear();
-    }
-
-    if(getThreadControl() == ThreadControl())
-    {
-        getThreadControl().detach();
-    }
-    else
-    {
-        getThreadControl().join();
-    }
-}
-
-void
-Timer::schedule(const TimerTaskPtr& task, const IceUtil::Time& delay)
-{
-    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
-    if(_destroyed)
-    {
-        throw IllegalArgumentException(__FILE__, __LINE__, "timer destroyed");
-    }
-
-    IceUtil::Time now = IceUtil::Time::now(IceUtil::Time::Monotonic);
-    IceUtil::Time time = now + delay;
-    if(delay > IceUtil::Time() && time < now)
-    {
-        throw IllegalArgumentException(__FILE__, __LINE__, "invalid delay");
-    }
-
-    bool inserted = _tasks.insert(make_pair(task, time)).second;
-    if(!inserted)
-    {
-        throw IllegalArgumentException(__FILE__, __LINE__, "task is already scheduled");
-    }
-    _tokens.insert(Token(time, IceUtil::Time(), task));
-
-    if(_wakeUpTime == IceUtil::Time() || time < _wakeUpTime)
-    {
-        _monitor.notify();
-    }
-}
-
-void
-Timer::scheduleRepeated(const TimerTaskPtr& task, const IceUtil::Time& delay)
-{
-    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
-    if(_destroyed)
-    {
-        throw IllegalArgumentException(__FILE__, __LINE__, "timer destroyed");
-    }
-
-    IceUtil::Time now = IceUtil::Time::now(IceUtil::Time::Monotonic);
-    const Token token(now + delay, delay, task);
-    if(delay > IceUtil::Time() && token.scheduledTime < now)
-    {
-        throw IllegalArgumentException(__FILE__, __LINE__, "invalid delay");
-    }
-
-    bool inserted = _tasks.insert(make_pair(task, token.scheduledTime)).second;
-    if(!inserted)
-    {
-        throw IllegalArgumentException(__FILE__, __LINE__, "task is already scheduled");
-    }
-    _tokens.insert(token);
-
-    if(_wakeUpTime == IceUtil::Time() || token.scheduledTime < _wakeUpTime)
-    {
-        _monitor.notify();
-    }
-}
-
-bool
-Timer::cancel(const TimerTaskPtr& task)
-{
-    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
-    if(_destroyed)
-    {
-        return false;
-    }
-
-    map<TimerTaskPtr, IceUtil::Time, TimerTaskCompare>::iterator p = _tasks.find(task);
-    if(p == _tasks.end())
-    {
-        return false;
-    }
-
-    _tokens.erase(Token(p->second, IceUtil::Time(), p->first));
-    _tasks.erase(p);
-
-    return true;
-}
-
-void
-Timer::run()
-{
-    Token token(IceUtil::Time(), IceUtil::Time(), 0);
-    while(true)
-    {
-        {
-            IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
-
-            if(!_destroyed)
-            {
-                //
-                // If the task we just ran is a repeated task, schedule it
-                // again for executation if it wasn't canceled.
-                //
-                if(token.delay != IceUtil::Time())
-                {
-                    map<TimerTaskPtr, IceUtil::Time, TimerTaskCompare>::iterator p = _tasks.find(token.task);
-                    if(p != _tasks.end())
-                    {
-                        token.scheduledTime = IceUtil::Time::now(IceUtil::Time::Monotonic) + token.delay;
-                        p->second = token.scheduledTime;
-                        _tokens.insert(token);
-                    }
-                }
-                token = Token(IceUtil::Time(), IceUtil::Time(), 0);
-
-                if(_tokens.empty())
-                {
-                    _wakeUpTime = IceUtil::Time();
-                    _monitor.wait();
-                }
-            }
-
-            if(_destroyed)
-            {
-                break;
-            }
-
-            while(!_tokens.empty() && !_destroyed)
-            {
-                const IceUtil::Time now = IceUtil::Time::now(IceUtil::Time::Monotonic);
-                const Token& first = *(_tokens.begin());
-                if(first.scheduledTime <= now)
-                {
-                    token = first;
-                    _tokens.erase(_tokens.begin());
-                    if(token.delay == IceUtil::Time())
-                    {
-                        _tasks.erase(token.task);
-                    }
-                    break;
-                }
-
-                _wakeUpTime = first.scheduledTime;
-                try
-                {
-                    _monitor.timedWait(first.scheduledTime - now);
-                }
-                catch(const IceUtil::InvalidTimeoutException&)
-                {
-                    IceUtil::Time timeout = (first.scheduledTime - now) / 2;
-                    while(timeout > IceUtil::Time())
-                    {
-                        try
-                        {
-                            _monitor.timedWait(timeout);
-                            break;
-                        }
-                        catch(const IceUtil::InvalidTimeoutException&)
-                        {
-                            timeout = timeout / 2;
-                        }
-                    }
-                }
-            }
-
-            if(_destroyed)
-            {
-                break;
-            }
-        }
-
-        if(token.task)
-        {
-            try
-            {
-                runTimerTask(token.task);
-            }
-            catch(const IceUtil::Exception& e)
-            {
-                consoleErr << "IceUtil::Timer::run(): uncaught exception:\n" << e.what();
-#ifdef __GNUC__
-                consoleErr << "\n" << e.ice_stackTrace();
-#endif
-                consoleErr << endl;
-            }
-            catch(const std::exception& e)
-            {
-                consoleErr << "IceUtil::Timer::run(): uncaught exception:\n" << e.what() << endl;
-            }
-            catch(...)
-            {
-                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;
-            }
-        }
-    }
-}
-
-void
-Timer::runTimerTask(const TimerTaskPtr& task)
-{
-    task->runTimerTask();
-}

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

@@ -1,38 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#include <Ice/TraceLevels.h>
-#include <Ice/Properties.h>
-
-using namespace std;
-using namespace Ice;
-using namespace IceInternal;
-
-IceUtil::Shared* IceInternal::upCast(TraceLevels* p) { return p; }
-
-IceInternal::TraceLevels::TraceLevels(const PropertiesPtr& properties) :
-    network(0),
-    networkCat("Network"),
-    protocol(0),
-    protocolCat("Protocol"),
-    retry(0),
-    retryCat("Retry"),
-    location(0),
-    locationCat("Locator"),
-    slicing(0),
-    slicingCat("Slicing"),
-    gc(0),
-    gcCat("GC"),
-    threadPool(0),
-    threadPoolCat("ThreadPool")
-{
-    const string keyBase = "Ice.Trace.";
-    const_cast<int&>(network) = properties->getPropertyAsInt(keyBase + networkCat);
-    const_cast<int&>(protocol) = properties->getPropertyAsInt(keyBase + protocolCat);
-    const_cast<int&>(retry) = properties->getPropertyAsInt(keyBase + retryCat);
-    const_cast<int&>(location) = properties->getPropertyAsInt(keyBase + locationCat);
-    const_cast<int&>(slicing) = properties->getPropertyAsInt(keyBase + slicingCat);
-    const_cast<int&>(gc) = properties->getPropertyAsInt(keyBase + gcCat);
-    const_cast<int&>(threadPool) = properties->getPropertyAsInt(keyBase + threadPoolCat);
-}