diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-09-12 13:24:38 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-09-12 13:24:38 +0200 |
| commit | abeebf67ba35156606bbaabf073b496900f836cf (patch) | |
| tree | 430212c34a1a1d4922fa11426e9fbd537fb98e52 /cpp/src/Ice/Instance.h | |
| parent | Fixed dependencies (diff) | |
| download | ice-abeebf67ba35156606bbaabf073b496900f836cf.tar.bz2 ice-abeebf67ba35156606bbaabf073b496900f836cf.tar.xz ice-abeebf67ba35156606bbaabf073b496900f836cf.zip | |
Fixed ICE-5620: metrics admin creation in IceBox, fixed bug where timer wasn't instrumented
Diffstat (limited to 'cpp/src/Ice/Instance.h')
| -rw-r--r-- | cpp/src/Ice/Instance.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h index c774242dfdd..95c4aecb620 100644 --- a/cpp/src/Ice/Instance.h +++ b/cpp/src/Ice/Instance.h @@ -54,6 +54,9 @@ class CommunicatorI; namespace IceInternal { +class Timer; +typedef IceUtil::Handle<Timer> TimerPtr; + class MetricsAdminI; typedef IceUtil::Handle<MetricsAdminI> MetricsAdminIPtr; @@ -96,11 +99,6 @@ public: Ice::ObjectPtr removeAdminFacet(const std::string&); Ice::ObjectPtr findAdminFacet(const std::string&); - const Ice::Instrumentation::CommunicatorObserverPtr& getObserver() const - { - return _observer; - } - const Ice::ImplicitContextIPtr& getImplicitContext() const { return _implicitContext; @@ -162,7 +160,7 @@ private: ThreadPoolPtr _serverThreadPool; EndpointHostResolverPtr _endpointHostResolver; RetryQueuePtr _retryQueue; - IceUtil::TimerPtr _timer; + TimerPtr _timer; EndpointFactoryManagerPtr _endpointFactoryManager; DynamicLibraryListPtr _dynamicLibraryList; Ice::PluginManagerPtr _pluginManager; @@ -175,7 +173,6 @@ private: Ice::Identity _adminIdentity; std::set<std::string> _adminFacetFilter; IceInternal::MetricsAdminIPtr _metricsAdmin; - Ice::Instrumentation::CommunicatorObserverPtr _observer; }; class ProcessI : public Ice::Process |