zeroc-ice 3.6b1 → 3.6.0

data/ext/ice/cpp/src/Ice/Selector.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.
@@ -28,6 +28,21 @@
 #   include <sys/poll.h>
 #endif
 
+#if defined(ICE_USE_CFSTREAM)
+#   include <IceUtil/RecMutex.h>
+#   include <IceUtil/Thread.h>
+#   include <set>
+
+struct __CFRunLoop;
+typedef struct __CFRunLoop * CFRunLoopRef;
+
+struct __CFRunLoopSource;
+typedef struct __CFRunLoopSource * CFRunLoopSourceRef;
+
+struct __CFSocket;
+typedef struct __CFSocket * CFSocketRef;
+#endif
+
 #if defined(ICE_OS_WINRT)
 #    include <deque>
 #endif
@@ -161,6 +176,120 @@ private:
     int _queueFd;
 };
 
+#elif defined(ICE_USE_CFSTREAM)
+
+class Selector;
+
+class SelectorReadyCallback : public IceUtil::Shared
+{
+public: 
+
+    virtual ~SelectorReadyCallback() { }
+    virtual void readyCallback(SocketOperation, int = 0) = 0;
+};
+
+class StreamNativeInfo : public NativeInfo
+{
+public:
+
+    StreamNativeInfo(SOCKET fd) : NativeInfo(fd), _connectError(0)
+    {
+    }
+
+    virtual void initStreams(SelectorReadyCallback*) = 0;
+    virtual SocketOperation registerWithRunLoop(SocketOperation) = 0;
+    virtual SocketOperation unregisterFromRunLoop(SocketOperation, bool) = 0;
+    virtual void closeStreams() = 0;
+
+    void setConnectError(int error) 
+    {
+        _connectError = error; 
+    }
+
+private:
+
+    int _connectError;
+};
+typedef IceUtil::Handle<StreamNativeInfo> StreamNativeInfoPtr;
+
+class EventHandlerWrapper : public SelectorReadyCallback
+{
+public:
+
+    EventHandlerWrapper(const EventHandlerPtr&, Selector&);
+    ~EventHandlerWrapper();
+
+    void updateRunLoop();
+
+    virtual void readyCallback(SocketOperation, int = 0);
+
+    void ready(SocketOperation, int);
+
+    SocketOperation readyOp();
+    void checkReady();
+
+    bool update(SocketOperation, SocketOperation);
+    void finish();
+
+    bool operator<(const EventHandlerWrapper& o)
+    {
+        return this < &o;
+    }
+
+private:
+
+    friend class Selector;
+
+    EventHandlerPtr _handler;
+    StreamNativeInfoPtr _nativeInfo;
+    Selector& _selector;
+    SocketOperation _ready;
+    bool _finish;
+    CFSocketRef _socket;
+    CFRunLoopSourceRef _source;
+};
+typedef IceUtil::Handle<EventHandlerWrapper> EventHandlerWrapperPtr;
+
+class Selector : IceUtil::Monitor<IceUtil::RecMutex>
+{
+
+public:
+
+    Selector(const InstancePtr&);
+    virtual ~Selector();
+
+    void destroy();
+
+    void initialize(EventHandler*);
+    void update(EventHandler*, SocketOperation, SocketOperation);
+    void enable(EventHandler*, SocketOperation);
+    void disable(EventHandler*, SocketOperation);
+    bool finish(EventHandler*, bool);
+
+    void startSelect() { }
+    void finishSelect() { }
+    void select(std::vector<std::pair<EventHandler*, SocketOperation> >&, int); 
+
+    void processInterrupt();
+    void ready(EventHandlerWrapper*, SocketOperation, int = 0);
+    void addReadyHandler(EventHandlerWrapper*);
+    void run();
+
+private:
+
+    InstancePtr _instance;
+    IceUtil::ThreadPtr _thread;
+    CFRunLoopRef _runLoop;
+    CFRunLoopSourceRef _source;
+    bool _destroyed;
+
+    std::set<EventHandlerWrapperPtr> _changes;
+
+    std::vector<EventHandlerWrapperPtr> _readyHandlers;
+    std::vector<std::pair<EventHandlerWrapperPtr, SocketOperation> > _selectedHandlers;
+    std::map<EventHandler*, EventHandlerWrapperPtr> _wrappers;
+};
+
 #elif defined(ICE_USE_SELECT) || defined(ICE_USE_POLL)
 
 class Selector

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

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// 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.
 //
 // **********************************************************************
 //
-// Ice version 3.6b
+// Ice version 3.6.0
 //
 // <auto-generated>
 //
@@ -28,8 +28,14 @@
 #include <IceUtil/PopDisableWarnings.h>
 
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION  != 30651
-#       error Ice version mismatch: an exact match is required for beta generated code
+#   if ICE_INT_VERSION / 100 != 306
+#       error Ice version mismatch!
+#   endif
+#   if ICE_INT_VERSION % 100 > 50
+#       error Beta header file detected
+#   endif
+#   if ICE_INT_VERSION % 100 < 0
+#       error Ice patch level mismatch!
 #   endif
 #endif
 
@@ -38,4 +44,4 @@ namespace
 
 }
 
-ICE_DECLSPEC_EXPORT ::Ice::LocalObject* Ice::upCast(::Ice::ServantLocator* p) { return p; }
+ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::ServantLocator* p) { return p; }

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

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// 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.
 //
 // **********************************************************************
 //
-// Ice version 3.6b
+// Ice version 3.6.0
 //
 // <auto-generated>
 //
@@ -27,8 +27,14 @@
 #include <IceUtil/PopDisableWarnings.h>
 
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION  != 30651
-#       error Ice version mismatch: an exact match is required for beta generated code
+#   if ICE_INT_VERSION / 100 != 306
+#       error Ice version mismatch!
+#   endif
+#   if ICE_INT_VERSION % 100 > 50
+#       error Beta header file detected
+#   endif
+#   if ICE_INT_VERSION % 100 < 0
+#       error Ice patch level mismatch!
 #   endif
 #endif
 

data/ext/ice/cpp/src/Ice/ServantManager.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.
@@ -18,13 +18,13 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
-ICE_DECLSPEC_EXPORT IceUtil::Shared* IceInternal::upCast(ServantManager* p) { return p; }
+ICE_API IceUtil::Shared* IceInternal::upCast(ServantManager* p) { return p; }
 
 void
 IceInternal::ServantManager::addServant(const ObjectPtr& object, const Identity& ident, const string& facet)
 {
     IceUtil::Mutex::Lock sync(*this);
-    
+
     assert(_instance); // Must not be called after destruction.
 
     ServantMapMap::iterator p = _servantMapMapHint;
@@ -89,7 +89,7 @@ IceInternal::ServantManager::removeServant(const Identity& ident, const string&
     ObjectPtr servant = 0;
 
     IceUtil::Mutex::Lock sync(*this);
-    
+
     assert(_instance); // Must not be called after destruction.
 
     ServantMapMap::iterator p = _servantMapMapHint;
@@ -99,7 +99,7 @@ IceInternal::ServantManager::removeServant(const Identity& ident, const string&
     {
         p = _servantMapMap.find(ident);
     }
-    
+
     if(p == _servantMapMap.end() || (q = p->second.find(facet)) == p->second.end())
     {
         NotRegisteredException ex(__FILE__, __LINE__);
@@ -164,7 +164,7 @@ FacetMap
 IceInternal::ServantManager::removeAllFacets(const Identity& ident)
 {
     IceUtil::Mutex::Lock sync(*this);
-    
+
     assert(_instance); // Must not be called after destruction.
 
     ServantMapMap::iterator p = _servantMapMapHint;
@@ -173,7 +173,7 @@ IceInternal::ServantManager::removeAllFacets(const Identity& ident)
     {
         p = _servantMapMap.find(ident);
     }
-    
+
     if(p == _servantMapMap.end())
     {
         NotRegisteredException ex(__FILE__, __LINE__);
@@ -201,7 +201,7 @@ ObjectPtr
 IceInternal::ServantManager::findServant(const Identity& ident, const string& facet) const
 {
     IceUtil::Mutex::Lock sync(*this);
-    
+
     //
     // This assert is not valid if the adapter dispatch incoming
     // requests from bidir connections. This method might be called if
@@ -212,14 +212,14 @@ IceInternal::ServantManager::findServant(const Identity& ident, const string& fa
 
     ServantMapMap::iterator p = _servantMapMapHint;
     FacetMap::iterator q;
-    
+
     ServantMapMap& servantMapMap = const_cast<ServantMapMap&>(_servantMapMap);
 
     if(p == servantMapMap.end() || p->first != ident)
     {
         p = servantMapMap.find(ident);
     }
-    
+
     if(p == servantMapMap.end() || (q = p->second.find(facet)) == p->second.end())
     {
         DefaultServantMap::const_iterator p = _defaultServantMap.find(ident.category);
@@ -267,18 +267,18 @@ FacetMap
 IceInternal::ServantManager::findAllFacets(const Identity& ident) const
 {
     IceUtil::Mutex::Lock sync(*this);
-    
+
     assert(_instance); // Must not be called after destruction.
 
     ServantMapMap::iterator p = _servantMapMapHint;
-    
+
     ServantMapMap& servantMapMap = const_cast<ServantMapMap&>(_servantMapMap);
 
     if(p == servantMapMap.end() || p->first != ident)
     {
         p = servantMapMap.find(ident);
     }
-    
+
     if(p == servantMapMap.end())
     {
         return FacetMap();
@@ -294,7 +294,7 @@ bool
 IceInternal::ServantManager::hasServant(const Identity& ident) const
 {
     IceUtil::Mutex::Lock sync(*this);
-    
+
     //
     // This assert is not valid if the adapter dispatch incoming
     // requests from bidir connections. This method might be called if
@@ -310,7 +310,7 @@ IceInternal::ServantManager::hasServant(const Identity& ident) const
     {
         p = servantMapMap.find(ident);
     }
-    
+
     if(p == servantMapMap.end())
     {
         return false;
@@ -338,7 +338,7 @@ IceInternal::ServantManager::addServantLocator(const ServantLocatorPtr& locator,
         ex.id = category;
         throw ex;
     }
-    
+
     _locatorMapHint = _locatorMap.insert(_locatorMapHint, pair<const string, ServantLocatorPtr>(category, locator));
 }
 
@@ -381,7 +381,7 @@ ServantLocatorPtr
 IceInternal::ServantManager::findServantLocator(const string& category) const
 {
     IceUtil::Mutex::Lock sync(*this);
-    
+
     //
     // This assert is not valid if the adapter dispatch incoming
     // requests from bidir connections. This method might be called if
@@ -401,12 +401,12 @@ IceInternal::ServantManager::findServantLocator(const string& category) const
             p = _locatorMapHint;
         }
     }
-    
+
     if(p == locatorMap.end())
     {
         p = locatorMap.find(category);
     }
-    
+
     if(p != locatorMap.end())
     {
         _locatorMapHint = p;
@@ -440,11 +440,12 @@ void
 IceInternal::ServantManager::destroy()
 {
     ServantMapMap servantMapMap;
+    DefaultServantMap defaultServantMap;
     map<string, ServantLocatorPtr> locatorMap;
     Ice::LoggerPtr logger;
 
     {
-        IceUtil::Mutex::Lock sync(*this);        
+        IceUtil::Mutex::Lock sync(*this);
         //
         // If the ServantManager has already been destroyed, we're done.
         //
@@ -452,13 +453,17 @@ IceInternal::ServantManager::destroy()
         {
             return;
         }
-        
+
         logger = _instance->initializationData().logger;
+
         servantMapMap.swap(_servantMapMap);
         _servantMapMapHint = _servantMapMap.end();
-        
+
+        defaultServantMap.swap(_defaultServantMap);
+
         locatorMap.swap(_locatorMap);
         _locatorMapHint = _locatorMap.end();
+
         _instance = 0;
     }
 
@@ -488,8 +493,9 @@ IceInternal::ServantManager::destroy()
     //
     // We clear the maps outside the synchronization as we don't want to
     // hold any internal Ice mutex while running user code (such as servant
-    // or servant locator destructors). 
+    // or servant locator destructors).
     //
     servantMapMap.clear();
     locatorMap.clear();
+    defaultServantMap.clear();
 }

data/ext/ice/cpp/src/Ice/ServantManager.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.

data/ext/ice/cpp/src/Ice/SharedContext.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.

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

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// 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.
 //
 // **********************************************************************
 //
-// Ice version 3.6b
+// Ice version 3.6.0
 //
 // <auto-generated>
 //
@@ -28,7 +28,13 @@
 #include <IceUtil/PopDisableWarnings.h>
 
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION  != 30651
-#       error Ice version mismatch: an exact match is required for beta generated code
+#   if ICE_INT_VERSION / 100 != 306
+#       error Ice version mismatch!
+#   endif
+#   if ICE_INT_VERSION % 100 > 50
+#       error Beta header file detected
+#   endif
+#   if ICE_INT_VERSION % 100 < 0
+#       error Ice patch level mismatch!
 #   endif
 #endif