Fixed (ICE-5510) - Remove Stats interface that was deprecated in 3.5

14 files changed, 0 insertions, 116 deletions

diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp
index 04673fbd7cc..25fc6841fb3 100644
--- a/cpp/src/Ice/CommunicatorI.cpp
+++ b/cpp/src/Ice/CommunicatorI.cpp
@@ -252,12 +252,6 @@ Ice::CommunicatorI::getLogger() const
     return _instance->initializationData().logger;
 }
 
-StatsPtr
-Ice::CommunicatorI::getStats() const
-{
-    return _instance->initializationData().stats;
-}
-
 Ice::Instrumentation::CommunicatorObserverPtr
 Ice::CommunicatorI::getObserver() const
 {
diff --git a/cpp/src/Ice/CommunicatorI.h b/cpp/src/Ice/CommunicatorI.h
index b1e077058db..df7b8ecc158 100644
--- a/cpp/src/Ice/CommunicatorI.h
+++ b/cpp/src/Ice/CommunicatorI.h
@@ -49,7 +49,6 @@ public:
 
     virtual PropertiesPtr getProperties() const;
     virtual LoggerPtr getLogger() const;
-    virtual StatsPtr getStats() const;
     virtual Ice::Instrumentation::CommunicatorObserverPtr getObserver() const;
 
     virtual RouterPrx getDefaultRouter() const;
diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h
index 7ed6b917100..362af1d8f2e 100644
--- a/cpp/src/Ice/Instance.h
+++ b/cpp/src/Ice/Instance.h
@@ -18,7 +18,6 @@
 #include <IceUtil/StringConverter.h>
 #include <Ice/InstanceF.h>
 #include <Ice/CommunicatorF.h>
-#include <Ice/StatsF.h>
 #include <Ice/InstrumentationF.h>
 #include <Ice/TraceLevelsF.h>
 #include <Ice/DefaultsAndOverridesF.h>
@@ -63,7 +62,6 @@ public:
 
     bool destroyed() const;
     const Ice::InitializationData& initializationData() const { return _initData; }
-    void stats(const Ice::StatsPtr&);
     TraceLevelsPtr traceLevels() const;
     DefaultsAndOverridesPtr defaultsAndOverrides() const;
     RouterManagerPtr routerManager() const;
diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile
index b84170ed094..71c5898d193 100644
--- a/cpp/src/Ice/Makefile
+++ b/cpp/src/Ice/Makefile
@@ -102,7 +102,6 @@ OBJS		= Acceptor.o \
 		  SliceChecksumDict.o \
 		  SliceChecksums.o \
 		  SlicedData.o \
-		  Stats.o \
 		  StreamI.o \
 		  Stream.o \
 		  StringConverterPlugin.o \
@@ -164,8 +163,6 @@ SLICE_SRCS	= $(SDIR)/BuiltinSequences.ice \
 		  $(SDIR)/ServantLocatorF.ice \
 		  $(SDIR)/ServantLocator.ice \
 		  $(SDIR)/SliceChecksumDict.ice \
-		  $(SDIR)/StatsF.ice \
-		  $(SDIR)/Stats.ice \
 		  $(SDIR)/Version.ice \
 
 HDIR		= $(headerdir)/Ice
diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak
index d920c044baa..f20352780c7 100644
--- a/cpp/src/Ice/Makefile.mak
+++ b/cpp/src/Ice/Makefile.mak
@@ -103,7 +103,6 @@ OBJS		= Acceptor.obj \
 		  SliceChecksumDict.obj \
 		  SliceChecksums.obj \
 		  SlicedData.obj \
-		  Stats.obj \
 		  StreamI.obj \
 		  Stream.obj \
                   StringConverterPlugin.obj \
@@ -194,8 +193,6 @@ clean::
 	-del /q ServantLocatorF.cpp $(HDIR)\ServantLocatorF.h
 	-del /q ServantLocator.cpp $(HDIR)\ServantLocator.h
 	-del /q SliceChecksumDict.cpp $(HDIR)\SliceChecksumDict.h
-	-del /q StatsF.cpp $(HDIR)\StatsF.h
-	-del /q Stats.cpp $(HDIR)\Stats.h
         -del /q Version.cpp $(HDIR)\Version.h
 	-del /q Ice.res
 
diff --git a/cpp/src/Ice/ProtocolInstance.cpp b/cpp/src/Ice/ProtocolInstance.cpp
index 3d889e958c2..483544d4c81 100644
--- a/cpp/src/Ice/ProtocolInstance.cpp
+++ b/cpp/src/Ice/ProtocolInstance.cpp
@@ -25,7 +25,6 @@ IceInternal::ProtocolInstance::ProtocolInstance(const CommunicatorPtr& com, Shor
     _traceLevel(_instance->traceLevels()->network),
     _traceCategory(_instance->traceLevels()->networkCat),
     _logger(_instance->initializationData().logger),
-    _stats(_instance->initializationData().stats),
     _properties(_instance->initializationData().properties),
     _protocol(protocol),
     _type(type)
@@ -37,7 +36,6 @@ IceInternal::ProtocolInstance::ProtocolInstance(const InstancePtr& instance, Sho
     _traceLevel(_instance->traceLevels()->network),
     _traceCategory(_instance->traceLevels()->networkCat),
     _logger(_instance->initializationData().logger),
-    _stats(_instance->initializationData().stats),
     _properties(_instance->initializationData().properties),
     _protocol(protocol),
     _type(type)
diff --git a/cpp/src/Ice/ProtocolInstance.h b/cpp/src/Ice/ProtocolInstance.h
index f4b233191b3..88d3048b8f1 100644
--- a/cpp/src/Ice/ProtocolInstance.h
+++ b/cpp/src/Ice/ProtocolInstance.h
@@ -14,7 +14,6 @@
 #include <Ice/CommunicatorF.h>
 #include <Ice/PropertiesF.h>
 #include <Ice/LoggerF.h>
-#include <Ice/StatsF.h>
 #include <Ice/EndpointIF.h>
 #include <Ice/ConnectorF.h>
 #include <Ice/IPEndpointIF.h>
@@ -54,11 +53,6 @@ public:
         return _type;
     }
 
-    const Ice::StatsPtr& stats() const
-    {
-        return _stats;
-    }
-
     const Ice::PropertiesPtr& properties() const
     {
         return _properties;
@@ -86,7 +80,6 @@ protected:
     const int _traceLevel;
     const std::string _traceCategory;
     const Ice::LoggerPtr _logger;
-    const Ice::StatsPtr _stats;
     const Ice::PropertiesPtr _properties;
     const std::string _protocol;
     const Ice::Short _type;
diff --git a/cpp/src/Ice/TcpTransceiver.cpp b/cpp/src/Ice/TcpTransceiver.cpp
index 6459099dfd2..6f32d06ed8f 100644
--- a/cpp/src/Ice/TcpTransceiver.cpp
+++ b/cpp/src/Ice/TcpTransceiver.cpp
@@ -15,7 +15,6 @@
 #include <Ice/LocalException.h>
 
 #include <IceUtil/DisableWarnings.h>
-#include <Ice/Stats.h>
 
 using namespace std;
 using namespace Ice;
@@ -265,11 +264,6 @@ IceInternal::TcpTransceiver::write(Buffer& buf)
                 << toString();
         }
 
-        if(_instance->stats())
-        {
-            _instance->stats()->bytesSent(_instance->protocol(), static_cast<Int>(ret));
-        }
-
         buf.i += ret;
 
         if(packetSize > buf.b.end() - buf.i)
@@ -344,11 +338,6 @@ IceInternal::TcpTransceiver::read(Buffer& buf, bool&)
                 << toString();
         }
 
-        if(_instance->stats())
-        {
-            _instance->stats()->bytesReceived(_instance->protocol(), static_cast<Int>(ret));
-        }
-
         buf.i += ret;
 
         packetSize = static_cast<int>(buf.b.end() - buf.i);
@@ -438,11 +427,6 @@ IceInternal::TcpTransceiver::finishWrite(Buffer& buf)
             << toString();
     }
 
-    if(_instance->stats())
-    {
-        _instance->stats()->bytesSent(_instance->protocol(), _write.count);
-    }
-
     buf.i += _write.count;
 }
 
@@ -517,11 +501,6 @@ IceInternal::TcpTransceiver::finishRead(Buffer& buf)
             << toString();
     }
 
-    if(_instance->stats())
-    {
-        _instance->stats()->bytesReceived(_instance->protocol(), static_cast<Int>(_read.count));
-    }
-
     buf.i += _read.count;
 }
 #endif
diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp
index dd5d77775d4..6c9f722aeb8 100644
--- a/cpp/src/Ice/UdpTransceiver.cpp
+++ b/cpp/src/Ice/UdpTransceiver.cpp
@@ -17,7 +17,6 @@
 #include <IceUtil/StringUtil.h>
 
 #include <IceUtil/DisableWarnings.h>
-#include <Ice/Stats.h>
 
 #ifdef ICE_OS_WINRT
 #   include <ppltasks.h> // For Concurrency::task
@@ -240,11 +239,6 @@ repeat:
         out << "sent " << ret << " bytes via " << _instance->protocol() << '\n' << toString();
     }
 
-    if(_instance->stats())
-    {
-        _instance->stats()->bytesSent(protocol(), static_cast<Int>(ret));
-    }
-
     assert(ret == static_cast<ssize_t>(buf.b.size()));
     buf.i = buf.b.end();
     return SocketOperationNone;
@@ -361,11 +355,6 @@ repeat:
         out << "received " << ret << " bytes via " << _instance->protocol() << '\n' << toString();
     }
 
-    if(_instance->stats())
-    {
-        _instance->stats()->bytesReceived(protocol(), static_cast<Int>(ret));
-    }
-
     buf.b.resize(ret);
     buf.i = buf.b.end();
     return SocketOperationNone;
@@ -622,11 +611,6 @@ IceInternal::UdpTransceiver::finishWrite(Buffer& buf)
         out << "sent " << _write.count << " bytes via " << _instance->protocol() << '\n' << toString();
     }
 
-    if(_instance->stats())
-    {
-        _instance->stats()->bytesSent(protocol(), static_cast<Int>(_write.count));
-    }
-
     assert(_write.count == buf.b.size());
     buf.i = buf.b.end();
 }
@@ -767,11 +751,6 @@ IceInternal::UdpTransceiver::finishRead(Buffer& buf)
         out << "received " << ret << " bytes via " << _instance->protocol() << '\n' << toString();
     }
 
-    if(_instance->stats())
-    {
-        _instance->stats()->bytesReceived(protocol(), static_cast<Int>(ret));
-    }
-
     buf.b.resize(ret);
     buf.i = buf.b.end();
 }
diff --git a/cpp/src/Ice/winrt/StreamTransceiver.cpp b/cpp/src/Ice/winrt/StreamTransceiver.cpp
index b47d92a8f8e..9a69753b486 100644
--- a/cpp/src/Ice/winrt/StreamTransceiver.cpp
+++ b/cpp/src/Ice/winrt/StreamTransceiver.cpp
@@ -20,7 +20,6 @@
 #include <IceSSL/ConnectionInfo.h>
 
 #include <IceUtil/DisableWarnings.h>
-#include <Ice/Stats.h>
 
 using namespace std;
 using namespace Ice;
@@ -268,10 +267,6 @@ IceInternal::StreamTransceiver::finishWrite(Buffer& buf)
             << toString();
     }
     
-    if(_stats)
-    {
-        _stats->bytesSent(type(), _write.count);
-    }
     buf.i += _write.count;
 }
 
@@ -340,11 +335,6 @@ IceInternal::StreamTransceiver::finishRead(Buffer& buf)
             << toString();
     }
 
-    if(_stats)
-    {
-        _stats->bytesReceived(type(), static_cast<Int>(_read.count));
-    }
-
     buf.i += _read.count;
 }
 
@@ -393,7 +383,6 @@ IceInternal::StreamTransceiver::StreamTransceiver(const InstancePtr& instance,
     _traceLevels(instance->traceLevels()),
     _type(type),
     _logger(instance->initializationData().logger),
-    _stats(instance->initializationData().stats),
     _state(connected ? StateConnected : StateNeedConnect),
     _desc(connected ? fdToString(_fd) : string())
 {
diff --git a/cpp/src/Ice/winrt/StreamTransceiver.h b/cpp/src/Ice/winrt/StreamTransceiver.h
index 9c2c30f037b..5f725abd2dc 100644
--- a/cpp/src/Ice/winrt/StreamTransceiver.h
+++ b/cpp/src/Ice/winrt/StreamTransceiver.h
@@ -71,7 +71,6 @@ private:
     const TraceLevelsPtr _traceLevels;
     const Ice::Short _type;
     const Ice::LoggerPtr _logger;
-    const Ice::StatsPtr _stats;
     
     State _state;
     std::string _desc;
diff --git a/cpp/src/IceSSL/TransceiverI.cpp b/cpp/src/IceSSL/TransceiverI.cpp
index 738feef1f53..1e07c42e9c3 100644
--- a/cpp/src/IceSSL/TransceiverI.cpp
+++ b/cpp/src/IceSSL/TransceiverI.cpp
@@ -20,7 +20,6 @@
 #include <Ice/LocalException.h>
 
 #include <IceUtil/DisableWarnings.h>
-#include <Ice/Stats.h>
 
 #include <openssl/err.h>
 #include <openssl/bio.h>
@@ -610,11 +609,6 @@ IceSSL::TransceiverI::write(IceInternal::Buffer& buf)
             out << "sent " << ret << " of " << packetSize << " bytes via " << protocol() << "\n" << toString();
         }
 
-        if(_instance->stats())
-        {
-            _instance->stats()->bytesSent(_instance->protocol(), static_cast<Int>(ret));
-        }
-
         buf.i += ret;
 
         if(packetSize > buf.b.end() - buf.i)
@@ -789,11 +783,6 @@ IceSSL::TransceiverI::read(IceInternal::Buffer& buf, bool&)
             out << "received " << ret << " of " << packetSize << " bytes via " << protocol() << "\n" << toString();
         }
 
-        if(_instance->stats())
-        {
-            _instance->stats()->bytesReceived(_instance->protocol(), static_cast<Int>(ret));
-        }
-
         buf.i += ret;
 
         if(packetSize > buf.b.end() - buf.i)
@@ -900,11 +889,6 @@ IceSSL::TransceiverI::finishWrite(IceInternal::Buffer& buf)
                 out << "sent " << _sentBytes << " of " << packetSize << " bytes via " << protocol() << "\n" << toString();
             }
             
-            if(_instance->stats())
-            {
-                _instance->stats()->bytesSent(_instance->protocol(), static_cast<Int>(_sentBytes));
-            }
-            
             buf.i += _sentBytes;
             _sentBytes = 0;
         }
@@ -941,11 +925,6 @@ IceSSL::TransceiverI::startRead(IceInternal::Buffer& buf)
                     out << "received " << ret << " of " << packetSize << " bytes via " << protocol() << "\n" << toString();
                 }
                 
-                if(_instance->stats())
-                {
-                    _instance->stats()->bytesReceived(_instance->protocol(), static_cast<Int>(ret));
-                }
-                
                 buf.i += ret;
                 
                 _read.count = 0;
@@ -1022,11 +1001,6 @@ IceSSL::TransceiverI::finishRead(IceInternal::Buffer& buf)
                         out << "received " << ret << " of " << packetSize << " bytes via " << protocol() << "\n" << toString();
                     }
                 
-                    if(_instance->stats())
-                    {
-                        _instance->stats()->bytesReceived(_instance->protocol(), static_cast<Int>(ret));
-                    }
-                
                     buf.i += ret;
                 }
             }
@@ -1458,11 +1432,6 @@ IceSSL::TransceiverI::writeRaw(IceInternal::Buffer& buf)
             out << "sent " << ret << " of " << packetSize << " bytes via " << protocol() << "\n" << toString();
         }
 
-        if(_instance->stats())
-        {
-            _instance->stats()->bytesSent(protocol(), static_cast<Int>(ret));
-        }
-
         buf.i += ret;
 
         if(packetSize > buf.b.end() - buf.i)
@@ -1531,11 +1500,6 @@ IceSSL::TransceiverI::readRaw(IceInternal::Buffer& buf)
             out << "received " << ret << " of " << packetSize << " bytes via " << protocol() << "\n" << toString();
         }
 
-        if(_instance->stats())
-        {
-            _instance->stats()->bytesReceived(protocol(), static_cast<Int>(ret));
-        }
-
         buf.i += ret;
 
         packetSize = static_cast<int>(buf.b.end() - buf.i);
diff --git a/cpp/src/IceWS/TransceiverI.cpp b/cpp/src/IceWS/TransceiverI.cpp
index ae1c1fb7442..ad3bb210d59 100644
--- a/cpp/src/IceWS/TransceiverI.cpp
+++ b/cpp/src/IceWS/TransceiverI.cpp
@@ -16,7 +16,6 @@
 #include <Ice/LoggerUtil.h>
 #include <Ice/Buffer.h>
 #include <Ice/LocalException.h>
-#include <Ice/Stats.h>
 #include <Ice/Base64.h>
 #include <IceUtil/Random.h>
 #include <IceUtil/StringUtil.h>
diff --git a/cpp/src/IceWS/TransceiverI.h b/cpp/src/IceWS/TransceiverI.h
index 87e809e6653..c07ff0acd43 100644
--- a/cpp/src/IceWS/TransceiverI.h
+++ b/cpp/src/IceWS/TransceiverI.h
@@ -15,7 +15,6 @@
 #include <IceWS/Util.h>
 
 #include <Ice/LoggerF.h>
-#include <Ice/StatsF.h>
 #include <Ice/Transceiver.h>
 #include <Ice/Network.h>
 #include <Ice/Buffer.h>