From 6c24486bbc4ffcf8c70e7d0fbac846512c83b440 Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Thu, 11 Sep 2008 13:26:10 +0000
Subject: Moved PollableCondition, PollableQueue and to sys. Fixed cluster
 shutdown issues.

sys/PollableCondition: is a generic mechansim to poll for non-IO
events in the Poller.

sys/PollableQueue: is a thread-safe queue template that can be
dispatched from the Poller when there are items on the queue. It uses
PollableCondition.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@694243 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/xml/cluster.xml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'cpp/xml')

diff --git a/cpp/xml/cluster.xml b/cpp/xml/cluster.xml
index d239bb11f3..13c9054ba3 100644
--- a/cpp/xml/cluster.xml
+++ b/cpp/xml/cluster.xml
@@ -69,19 +69,20 @@ o<?xml version="1.0"?>
     -->
     <control name="session-state" code="0x4" label="Set session state during a brain dump.">
       <!-- Target session deduced from channel number.  -->
-      <field name="replay-id" type="sequence-no"/>
-      <field name="send-id" type="sequence-no"/>
-      <field name="sent-incomplete" type="sequence-set"/>
-
-      <field name="expected-id" type="sequence-no"/>
-      <field name="received-id" type="sequence-no"/>
-      <field name="unknown-completed" type="sequence-set"/>
-      <field name="received-incomplete" type="sequence-set"/>
+
+      <field name="replay-start" type="sequence-no"/>	       <!-- Replay frames will start from this point.-->
+      <field name="sent-incomplete" type="sequence-set"/>      <!-- Commands sent and incomplete. -->
+
+      <field name="expected" type="sequence-no"/>	       <!-- Idempotence barrier -->
+      <field name="received" type="sequence-no"/>	       <!-- Received up to here > expected-->
+      <field name="unknown-completed" type="sequence-set"/>    <!-- Completed but not known to peer. -->
+      <field name="received-incomplete" type="sequence-set"/>  <!-- Received and incomplete -->
     </control>
 
     <control name="shadow-ready" code="0x5" label="End of shadow connection dump.">
-      <field name="cluster-id" type="uint64"/>
-      <field name="user-id" type="vbin16"/>
+      <field name="member-id" type="uint64"/>
+      <field name="connection-id" type="uint64"/>
     </control>
+
   </class>
 </amqp>
-- 
cgit v1.2.1