From 4c0c417d63b96e910925a343d63bde5481ba5698 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 22 Oct 2008 13:09:33 +0000 Subject: QPID-1382 from Mick Goulish: Improvement to Client-Side Cluster Failover code Also: Fix missing DispatchHandle.h include in sys/PollableQueue.h Added ignore properties for failover example binaries & Makefile. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@707065 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/client/FailoverSession.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'cpp/src/qpid/client/FailoverSession.h') diff --git a/cpp/src/qpid/client/FailoverSession.h b/cpp/src/qpid/client/FailoverSession.h index b301353968..7a743da452 100644 --- a/cpp/src/qpid/client/FailoverSession.h +++ b/cpp/src/qpid/client/FailoverSession.h @@ -35,7 +35,7 @@ #include "qpid/client/SessionImpl.h" #include "qpid/client/TypedResult.h" #include "qpid/shared_ptr.h" -#include "qpid/sys/Mutex.h" +#include "qpid/sys/Monitor.h" #include @@ -61,7 +61,7 @@ class FailoverSession framing::FrameSet::shared_ptr get(); - SessionId getId() const; + SessionId getId(); void close(); @@ -80,8 +80,6 @@ class FailoverSession void sendCompletion ( ); - bool failover_in_progress; - // Wrapped functions from Session ---------------------------- @@ -293,15 +291,18 @@ class FailoverSession // end Wrapped functions from Session --------------------------- // Tells the FailoverSession to get ready for a failover. + void failoverStarting(); void prepareForFailover ( Connection newConnection ); - void failover ( ); + void failoverComplete(); void setFailoverSubscriptionManager(FailoverSubscriptionManager*); private: - typedef sys::Mutex::ScopedLock Lock; - sys::Mutex lock; + sys::Monitor lock; + bool failover_in_progress; + int failover_count; + FailoverSubscriptionManager * failoverSubscriptionManager; -- cgit v1.2.1