diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-09-28 15:16:16 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-09-28 15:16:16 +0200 |
| commit | 1d8cbeacf2f29848c845529a9b3f3c1798defeaf (patch) | |
| tree | d7d577b650a7837c827b2fdea29d2de9b3cc79c9 /cpp/src | |
| parent | Java & C# port (diff) | |
| download | ice-1d8cbeacf2f29848c845529a9b3f3c1798defeaf.tar.bz2 ice-1d8cbeacf2f29848c845529a9b3f3c1798defeaf.tar.xz ice-1d8cbeacf2f29848c845529a9b3f3c1798defeaf.zip | |
Added timestamp parameter to getMetricsView, support for metrics in C# and Java IceBox
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/InstrumentationI.cpp | 1 | ||||
| -rw-r--r-- | cpp/src/Ice/MetricsAdminI.cpp | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/InstrumentationI.cpp b/cpp/src/Ice/InstrumentationI.cpp index e07d378d7cc..25852e35b0b 100644 --- a/cpp/src/Ice/InstrumentationI.cpp +++ b/cpp/src/Ice/InstrumentationI.cpp @@ -740,7 +740,6 @@ InvocationObserverI::getRemoteObserver(const ConnectionInfoPtr& connection, cons } CommunicatorObserverI::CommunicatorObserverI(const IceInternal::MetricsAdminIPtr& metrics) : - _metrics(metrics), _connections(metrics, "Connection"), _dispatch(metrics, "Dispatch"), _invocations(metrics, "Invocation"), diff --git a/cpp/src/Ice/MetricsAdminI.cpp b/cpp/src/Ice/MetricsAdminI.cpp index 4664eca3425..74b84487842 100644 --- a/cpp/src/Ice/MetricsAdminI.cpp +++ b/cpp/src/Ice/MetricsAdminI.cpp @@ -476,7 +476,7 @@ MetricsAdminI::getMetricsViewNames(const Current&) } MetricsView -MetricsAdminI::getMetricsView(const string& view, const Current&) +MetricsAdminI::getMetricsView(const string& view, Ice::Long& timestamp, const Current&) { Lock sync(*this); std::map<string, MetricsViewIPtr>::const_iterator p = _views.find(view); @@ -484,6 +484,7 @@ MetricsAdminI::getMetricsView(const string& view, const Current&) { throw UnknownMetricsView(); } + timestamp = IceUtil::Time::now().toMilliSeconds(); return p->second->getMetrics(); } |