diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-08-08 15:22:27 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-08-08 15:22:27 +0200 |
| commit | b9e90a9c390c55244a65472ef93d01baefca8c4d (patch) | |
| tree | ad338ae8f6e79297ccf61b7523261e4680492474 /cpp/src/Ice/ObserverI.h | |
| parent | Merge remote-tracking branch 'origin/encoding11' into mx (diff) | |
| download | ice-b9e90a9c390c55244a65472ef93d01baefca8c4d.tar.bz2 ice-b9e90a9c390c55244a65472ef93d01baefca8c4d.tar.xz ice-b9e90a9c390c55244a65472ef93d01baefca8c4d.zip | |
Fixes
Diffstat (limited to 'cpp/src/Ice/ObserverI.h')
| -rw-r--r-- | cpp/src/Ice/ObserverI.h | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/cpp/src/Ice/ObserverI.h b/cpp/src/Ice/ObserverI.h index 5b594bdd319..fae42ad831a 100644 --- a/cpp/src/Ice/ObserverI.h +++ b/cpp/src/Ice/ObserverI.h @@ -31,6 +31,13 @@ class ThreadObserverI : public Ice::Instrumentation::ThreadObserver, public Obse virtual void stateChanged(Ice::Instrumentation::ThreadState, Ice::Instrumentation::ThreadState); }; +class InvocationObserverI : public Ice::Instrumentation::InvocationObserver, public ObserverT<InvocationMetrics> +{ + virtual void retried(); + + virtual Ice::Instrumentation::ObserverPtr getRemoteInvocationObserver(const Ice::ConnectionPtr&); +}; + class ObserverResolverI : public Ice::Instrumentation::ObserverResolver { public: @@ -38,8 +45,6 @@ public: ObserverResolverI(const MetricsAdminIPtr&); virtual void setObserverUpdater(const Ice::Instrumentation::ObserverUpdaterPtr&); - - virtual Ice::Instrumentation::ObserverPtr getLocatorQueryObserver(const std::string&); virtual Ice::Instrumentation::ObserverPtr getConnectObserver(const Ice::EndpointInfoPtr&, const std::string&); @@ -57,10 +62,12 @@ public: Ice::Instrumentation::ThreadState, const Ice::Instrumentation::ThreadObserverPtr&); - virtual Ice::Instrumentation::ObserverPtr getInvocationObserver(const Ice::ObjectPrx&, - const std::string&, - const Ice::Context&, - const Ice::ConnectionPtr&); + virtual Ice::Instrumentation::InvocationObserverPtr getInvocationObserverWithContext(const Ice::ObjectPrx&, + const std::string&, + const Ice::Context&); + + virtual Ice::Instrumentation::InvocationObserverPtr getInvocationObserver(const Ice::ObjectPrx&, + const std::string&); virtual Ice::Instrumentation::ObserverPtr getDispatchObserver(const Ice::Current&); @@ -69,9 +76,9 @@ private: const MetricsAdminIPtr _metrics; ObserverResolverT<ConnectionObserverI> _connections; - ObserverResolverT<ObserverI> _requests; + ObserverResolverT<ObserverI> _dispatch; + ObserverResolverT<InvocationObserverI> _invocations; ObserverResolverT<ThreadObserverI> _threads; - ObserverResolverT<ObserverI> _locatorQueries; ObserverResolverT<ObserverI> _connects; ObserverResolverT<ObserverI> _endpointResolves; |