zeroc-ice 3.6b1 → 3.6.0

data/ext/ice/cpp/include/Ice/MetricsAdminI.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/include/Ice/MetricsFunctional.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/include/Ice/MetricsObserverI.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.
@@ -11,6 +11,7 @@
 #define ICEMX_METRICSOBSERVER_I_H
 
 #include <IceUtil/StopWatch.h>
+#include <IceUtil/Atomic.h>
 
 #include <Ice/Instrumentation.h>
 #include <Ice/Endpoint.h>
@@ -29,6 +30,10 @@ template<typename T> class MetricsHelperT
 {
 public:
 
+    virtual ~MetricsHelperT()
+    {
+    }
+
     virtual std::string operator()(const std::string&) const = 0;
 
     virtual void initMetrics(const IceInternal::Handle<T>&) const
@@ -48,7 +53,7 @@ protected:
             {
             }
 
-            virtual ~Resolver() 
+            virtual ~Resolver()
             {
             }
 
@@ -90,7 +95,7 @@ protected:
             }
             return (*p->second)(helper);
         }
-        
+
         void
         setDefault(std::string (Helper::*memberFn)(const std::string&) const)
         {
@@ -107,7 +112,7 @@ protected:
         template<typename Y> void
         add(const std::string& name, Y (Helper::*memberFn)() const)
         {
-            _attributes.insert(typename std::map<std::string, 
+            _attributes.insert(typename std::map<std::string,
                                Resolver*>::value_type(name, new HelperMemberFunctionResolver<Y>(name, memberFn)));
         }
 
@@ -121,13 +126,13 @@ protected:
         template<typename I, typename O, typename Y> void
         add(const std::string& name, O (Helper::*getFn)() const, Y (I::*memberFn)() const)
         {
-            _attributes.insert(typename std::map<std::string, 
-                               Resolver*>::value_type(name, new MemberFunctionResolver<I, O, Y>(name, getFn, 
+            _attributes.insert(typename std::map<std::string,
+                               Resolver*>::value_type(name, new MemberFunctionResolver<I, O, Y>(name, getFn,
                                                                                                 memberFn)));
         }
 
     private:
-            
+
         template<typename Y> class HelperMemberResolver : public Resolver
         {
         public:
@@ -170,7 +175,7 @@ protected:
         {
         public:
 
-            MemberResolver(const std::string& name, O (Helper::*getFn)() const, Y I::*member) : 
+            MemberResolver(const std::string& name, O (Helper::*getFn)() const, Y I::*member) :
                 Resolver(name), _getFn(getFn), _member(member)
             {
             }
@@ -272,19 +277,19 @@ typedef IceUtil::Handle<Updater> UpdaterPtr;
 template<typename T> class UpdaterT : public Updater
 {
 public:
-    
-    UpdaterT(T* updater, void (T::*fn)()) : 
+
+    UpdaterT(T* updater, void (T::*fn)()) :
         _updater(updater), _fn(fn)
     {
     }
-        
+
     virtual void update()
     {
         (_updater.get()->*_fn)();
     }
-    
-private: 
-    
+
+private:
+
     const IceUtil::Handle<T> _updater;
     void (T::*_fn)();
 };
@@ -313,8 +318,8 @@ public:
     ObserverT() : _previousDelay(0)
     {
     }
-    
-    virtual void 
+
+    virtual void
     attach()
     {
         if(!_watch.isStarted())
@@ -323,7 +328,7 @@ public:
         }
     }
 
-    virtual void 
+    virtual void
     detach()
     {
         ::Ice::Long lifetime = _previousDelay + _watch.stop();
@@ -350,7 +355,7 @@ public:
             (*p)->execute(func);
         }
     }
-    
+
     void
     init(const MetricsHelperT<MetricsType>& /*helper*/, EntrySeqType& objects, ObserverT* previous = 0)
     {
@@ -411,7 +416,7 @@ public:
         obsv->init(helper, metricsObjects);
         return obsv;
     }
-    
+
 private:
 
     EntrySeqType _objects;
@@ -419,7 +424,7 @@ private:
     IceUtil::Int64 _previousDelay;
 };
 
-template<typename ObserverImplType> 
+template<typename ObserverImplType>
 class ObserverFactoryT : public Updater, private IceUtil::Mutex
 {
 public:
@@ -429,8 +434,8 @@ public:
 
     typedef std::vector<IceUtil::Handle<IceInternal::MetricsMapT<MetricsType> > > MetricsMapSeqType;
 
-    ObserverFactoryT(const IceInternal::MetricsAdminIPtr& metrics, const std::string& name) : 
-        _metrics(metrics), _name(name), _enabled(false)
+    ObserverFactoryT(const IceInternal::MetricsAdminIPtr& metrics, const std::string& name) :
+        _metrics(metrics), _name(name), _enabled(0)
     {
         _metrics->registerMap<MetricsType>(name, this);
     }
@@ -508,7 +513,7 @@ public:
         return obsv;
     }
 
-    template<typename SubMapMetricsType> void 
+    template<typename SubMapMetricsType> void
     registerSubMap(const std::string& subMap, MetricsMap MetricsType::* member)
     {
         assert(_metrics);
@@ -517,7 +522,7 @@ public:
 
     bool isEnabled() const
     {
-        return _enabled;
+        return _enabled != 0;
     }
 
     virtual void update()
@@ -537,7 +542,7 @@ public:
                 _maps.push_back(IceUtil::Handle<IceInternal::MetricsMapT<MetricsType> >::dynamicCast(*p));
                 assert(_maps.back());
             }
-            _enabled = !_maps.empty();
+            _enabled.exchange(_maps.empty() ? 0 : 1);
             updater = _updater;
         }
 
@@ -565,7 +570,11 @@ private:
     IceInternal::MetricsAdminIPtr _metrics;
     const std::string _name;
     MetricsMapSeqType _maps;
-    volatile bool _enabled;
+    //
+    // TODO: Replace by std::atomic<bool> when it becomes widely
+    // available.
+    //
+    IceUtilInternal::Atomic _enabled;
     UpdaterPtr _updater;
 };
 

data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.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/include/Ice/Object.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/include/Ice/ObjectAdapter.h

@@ -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>
 //
@@ -39,14 +39,22 @@
 #include <IceUtil/UndefSysMacros.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
 
 #ifndef ICE_API
 #   ifdef ICE_API_EXPORTS
 #       define ICE_API ICE_DECLSPEC_EXPORT
+#   elif defined(ICE_STATIC_LIBS)
+#       define ICE_API /**/
 #   else
 #       define ICE_API ICE_DECLSPEC_IMPORT
 #   endif

data/ext/ice/cpp/include/Ice/ObjectAdapterF.h

@@ -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>
 //
@@ -32,14 +32,22 @@
 #include <IceUtil/UndefSysMacros.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
 
 #ifndef ICE_API
 #   ifdef ICE_API_EXPORTS
 #       define ICE_API ICE_DECLSPEC_EXPORT
+#   elif defined(ICE_STATIC_LIBS)
+#       define ICE_API /**/
 #   else
 #       define ICE_API ICE_DECLSPEC_IMPORT
 #   endif

data/ext/ice/cpp/include/Ice/ObjectAdapterFactoryF.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/include/Ice/ObjectF.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/include/Ice/ObjectFactory.h

@@ -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>
 //
@@ -32,14 +32,22 @@
 #include <IceUtil/UndefSysMacros.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
 
 #ifndef ICE_API
 #   ifdef ICE_API_EXPORTS
 #       define ICE_API ICE_DECLSPEC_EXPORT
+#   elif defined(ICE_STATIC_LIBS)
+#       define ICE_API /**/
 #   else
 #       define ICE_API ICE_DECLSPEC_IMPORT
 #   endif

data/ext/ice/cpp/include/Ice/ObjectFactoryF.h

@@ -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>
 //
@@ -32,14 +32,22 @@
 #include <IceUtil/UndefSysMacros.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
 
 #ifndef ICE_API
 #   ifdef ICE_API_EXPORTS
 #       define ICE_API ICE_DECLSPEC_EXPORT
+#   elif defined(ICE_STATIC_LIBS)
+#       define ICE_API /**/
 #   else
 #       define ICE_API ICE_DECLSPEC_IMPORT
 #   endif

data/ext/ice/cpp/include/Ice/ObjectFactoryManagerF.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/include/Ice/ObserverHelper.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/include/Ice/Outgoing.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.
@@ -40,12 +40,10 @@ class ICE_API OutgoingBase : private IceUtil::noncopyable
 public:
 
     virtual ~OutgoingBase() { }
- 
-    virtual bool send(const Ice::ConnectionIPtr&, bool, bool) = 0;
-    virtual void invokeCollocated(CollocatedRequestHandler*) = 0;
 
     virtual void sent() = 0;
     virtual void completed(const Ice::Exception&) = 0;
+    virtual void completed(BasicStream&) = 0;
     virtual void retryException(const Ice::Exception&) = 0;
 
     BasicStream* os() { return &_os; }
@@ -64,7 +62,7 @@ public:
 
 protected:
 
-    OutgoingBase(Instance*, const std::string&);
+    OutgoingBase(Instance*);
 
     BasicStream _os;
     IceUtil::UniquePtr<Ice::Exception> _exception;
@@ -75,23 +73,60 @@ protected:
     IceUtil::Monitor<IceUtil::Mutex> _monitor;
 };
 
-class ICE_API Outgoing : public OutgoingBase
+class ICE_API ProxyOutgoingBase : public OutgoingBase
 {
 public:
 
-    Outgoing(IceProxy::Ice::Object*, const std::string&, Ice::OperationMode, const Ice::Context*);
-    ~Outgoing();
+    ProxyOutgoingBase(IceProxy::Ice::Object*, Ice::OperationMode);
+    ~ProxyOutgoingBase();
 
-    virtual bool send(const Ice::ConnectionIPtr&, bool, bool);
-    virtual void invokeCollocated(CollocatedRequestHandler*);
+    virtual bool invokeRemote(const Ice::ConnectionIPtr&, bool, bool) = 0;
+    virtual void invokeCollocated(CollocatedRequestHandler*) = 0;
 
     virtual void sent();
     virtual void completed(const Ice::Exception&);
+    virtual void completed(BasicStream&);
     virtual void retryException(const Ice::Exception&);
 
+protected:
+
+    bool invokeImpl(); // Returns true if ok, false if user exception.
+
+    //
+    // Optimization. The request handler and the reference may not be
+    // deleted while a stack-allocated Outgoing still holds it.
+    //
+    IceProxy::Ice::Object* _proxy;
+    Ice::OperationMode _mode;
+    RequestHandlerPtr _handler;
+    IceUtil::Time _invocationTimeoutDeadline;
+
+    enum
+    {
+        StateUnsent,
+        StateInProgress,
+        StateRetry,
+        StateOK,
+        StateUserException,
+        StateLocalException,
+        StateFailed
+    } _state;
+};
+
+class ICE_API Outgoing : public ProxyOutgoingBase
+{
+public:
+
+    Outgoing(IceProxy::Ice::Object*, const std::string&, Ice::OperationMode, const Ice::Context*);
+    ~Outgoing();
+
+    virtual bool invokeRemote(const Ice::ConnectionIPtr&, bool, bool);
+    virtual void invokeCollocated(CollocatedRequestHandler*);
+
     bool invoke(); // Returns true if ok, false if user exception.
     void abort(const Ice::LocalException&);
-    void completed(BasicStream&);
+
+    virtual void completed(BasicStream&);
 
     // Inlined for speed optimization.
     BasicStream* startReadParams()
@@ -137,7 +172,7 @@ public:
         }
     }
 
-    bool hasResponse() 
+    bool hasResponse()
     {
         return !_is.b.empty();
     }
@@ -146,49 +181,42 @@ public:
 
 private:
 
-    //
-    // Optimization. The request handler and the reference may not be
-    // deleted while a stack-allocated Outgoing still holds it.
-    //
-    IceProxy::Ice::Object* _proxy;
-    Ice::OperationMode _mode;
-    RequestHandlerPtr _handler;
-    IceUtil::Time _invocationTimeoutDeadline;
-
-    enum
-    {
-        StateUnsent,
-        StateInProgress,
-        StateRetry,
-        StateOK,
-        StateUserException,
-        StateLocalException,
-        StateFailed
-    } _state;
-
     Ice::EncodingVersion _encoding;
     BasicStream _is;
+    const std::string& _operation;
 };
 
-class FlushBatch : public OutgoingBase
+class ProxyFlushBatch : public ProxyOutgoingBase
 {
 public:
 
-    FlushBatch(IceProxy::Ice::Object*, const std::string&);
-    FlushBatch(Ice::ConnectionI*, Instance*, const std::string&);
-    
-    void invoke();
+    ProxyFlushBatch(IceProxy::Ice::Object*, const std::string&);
 
-    virtual bool send(const Ice::ConnectionIPtr&, bool, bool);
+    virtual bool invokeRemote(const Ice::ConnectionIPtr&, bool, bool);
     virtual void invokeCollocated(CollocatedRequestHandler*);
 
+    void invoke();
+
+private:
+
+    int _batchRequestNum;
+};
+
+class ConnectionFlushBatch : public OutgoingBase
+{
+public:
+
+    ConnectionFlushBatch(Ice::ConnectionI*, Instance*, const std::string&);
+
+    void invoke();
+
     virtual void sent();
     virtual void completed(const Ice::Exception&);
+    virtual void completed(BasicStream&);
     virtual void retryException(const Ice::Exception&);
 
 private:
 
-    IceProxy::Ice::Object* _proxy;
     Ice::ConnectionI* _connection;
 };