diff options
38 files changed, 3 insertions, 395 deletions
diff --git a/config/makeprops.py b/config/makeprops.py index 74ad44ae15d..7ed4fb68e94 100755 --- a/config/makeprops.py +++ b/config/makeprops.py @@ -30,8 +30,6 @@ commonPreamble = """// ********************************************************* // ICE_LICENSE file included in this distribution. // // ********************************************************************** - -///* jshint -W044*/ """ commonPreamble = commonPreamble + "// Generated by " + progname + " from file %(inputfile)s, " + time.ctime() commonPreamble = commonPreamble + """ diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h index ffb233b40de..d5eac1b3acb 100644 --- a/cpp/include/Ice/Ice.h +++ b/cpp/include/Ice/Ice.h @@ -17,7 +17,6 @@ #include <Ice/Properties.h> #include <Ice/Logger.h> #include <Ice/LoggerUtil.h> -#include <Ice/Stats.h> #include <Ice/Communicator.h> #include <Ice/CommunicatorAsync.h> #include <Ice/ObjectFactory.h> diff --git a/cpp/include/Ice/Initialize.h b/cpp/include/Ice/Initialize.h index 1422e0552e5..2999523ea9e 100644 --- a/cpp/include/Ice/Initialize.h +++ b/cpp/include/Ice/Initialize.h @@ -15,7 +15,6 @@ #include <Ice/InstanceF.h> #include <Ice/LoggerF.h> #include <Ice/StreamF.h> -#include <Ice/StatsF.h> #include <Ice/InstrumentationF.h> #include <Ice/Dispatcher.h> #include <Ice/FactoryTable.h> @@ -84,7 +83,6 @@ struct InitializationData { PropertiesPtr properties; LoggerPtr logger; - StatsPtr stats; Instrumentation::CommunicatorObserverPtr observer; ThreadNotificationPtr threadHook; DispatcherPtr dispatcher; 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> diff --git a/cs/src/Ice/CommunicatorI.cs b/cs/src/Ice/CommunicatorI.cs index ede7dfa9ac3..9698ac6beef 100644 --- a/cs/src/Ice/CommunicatorI.cs +++ b/cs/src/Ice/CommunicatorI.cs @@ -119,11 +119,6 @@ namespace Ice return instance_.initializationData().logger; } - public Stats getStats() - { - return instance_.initializationData().stats; - } - public Ice.Instrumentation.CommunicatorObserver getObserver() { return instance_.getObserver(); diff --git a/cs/src/Ice/Makefile b/cs/src/Ice/Makefile index a87cbb7af35..c4d6ae6028f 100644 --- a/cs/src/Ice/Makefile +++ b/cs/src/Ice/Makefile @@ -140,7 +140,6 @@ SLICE_SRCS = $(SDIR)/BuiltinSequences.ice \ $(SDIR)/Router.ice \ $(SDIR)/ServantLocator.ice \ $(SDIR)/SliceChecksumDict.ice \ - $(SDIR)/Stats.ice \ $(SDIR)/Version.ice SDIR = $(slicedir)/Ice diff --git a/cs/src/Ice/Makefile.mak b/cs/src/Ice/Makefile.mak index c66295991dd..43bc902757f 100644 --- a/cs/src/Ice/Makefile.mak +++ b/cs/src/Ice/Makefile.mak @@ -141,7 +141,6 @@ GEN_SRCS = $(GDIR)\BuiltinSequences.cs \ $(GDIR)\Router.cs \ $(GDIR)\ServantLocator.cs \ $(GDIR)\SliceChecksumDict.cs \ - $(GDIR)\Stats.cs \ $(GDIR)\Version.cs SDIR = $(slicedir)\Ice diff --git a/cs/src/Ice/PropertyNames.cs b/cs/src/Ice/PropertyNames.cs index 1982ea9ffd1..7c477c1c545 100644 --- a/cs/src/Ice/PropertyNames.cs +++ b/cs/src/Ice/PropertyNames.cs @@ -6,8 +6,7 @@ // ICE_LICENSE file included in this distribution. // // ********************************************************************** - -///* jshint -W044*/ +// // Generated by makeprops.py from file ../config/PropertyNames.xml, Mon Apr 28 19:03:05 2014 // IMPORTANT: Do not edit this file -- any edits made here will be lost! diff --git a/cs/src/Ice/TcpTransceiver.cs b/cs/src/Ice/TcpTransceiver.cs index fc9d70e4bb5..27a214c4ccd 100644 --- a/cs/src/Ice/TcpTransceiver.cs +++ b/cs/src/Ice/TcpTransceiver.cs @@ -173,14 +173,6 @@ namespace IceInternal string s = "sent " + ret + " of " + packetSize + " bytes via tcp\n" + ToString(); _logger.trace(_traceLevels.networkCat, s); } - - if(_stats != null) - { -#pragma warning disable 618 - _stats.bytesSent(type(), ret); -#pragma warning restore 618 - } - buf.b.position(buf.b.position() + ret); if(packetSize > buf.b.remaining()) { @@ -249,14 +241,7 @@ namespace IceInternal string s = "received " + ret + " of " + remaining + " bytes via tcp\n" + ToString(); _logger.trace(_traceLevels.networkCat, s); } - - if(_stats != null) - { -#pragma warning disable 618 - _stats.bytesReceived(type(), ret); -#pragma warning restore 618 - } - + remaining -= ret; buf.b.position(position += ret); } @@ -380,13 +365,6 @@ namespace IceInternal _logger.trace(_traceLevels.networkCat, s); } - if(_stats != null) - { -#pragma warning disable 618 - _stats.bytesReceived(type(), ret); -#pragma warning restore 618 - } - buf.b.position(buf.b.position() + ret); if(_state == StateProxyConnectRequestPending) @@ -542,13 +520,6 @@ namespace IceInternal _logger.trace(_traceLevels.networkCat, s); } - if(_stats != null) - { -#pragma warning disable 618 - _stats.bytesSent(type(), ret); -#pragma warning restore 618 - } - buf.b.position(buf.b.position() + ret); if(_state == StateProxyConnectRequest) @@ -616,7 +587,6 @@ namespace IceInternal _traceLevels = instance.traceLevels(); _logger = instance.initializationData().logger; - _stats = instance.initializationData().stats; _state = connected ? StateConnected : StateNeedConnect; _desc = connected ? Network.fdToString(_fd, _proxy, _addr) : "<not connected>"; @@ -692,7 +662,6 @@ namespace IceInternal private NetworkProxy _proxy; private TraceLevels _traceLevels; private Ice.Logger _logger; - private Ice.Stats _stats; private string _desc; private int _state; private int _maxSendPacketSize; diff --git a/cs/src/Ice/UdpTransceiver.cs b/cs/src/Ice/UdpTransceiver.cs index f84315638e2..550b5c6f380 100644 --- a/cs/src/Ice/UdpTransceiver.cs +++ b/cs/src/Ice/UdpTransceiver.cs @@ -180,16 +180,7 @@ namespace IceInternal string s = "sent " + ret + " bytes via udp\n" + ToString(); _logger.trace(_traceLevels.networkCat, s); } - - if(_stats != null) - { -#pragma warning disable 618 - _stats.bytesSent(type(), ret); -#pragma warning restore 618 - } - Debug.Assert(ret == buf.b.limit()); - return true; #endif } @@ -306,13 +297,6 @@ namespace IceInternal _logger.trace(_traceLevels.networkCat, s); } - if(_stats != null) - { -#pragma warning disable 618 - _stats.bytesReceived(type(), ret); -#pragma warning restore 618 - } - buf.resize(ret, true); buf.b.position(ret); @@ -499,13 +483,6 @@ namespace IceInternal _logger.trace(_traceLevels.networkCat, s); } - if(_stats != null) - { -#pragma warning disable 618 - _stats.bytesReceived(type(), ret); -#pragma warning restore 618 - } - buf.resize(ret, true); buf.b.position(ret); } @@ -658,20 +635,12 @@ namespace IceInternal } Debug.Assert(ret > 0); - + if(_traceLevels.network >= 3) { string s = "sent " + ret + " bytes via udp\n" + ToString(); _logger.trace(_traceLevels.networkCat, s); } - - if(_stats != null) - { -#pragma warning disable 618 - _stats.bytesSent(type(), ret); -#pragma warning restore 618 - } - Debug.Assert(ret == buf.b.limit()); buf.b.position(buf.b.position() + ret); } @@ -778,7 +747,6 @@ namespace IceInternal { _traceLevels = instance.traceLevels(); _logger = instance.initializationData().logger; - _stats = instance.initializationData().stats; _addr = addr; #if ICE_SOCKET_ASYNC_API @@ -846,7 +814,6 @@ namespace IceInternal { _traceLevels = instance.traceLevels(); _logger = instance.initializationData().logger; - _stats = instance.initializationData().stats; _state = connect ? StateNeedConnect : StateNotConnected; _incoming = true; @@ -1055,7 +1022,6 @@ namespace IceInternal private TraceLevels _traceLevels; private Ice.Logger _logger; - private Ice.Stats _stats; private int _state; private bool _incoming; private int _rcvSize; diff --git a/cs/src/Ice/Util.cs b/cs/src/Ice/Util.cs index 9c23a17183e..d19d357cc5f 100644 --- a/cs/src/Ice/Util.cs +++ b/cs/src/Ice/Util.cs @@ -95,11 +95,6 @@ namespace Ice public Ice.Instrumentation.CommunicatorObserver observer; /// <summary> - /// The Stats instance for the communicator. - /// </summary> - public Stats stats; - - /// <summary> /// The thread hook for the communicator. /// </summary> public ThreadNotification threadHook; diff --git a/cs/src/IceSSL/TransceiverI.cs b/cs/src/IceSSL/TransceiverI.cs index 9ad84888b32..cd29bfa8bb9 100644 --- a/cs/src/IceSSL/TransceiverI.cs +++ b/cs/src/IceSSL/TransceiverI.cs @@ -221,13 +221,6 @@ namespace IceSSL _logger.trace(_instance.networkTraceCategory(), s); } - if(_stats != null) - { -#pragma warning disable 618 - _stats.bytesReceived(type(), ret); -#pragma warning restore 618 - } - buf.b.position(buf.b.position() + ret); if(_state == StateProxyConnectRequestPending) @@ -387,13 +380,6 @@ namespace IceSSL _logger.trace(_instance.networkTraceCategory(), s); } - if(_stats != null) - { -#pragma warning disable 618 - _stats.bytesSent(type(), packetSize); -#pragma warning restore 618 - } - buf.b.position(buf.b.position() + packetSize); if(_state == StateProxyConnectRequest) @@ -465,7 +451,6 @@ namespace IceSSL _proxy = proxy; _stream = null; _logger = instance.communicator().getLogger(); - _stats = instance.communicator().getStats(); _desc = connected ? IceInternal.Network.fdToString(_fd, _proxy, _addr) : "<not connected>"; _state = connected ? StateNeedAuthenticate : StateNeedConnect; @@ -842,7 +827,6 @@ namespace IceSSL private IceInternal.NetworkProxy _proxy; private SslStream _stream; private Ice.Logger _logger; - private Ice.Stats _stats; private string _desc; private int _verifyPeer; private int _maxSendPacketSize; diff --git a/java/src/Ice/CommunicatorI.java b/java/src/Ice/CommunicatorI.java index 2e4bbdbf855..af0ad562325 100644 --- a/java/src/Ice/CommunicatorI.java +++ b/java/src/Ice/CommunicatorI.java @@ -133,13 +133,6 @@ public final class CommunicatorI implements Communicator return _instance.initializationData().logger; } - @SuppressWarnings("deprecation") - public Stats - getStats() - { - return _instance.initializationData().stats; - } - public Ice.Instrumentation.CommunicatorObserver getObserver() { diff --git a/java/src/Ice/InitializationData.java b/java/src/Ice/InitializationData.java index b1267938056..e7ba8110505 100644 --- a/java/src/Ice/InitializationData.java +++ b/java/src/Ice/InitializationData.java @@ -15,7 +15,6 @@ package Ice; * @see Communicator#intialize * @see Properties * @see Logger - * @see Stats * @see ThreadNotification **/ public final class InitializationData implements Cloneable @@ -64,12 +63,6 @@ public final class InitializationData implements Cloneable public Ice.Instrumentation.CommunicatorObserver observer; /** - * The <Stats> instance for the communicator. - **/ - @SuppressWarnings("deprecation") - public Stats stats; - - /** * The thread hook for the communicator. **/ public ThreadNotification threadHook; diff --git a/java/src/IceInternal/TcpTransceiver.java b/java/src/IceInternal/TcpTransceiver.java index ac25f302187..7122f8ff7cf 100644 --- a/java/src/IceInternal/TcpTransceiver.java +++ b/java/src/IceInternal/TcpTransceiver.java @@ -202,11 +202,6 @@ final class TcpTransceiver implements Transceiver _logger.trace(_traceLevels.networkCat, s); } - if(_stats != null) - { - _stats.bytesSent(type(), ret); - } - if(packetSize == _maxSendPacketSize) { assert(buf.b.position() == buf.b.limit()); @@ -261,11 +256,6 @@ final class TcpTransceiver implements Transceiver String s = "received " + ret + " of " + packetSize + " bytes via tcp\n" + toString(); _logger.trace(_traceLevels.networkCat, s); } - - if(_stats != null) - { - _stats.bytesReceived(type(), ret); - } } packetSize = buf.b.remaining(); @@ -331,7 +321,6 @@ final class TcpTransceiver implements Transceiver _addr = addr; _traceLevels = instance.traceLevels(); _logger = instance.initializationData().logger; - _stats = instance.initializationData().stats; _state = StateNeedConnect; _desc = ""; @@ -357,7 +346,6 @@ final class TcpTransceiver implements Transceiver _fd = fd; _traceLevels = instance.traceLevels(); _logger = instance.initializationData().logger; - _stats = instance.initializationData().stats; _state = StateConnected; _desc = Network.fdToString(_fd); @@ -400,8 +388,6 @@ final class TcpTransceiver implements Transceiver private TraceLevels _traceLevels; private Ice.Logger _logger; - @SuppressWarnings("deprecation") - private Ice.Stats _stats; private String _desc; private int _state; private int _maxSendPacketSize; diff --git a/java/src/IceInternal/UdpTransceiver.java b/java/src/IceInternal/UdpTransceiver.java index 5b8e3105c1c..96174b95c26 100644 --- a/java/src/IceInternal/UdpTransceiver.java +++ b/java/src/IceInternal/UdpTransceiver.java @@ -116,11 +116,6 @@ final class UdpTransceiver implements Transceiver _logger.trace(_traceLevels.networkCat, s); } - if(_stats != null) - { - _stats.bytesSent(type(), ret); - } - assert(ret == buf.b.limit()); return true; } @@ -190,11 +185,6 @@ final class UdpTransceiver implements Transceiver _logger.trace(_traceLevels.networkCat, s); } - if(_stats != null) - { - _stats.bytesReceived(type(), ret); - } - buf.resize(ret, true); buf.b.position(ret); @@ -304,7 +294,6 @@ final class UdpTransceiver implements Transceiver { _traceLevels = instance.traceLevels(); _logger = instance.initializationData().logger; - _stats = instance.initializationData().stats; _state = StateNeedConnect; _addr = addr; @@ -345,7 +334,6 @@ final class UdpTransceiver implements Transceiver { _traceLevels = instance.traceLevels(); _logger = instance.initializationData().logger; - _stats = instance.initializationData().stats; _state = connect ? StateNeedConnect : StateNotConnected; try @@ -746,8 +734,6 @@ final class UdpTransceiver implements Transceiver private TraceLevels _traceLevels; private Ice.Logger _logger; - @SuppressWarnings("deprecation") - private Ice.Stats _stats; private int _state; private int _rcvSize; private int _sndSize; diff --git a/java/src/IceSSL/TransceiverI.java b/java/src/IceSSL/TransceiverI.java index 2b43c86285f..560b278dfdf 100644 --- a/java/src/IceSSL/TransceiverI.java +++ b/java/src/IceSSL/TransceiverI.java @@ -280,11 +280,6 @@ final class TransceiverI implements IceInternal.Transceiver _logger.trace(_instance.networkTraceCategory(), s); } - if(_stats != null && buf.b.position() > pos) - { - _stats.bytesReceived(type(), buf.b.position() - pos); - } - // // Read and decrypt more data if necessary. Note that we might read // more data from the socket than is actually necessary to fill the @@ -332,11 +327,6 @@ final class TransceiverI implements IceInternal.Transceiver String s = "received " + (buf.b.position() - pos) + " of " + rem + " bytes via ssl\n" + toString(); _logger.trace(_instance.networkTraceCategory(), s); } - - if(_stats != null && buf.b.position() > pos) - { - _stats.bytesReceived(type(), buf.b.position() - pos); - } } } catch(SSLException ex) @@ -408,14 +398,6 @@ final class TransceiverI implements IceInternal.Transceiver _engine = engine; _fd = fd; _logger = instance.communicator().getLogger(); - try - { - _stats = instance.communicator().getStats(); - } - catch(Ice.CommunicatorDestroyedException ex) - { - // Ignore. - } _maxPacketSize = 0; if(System.getProperty("os.name").startsWith("Windows")) { @@ -717,11 +699,6 @@ final class TransceiverI implements IceInternal.Transceiver toString(); _logger.trace(_instance.networkTraceCategory(), s); } - - if(_stats != null) - { - _stats.bytesSent(type(), result.bytesConsumed()); - } } } @@ -932,11 +909,6 @@ final class TransceiverI implements IceInternal.Transceiver String s = "sent " + ret + " of " + packetSize + " bytes via tcp\n" + toString(); _logger.trace(_instance.networkTraceCategory(), s); } - - if(_stats != null) - { - _stats.bytesSent(type(), ret); - } } catch(java.io.InterruptedIOException ex) { @@ -980,11 +952,6 @@ final class TransceiverI implements IceInternal.Transceiver String s = "received " + ret + " of " + packetSize + " bytes via tcp\n" + toString(); _logger.trace(_instance.networkTraceCategory(), s); } - - if(_stats != null) - { - _stats.bytesReceived(type(), ret); - } } packetSize = buf.b.remaining(); @@ -1013,8 +980,6 @@ final class TransceiverI implements IceInternal.Transceiver private int _state; private Ice.Logger _logger; - @SuppressWarnings("deprecation") - private Ice.Stats _stats; private String _desc; private int _maxPacketSize; private ByteBuffer _appInput; // Holds clear-text data to be read by the application. diff --git a/php/lib/Makefile b/php/lib/Makefile index 8bdc1b9ffd7..a8417a31a8d 100644 --- a/php/lib/Makefile +++ b/php/lib/Makefile @@ -36,8 +36,6 @@ ICE_SRCS = Ice/LocalException.php \ Ice/PluginF.php \ Ice/Locator.php \ Ice/LocatorF.php \ - Ice/StatsF.php \ - Ice/Stats.php \ Ice/Process.php \ Ice/ProcessF.php \ Ice/FacetMap.php \ diff --git a/php/lib/Makefile.mak b/php/lib/Makefile.mak index 9f9f449ec57..d567396f70b 100644 --- a/php/lib/Makefile.mak +++ b/php/lib/Makefile.mak @@ -36,8 +36,6 @@ ICE_SRCS = Ice\LocalException.php \ Ice\PluginF.php \ Ice\Locator.php \ Ice\LocatorF.php \ - Ice\StatsF.php \ - Ice\Stats.php \ Ice\Process.php \ Ice\ProcessF.php \ Ice\FacetMap.php \ diff --git a/py/python/Makefile b/py/python/Makefile index b5a323275ce..d6833a8fbe2 100644 --- a/py/python/Makefile +++ b/py/python/Makefile @@ -42,8 +42,6 @@ ICE_SRCS = Ice_LocalException_ice.py \ Ice_PluginF_ice.py \ Ice_Locator_ice.py \ Ice_LocatorF_ice.py \ - Ice_StatsF_ice.py \ - Ice_Stats_ice.py \ Ice_Process_ice.py \ Ice_ProcessF_ice.py \ Ice_FacetMap_ice.py \ diff --git a/py/python/Makefile.mak b/py/python/Makefile.mak index 6486ff5865d..7a8bee24cb3 100644 --- a/py/python/Makefile.mak +++ b/py/python/Makefile.mak @@ -36,8 +36,6 @@ ICE_SRCS = Ice_LocalException_ice.py \ Ice_PluginF_ice.py \ Ice_Locator_ice.py \ Ice_LocatorF_ice.py \ - Ice_StatsF_ice.py \ - Ice_Stats_ice.py \ Ice_Process_ice.py \ Ice_ProcessF_ice.py \ Ice_FacetMap_ice.py \ diff --git a/rb/ruby/Makefile b/rb/ruby/Makefile index 55b580d612c..3eb0f838147 100644 --- a/rb/ruby/Makefile +++ b/rb/ruby/Makefile @@ -36,8 +36,6 @@ ICE_SRCS = Ice/LocalException.rb \ Ice/PluginF.rb \ Ice/Locator.rb \ Ice/LocatorF.rb \ - Ice/StatsF.rb \ - Ice/Stats.rb \ Ice/Process.rb \ Ice/ProcessF.rb \ Ice/FacetMap.rb \ diff --git a/slice/Ice/Communicator.ice b/slice/Ice/Communicator.ice index 9dc0e42ff55..34c475337ff 100644 --- a/slice/Ice/Communicator.ice +++ b/slice/Ice/Communicator.ice @@ -12,7 +12,6 @@ [["cpp:header-ext:h"]] #include <Ice/LoggerF.ice> -#include <Ice/StatsF.ice> #include <Ice/InstrumentationF.ice> #include <Ice/ObjectAdapterF.ice> #include <Ice/ObjectFactoryF.ice> @@ -42,7 +41,6 @@ module Ice * is language-specific, and not specified in Slice code. * * @see Logger - * @see Stats * @see ObjectAdapter * @see Properties * @see ObjectFactory @@ -381,23 +379,10 @@ local interface Communicator /** * - * Get the statistics callback object for this communicator. - * - * @return This communicator's statistics callback object. - * - * @see Stats - * - **/ - ["cpp:const"] Stats getStats(); - - /** - * * Get the observer resolver object for this communicator. * * @return This communicator's observer resolver object. * - * @see Stats - * **/ ["cpp:const"] Ice::Instrumentation::CommunicatorObserver getObserver(); diff --git a/slice/Ice/Stats.ice b/slice/Ice/Stats.ice deleted file mode 100644 index e2948ae9786..00000000000 --- a/slice/Ice/Stats.ice +++ /dev/null @@ -1,55 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 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. -// -// ********************************************************************** - -#pragma once - -[["cpp:header-ext:h"]] - -module Ice -{ - -/** - * - * An interface Ice uses to report statistics, such as how much data - * is sent or received. Applications must provide their own {@link Stats} - * by implementing this interface and installing it in a communicator. - * - * <p class="Deprecated">This local interface is deprecated as of Ice 3.5. - * - **/ -["deprecate:Stats is deprecated; you should use instead Ice Metrics or Ice Instrumentation"] -local interface Stats -{ - /** - * - * Callback to report that data has been sent. - * - * @param protocol The protocol over which data has been sent (for - * example "tcp", "udp", or "ssl"). - * - * @param num How many bytes have been sent. - * - **/ - void bytesSent(string protocol, int num); - - /** - * - * Callback to report that data has been received. - * - * @param protocol The protocol over which data has been received - * (for example "tcp", "udp", or "ssl"). - * - * @param num How many bytes have been received. - * - **/ - void bytesReceived(string protocol, int num); -}; - -}; - diff --git a/slice/Ice/StatsF.ice b/slice/Ice/StatsF.ice deleted file mode 100644 index 087ec609f98..00000000000 --- a/slice/Ice/StatsF.ice +++ /dev/null @@ -1,20 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 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. -// -// ********************************************************************** - -#pragma once - -[["cpp:header-ext:h"]] - -module Ice -{ - -local interface Stats; - -}; - |