zeroc-ice 3.6b1 → 3.6.0

data/ext/ice/cpp/src/Ice/IPEndpointI.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.
@@ -96,6 +96,12 @@ IceInternal::IPEndpointI::protocol() const
     return _instance->protocol();
 }
 
+bool
+IceInternal::IPEndpointI::secure() const
+{
+    return _instance->secure();
+}
+
 void
 IceInternal::IPEndpointI::streamWrite(BasicStream* s) const
 {

data/ext/ice/cpp/src/Ice/IPEndpointI.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.
@@ -50,6 +50,7 @@ public:
     virtual Ice::EndpointInfoPtr getInfo() const;
     virtual Ice::Short type() const;
     virtual const std::string& protocol() const;
+    virtual bool secure() const;
     virtual void streamWrite(BasicStream*) const;
 
     virtual const std::string& connectionId() const;

data/ext/ice/cpp/src/Ice/IPEndpointIF.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/Identity.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,14 +28,20 @@
 #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
 
 namespace Ice
 {
-#ifdef ICE_HAS_DECLSPEC_IMPORT_EXPORT
+#if defined(ICE_HAS_DECLSPEC_IMPORT_EXPORT) && !defined(ICE_STATIC_LIBS)
 template struct ICE_API StreamWriter< ::Ice::Identity, ::IceInternal::BasicStream>;
 template struct ICE_API StreamReader< ::Ice::Identity, ::IceInternal::BasicStream>;
 #endif

data/ext/ice/cpp/src/Ice/ImplicitContext.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::ImplicitContext* p) { return p; }
+ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::ImplicitContext* p) { return p; }

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

data/ext/ice/cpp/src/Ice/ImplicitContextI.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/Incoming.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.
@@ -33,7 +33,7 @@ using namespace IceInternal;
 namespace IceUtilInternal
 {
 
-extern bool ICE_DECLSPEC_IMPORT printStackTraces;
+extern bool ICE_UTIL_API printStackTraces;
 
 }
 
@@ -84,28 +84,30 @@ IceInternal::IncomingBase::__adopt(IncomingBase& other)
     other._responseHandler = 0;
 }
 
-BasicStream* 
+BasicStream*
 IncomingBase::__startWriteParams(FormatType format)
 {
-    if(_response)
+    if(!_response)
     {
-        assert(_os.b.size() == headerSize + 4); // Reply status position.
-        assert(_current.encoding >= Ice::Encoding_1_0); // Encoding for reply is known.
-        _os.write(static_cast<Ice::Byte>(0));
-        _os.startWriteEncaps(_current.encoding, format);
+        throw MarshalException(__FILE__, __LINE__, "can't marshal out parameters for oneway dispatch");
     }
-    
+
+    assert(_os.b.size() == headerSize + 4); // Reply status position.
+    assert(_current.encoding >= Ice::Encoding_1_0); // Encoding for reply is known.
+    _os.write(static_cast<Ice::Byte>(0));
+    _os.startWriteEncaps(_current.encoding, format);
+
     //
     // We still return the stream even if no response is expected. The
     // servant code might still write some out parameters if for
     // example a method with out parameters somehow and erroneously
-    // invoked as oneway (or if the invocation is invoked on a 
+    // invoked as oneway (or if the invocation is invoked on a
     // blobject and the blobject erroneously writes a response).
     //
     return &_os;
 }
 
-void 
+void
 IncomingBase::__endWriteParams(bool ok)
 {
     if(!ok)
@@ -120,7 +122,7 @@ IncomingBase::__endWriteParams(bool ok)
     }
 }
 
-void 
+void
 IncomingBase::__writeEmptyParams()
 {
     if(_response)
@@ -132,7 +134,7 @@ IncomingBase::__writeEmptyParams()
     }
 }
 
-void 
+void
 IncomingBase::__writeParamEncaps(const Byte* v, Ice::Int sz, bool ok)
 {
     if(!ok)
@@ -156,7 +158,7 @@ IncomingBase::__writeParamEncaps(const Byte* v, Ice::Int sz, bool ok)
     }
 }
 
-void 
+void
 IncomingBase::__writeUserException(const Ice::UserException& ex, Ice::FormatType format)
 {
     ::IceInternal::BasicStream* __os = __startWriteParams(format);
@@ -479,7 +481,7 @@ IceInternal::IncomingBase::__handleException(bool amd)
 }
 
 
-IceInternal::Incoming::Incoming(Instance* instance, ResponseHandler* responseHandler, Ice::Connection* connection, 
+IceInternal::Incoming::Incoming(Instance* instance, ResponseHandler* responseHandler, Ice::Connection* connection,
                                 const ObjectAdapterPtr& adapter, bool response, Byte compress, Int requestId) :
     IncomingBase(instance, responseHandler, connection, adapter, response, compress, requestId),
     _inParamPos(0)
@@ -490,7 +492,7 @@ IceInternal::Incoming::Incoming(Instance* instance, ResponseHandler* responseHan
     if(response)
     {
         _os.writeBlob(replyHdr, sizeof(replyHdr));
-        
+
         //
         // Add the request ID.
         //
@@ -603,10 +605,10 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, BasicStre
 
     const CommunicatorObserverPtr& obsv = _is->instance()->initializationData().observer;
     if(obsv)
-    { 
+    {
         // Read the parameter encapsulation size.
         Ice::Int sz;
-        _is->read(sz); 
+        _is->read(sz);
         _is->i -= 4;
 
         _observer.attach(obsv->getDispatchObserver(_current, static_cast<Int>(_is->i - start + sz)));
@@ -684,7 +686,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, BasicStre
             // to indicate async dispatch.
             //
             if(_servant->__dispatch(*this, _current) == DispatchAsync)
-            {            
+            {
                 return;
             }
 
@@ -699,7 +701,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, BasicStre
             // Skip the input parameters, this is required for reading
             // the next batch request if dispatching batch requests.
             //
-            _is->skipEncaps(); 
+            _is->skipEncaps();
 
             if(servantManager && servantManager->hasServant(_current.id))
             {

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

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

@@ -194,8 +194,8 @@ inline void checkIceVersion(Int version)
     {
         throw VersionMismatchException(__FILE__, __LINE__);
     }
-    
-#   endif    
+
+#   endif
 #endif
 }
 
@@ -381,17 +381,17 @@ Ice::newDispatcher(const ::std::function<void (const DispatcherCallPtr&, const C
     class Cpp11Dispatcher : public Dispatcher
     {
     public:
-        
+
         Cpp11Dispatcher(const ::std::function<void (const DispatcherCallPtr&, const ConnectionPtr)>& cb) :
             _cb(cb)
         {
         }
-        
+
         virtual void dispatch(const DispatcherCallPtr& call, const ConnectionPtr& conn)
         {
             _cb(call, conn);
         }
-        
+
     private:
         const ::std::function<void (const DispatcherCallPtr&, const ConnectionPtr)> _cb;
     };
@@ -399,3 +399,29 @@ Ice::newDispatcher(const ::std::function<void (const DispatcherCallPtr&, const C
     return new Cpp11Dispatcher(cb);
 }
 #endif
+
+#ifdef ICE_CPP11
+Ice::BatchRequestInterceptorPtr
+Ice::newBatchRequestInterceptor(const ::std::function<void (const BatchRequest&, int, int)>& cb)
+{
+    class Cpp11BatchRequestInterceptor : public BatchRequestInterceptor
+    {
+    public:
+
+        Cpp11BatchRequestInterceptor(const ::std::function<void (const BatchRequest&, int, int)>& cb) :
+            _cb(cb)
+        {
+        }
+
+        virtual void enqueue(const BatchRequest& request, int count, int size)
+        {
+            _cb(request, count, size);
+        }
+
+    private:
+        const ::std::function<void (const BatchRequest&, int, int)> _cb;
+    };
+
+    return new Cpp11BatchRequestInterceptor(cb);
+}
+#endif

data/ext/ice/cpp/src/Ice/Instance.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.
@@ -8,6 +8,7 @@
 // **********************************************************************
 
 #include <IceUtil/DisableWarnings.h>
+
 #include <Ice/Instance.h>
 #include <Ice/TraceLevels.h>
 #include <Ice/DefaultsAndOverrides.h>
@@ -26,25 +27,29 @@
 #include <Ice/PropertiesI.h>
 #include <Ice/PropertiesAdminI.h>
 #include <Ice/LoggerI.h>
-#include <Ice/Network.h>
 #include <Ice/NetworkProxy.h>
 #include <Ice/EndpointFactoryManager.h>
+#include <Ice/IPEndpointI.h> // For EndpointHostResolver
+#include <Ice/WSEndpoint.h>
 #include <Ice/RequestHandlerFactory.h>
 #include <Ice/RetryQueue.h>
 #include <Ice/DynamicLibrary.h>
 #include <Ice/PluginManagerI.h>
 #include <Ice/Initialize.h>
 #include <Ice/LoggerUtil.h>
-#include <IceUtil/StringUtil.h>
 #include <Ice/PropertiesI.h>
 #include <Ice/Communicator.h>
 #include <Ice/InstrumentationI.h>
 #include <Ice/ProtocolInstance.h>
 #include <Ice/LoggerAdminI.h>
+#include <Ice/RegisterPlugins.h>
+#include <Ice/ObserverHelper.h>
+
+#include <IceUtil/StringUtil.h>
 #include <IceUtil/UUID.h>
 #include <IceUtil/Mutex.h>
 #include <IceUtil/MutexPtrLock.h>
-#include <Ice/ObserverHelper.h>
+#include <IceUtil/Atomic.h>
 
 #include <stdio.h>
 #include <list>
@@ -62,17 +67,6 @@
 #   include <grp.h> // for initgroups
 #endif
 
-#include <Ice/UdpEndpointI.h>
-
-#ifndef ICE_OS_WINRT
-#   include <Ice/TcpEndpointI.h>
-#else
-#   include <IceSSL/EndpointInfo.h> // For IceSSL::EndpointType
-#   include <Ice/winrt/StreamEndpointI.h>
-#endif
-
-#include <Ice/WSEndpoint.h>
-
 using namespace std;
 using namespace Ice;
 using namespace IceInternal;
@@ -80,8 +74,8 @@ using namespace IceInternal;
 namespace IceUtilInternal
 {
 
-extern bool ICE_DECLSPEC_IMPORT nullHandleAbort;
-extern bool ICE_DECLSPEC_IMPORT printStackTraces;
+extern bool ICE_UTIL_API nullHandleAbort;
+extern bool ICE_UTIL_API printStackTraces;
 
 };
 
@@ -168,6 +162,11 @@ public:
 
 Init init;
 
+//
+// Static initializer to register plugins.
+//
+IceInternal::RegisterPluginsInit initPlugins;
+
 }
 
 namespace IceInternal // Required because ObserverUpdaterI is a friend of Instance
@@ -195,14 +194,14 @@ class Timer : public IceUtil::Timer
 {
 public:
 
-    Timer(int priority) : 
+    Timer(int priority) :
         IceUtil::Timer(priority),
-        _hasObserver(false)
+        _hasObserver(0)
     {
     }
 
     Timer() :
-        _hasObserver(false)
+        _hasObserver(0)
     {
     }
 
@@ -213,7 +212,11 @@ private:
     virtual void runTimerTask(const IceUtil::TimerTaskPtr&);
 
     IceUtil::Mutex _mutex;
-    volatile bool _hasObserver;
+    //
+    // TODO: Replace by std::atomic<bool> when it becomes widely
+    // available.
+    //
+    IceUtilInternal::Atomic _hasObserver;
     ObserverHelperT<Ice::Instrumentation::ThreadObserver> _observer;
 };
 
@@ -225,16 +228,16 @@ Timer::updateObserver(const Ice::Instrumentation::CommunicatorObserverPtr& obsv)
     IceUtil::Mutex::Lock sync(_mutex);
     assert(obsv);
     _observer.attach(obsv->getThreadObserver("Communicator",
-                                             "Ice.Timer",
-                                             Ice::Instrumentation::ThreadStateIdle,
-                                             _observer.get()));
-    _hasObserver = _observer.get();
+                                            "Ice.Timer",
+                                            Ice::Instrumentation::ThreadStateIdle,
+                                            _observer.get()));
+    _hasObserver.exchange(_observer.get() ? 1 : 0);
 }
 
 void
 Timer::runTimerTask(const IceUtil::TimerTaskPtr& task)
 {
-    if(_hasObserver)
+    if(_hasObserver != 0)
     {
         Ice::Instrumentation::ThreadObserverPtr threadObserver;
         {
@@ -1314,9 +1317,9 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
         _locatorManager = new LocatorManager(_initData.properties);
 
         _referenceFactory = new ReferenceFactory(this, communicator);
-        
+
         _requestHandlerFactory = new RequestHandlerFactory(this);
-        
+
         _proxyFactory = new ProxyFactory(this);
 
         const bool isIPv6Supported = IceInternal::isIPv6Supported();
@@ -1343,33 +1346,6 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
         _networkProxy = IceInternal::createNetworkProxy(_initData.properties, _protocolSupport);
 
         _endpointFactoryManager = new EndpointFactoryManager(this);
-#ifndef ICE_OS_WINRT
-        ProtocolInstancePtr tcpProtocolInstance = new ProtocolInstance(this, TCPEndpointType, "tcp");
-        EndpointFactoryPtr tcpEndpointFactory = new TcpEndpointFactory(tcpProtocolInstance);
-        _endpointFactoryManager->add(tcpEndpointFactory);
-#else
-        ProtocolInstancePtr tcpProtocolInstance = new ProtocolInstance(this, TCPEndpointType, "tcp");
-        EndpointFactoryPtr tcpEndpointFactory = new StreamEndpointFactory(tcpProtocolInstance);
-        _endpointFactoryManager->add(tcpEndpointFactory);
-
-        ProtocolInstancePtr sslProtocolInstance = new ProtocolInstance(this, IceSSL::EndpointType, "ssl");
-        EndpointFactoryPtr sslEndpointFactory = new StreamEndpointFactory(sslProtocolInstance);
-        _endpointFactoryManager->add(sslEndpointFactory);
-
-        ProtocolInstancePtr wssProtocolInstance = new ProtocolInstance(this, WSSEndpointType, "wss");
-        EndpointFactoryPtr wssEndpointFactory = new WSEndpointFactory(wssProtocolInstance,
-                                                                      sslEndpointFactory->clone(wssProtocolInstance));
-        _endpointFactoryManager->add(wssEndpointFactory);
-#endif
-        ProtocolInstancePtr udpProtocolInstance = new ProtocolInstance(this, UDPEndpointType, "udp");
-        EndpointFactoryPtr udpEndpointFactory = new UdpEndpointFactory(udpProtocolInstance);
-        _endpointFactoryManager->add(udpEndpointFactory);
-
-        ProtocolInstancePtr wsProtocolInstance = new ProtocolInstance(this, WSEndpointType, "ws");
-        EndpointFactoryPtr wsEndpointFactory = new WSEndpointFactory(wsProtocolInstance,
-                                                                     tcpEndpointFactory->clone(wsProtocolInstance));
-
-        _endpointFactoryManager->add(wsEndpointFactory);
 
         _dynamicLibraryList = new DynamicLibraryList;
 
@@ -1390,7 +1366,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
         {
             _wstringConverter = new IceUtil::UnicodeWstringConverter;
         }
-    
+
         __setNoDelete(false);
     }
     catch(...)
@@ -1459,6 +1435,22 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica
     assert(pluginManagerImpl);
     pluginManagerImpl->loadPlugins(argc, argv);
 
+    //
+    // Add WS and WSS endpoint factories if TCP/SSL factories are installed.
+    //
+    EndpointFactoryPtr tcpFactory = _endpointFactoryManager->get(TCPEndpointType);
+    if(tcpFactory)
+    {
+        ProtocolInstancePtr instance = new ProtocolInstance(communicator, WSEndpointType, "ws", false);
+        _endpointFactoryManager->add(new WSEndpointFactory(instance, tcpFactory->clone(instance)));
+    }
+    EndpointFactoryPtr sslFactory = _endpointFactoryManager->get(SSLEndpointType);
+    if(sslFactory)
+    {
+        ProtocolInstancePtr instance = new ProtocolInstance(communicator, WSSEndpointType, "wss", true);
+        _endpointFactoryManager->add(new WSEndpointFactory(instance, sslFactory->clone(instance)));
+    }
+
     //
     // Reset _stringConverter and _wstringConverter, in case a plugin changed them
     //
@@ -1473,7 +1465,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica
     {
         _wstringConverter = new IceUtil::UnicodeWstringConverter;
     }
-    
+
     //
     // Create Admin facets, if enabled.
     //
@@ -1746,7 +1738,7 @@ IceInternal::Instance::destroy()
     // Now, destroy the thread pools. This must be done *only* after
     // all the connections are finished (the connections destruction
     // can require invoking callbacks with the thread pools).
-    // 
+    //
     if(_serverThreadPool)
     {
         _serverThreadPool->destroy();
@@ -1781,7 +1773,7 @@ IceInternal::Instance::destroy()
         _endpointHostResolver->getThreadControl().join();
     }
 #endif
-    
+
     if(_servantFactoryManager)
     {
         _servantFactoryManager->destroy();
@@ -1898,6 +1890,57 @@ IceInternal::Instance::updateThreadObservers()
     }
 }
 
+
+BufSizeWarnInfo
+IceInternal::Instance::getBufSizeWarn(Short type)
+{
+    IceUtil::Mutex::Lock lock(_setBufSizeWarnMutex);
+
+    return getBufSizeWarnInternal(type);
+}
+
+BufSizeWarnInfo
+IceInternal::Instance::getBufSizeWarnInternal(Short type)
+{
+    BufSizeWarnInfo info;
+    map<Short, BufSizeWarnInfo>::iterator p = _setBufSizeWarn.find(type);
+    if(p == _setBufSizeWarn.end())
+    {
+        info.sndWarn = false;
+        info.sndSize = -1;
+        info.rcvWarn = false;
+        info.rcvSize = -1;
+        _setBufSizeWarn.insert(make_pair(type, info));
+    }
+    else
+    {
+        info = p->second;
+    }
+    return info;
+}
+
+void
+IceInternal::Instance::setSndBufSizeWarn(Short type, int size)
+{
+    IceUtil::Mutex::Lock lock(_setBufSizeWarnMutex);
+
+    BufSizeWarnInfo info = getBufSizeWarnInternal(type);
+    info.sndWarn = true;
+    info.sndSize = size;
+    _setBufSizeWarn[type] =  info;
+}
+
+void
+IceInternal::Instance::setRcvBufSizeWarn(Short type, int size)
+{
+    IceUtil::Mutex::Lock lock(_setBufSizeWarnMutex);
+
+    BufSizeWarnInfo info = getBufSizeWarnInternal(type);
+    info.rcvWarn = true;
+    info.rcvSize = size;
+    _setBufSizeWarn[type] =  info;
+}
+
 IceInternal::ProcessI::ProcessI(const CommunicatorPtr& communicator) :
     _communicator(communicator)
 {