From fe32e38796bb9b3bbe94257eba62149a7d94ec0f Mon Sep 17 00:00:00 2001 From: Ted Ross Date: Tue, 21 Sep 2010 21:48:41 +0000 Subject: QMFv2 Additions: - QMFv2 schema encoding completed - Schema queries handled by the agent and initiated by the console by user request - Full query support with predicates evaluated on the agent (regex not yet implemented) - Agent filtering in the console - Agent aging in the console - Unit tests git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@999662 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qmf/ConsoleSessionImpl.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'cpp/src/qmf/ConsoleSessionImpl.h') diff --git a/cpp/src/qmf/ConsoleSessionImpl.h b/cpp/src/qmf/ConsoleSessionImpl.h index 9a077b0390..705d9de4d8 100644 --- a/cpp/src/qmf/ConsoleSessionImpl.h +++ b/cpp/src/qmf/ConsoleSessionImpl.h @@ -28,6 +28,7 @@ #include "qmf/Schema.h" #include "qmf/ConsoleEventImpl.h" #include "qmf/SchemaCache.h" +#include "qmf/Query.h" #include "qpid/sys/Mutex.h" #include "qpid/sys/Condition.h" #include "qpid/sys/Thread.h" @@ -36,6 +37,7 @@ #include "qpid/messaging/Message.h" #include "qpid/messaging/Connection.h" #include "qpid/messaging/Session.h" +#include "qpid/messaging/Sender.h" #include "qpid/messaging/Address.h" #include "qpid/management/Buffer.h" #include "qpid/types/Variant.h" @@ -65,13 +67,17 @@ namespace qmf { qpid::sys::Condition cond; qpid::messaging::Connection connection; qpid::messaging::Session session; + qpid::messaging::Sender directSender; + qpid::messaging::Sender topicSender; std::string domain; - qpid::types::Variant::Map agentFilter; + uint32_t maxAgentAgeMinutes; + Query agentQuery; bool opened; std::queue eventQueue; qpid::sys::Thread* thread; bool threadCanceled; uint64_t lastVisit; + uint64_t lastAgePass; std::map agents; Agent connectedBrokerAgent; qpid::messaging::Address replyAddress; @@ -83,6 +89,7 @@ namespace qmf { void enqueueEventLH(const ConsoleEvent&); void dispatch(qpid::messaging::Message); void sendBrokerLocate(); + void sendAgentLocate(); void handleAgentUpdate(const std::string&, const qpid::types::Variant::Map&, const qpid::messaging::Message&); void handleV1SchemaResponse(qpid::management::Buffer&, uint32_t, const qpid::messaging::Message&); void periodicProcessing(uint64_t); -- cgit v1.2.1