summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/MetricsAdminI.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2012-09-28 15:16:16 +0200
committerBenoit Foucher <benoit@zeroc.com>2012-09-28 15:16:16 +0200
commit1d8cbeacf2f29848c845529a9b3f3c1798defeaf (patch)
treed7d577b650a7837c827b2fdea29d2de9b3cc79c9 /cpp/src/Ice/MetricsAdminI.cpp
parentJava & C# port (diff)
downloadice-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/Ice/MetricsAdminI.cpp')
-rw-r--r--cpp/src/Ice/MetricsAdminI.cpp3
1 files changed, 2 insertions, 1 deletions
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();
}