From 57bd5193208b228c1088586917d7f43f13e0dd9a Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Sat, 25 Oct 2008 01:55:06 +0000 Subject: Client API change: Centralize access to subscription status, better control of acquire/accept. client/AckPolicy: removed, functionality moved to Subscription and SubscriptionSettings client/SubscriptionSettings: struct aggregates flow control & accept-acquire parameters for subscribe. client/Subscription: represents active subscription. Query settings, unacked messages, manual accept/acquire client/SubscriptionManager: use AcceptMode, AcquireMode enums rather than confusing bools. Issues addressed by the change: - old use of bool for acceptMode was inverted wrt AMQP enum values, bools are confusing. - old AckPolicy was broken - not possible to access the instance associated with an active subscription - old AckPolicy did not provide a way to do manual acquire, only accept. - setting values on SubscriptionManager to apply to subsequent subscriptions is awkward & error-prone, now can use SubscriptionSettings to control on each subscribe individually. - a subscription is a central concept in AMQP, it deserves to be a class. Subscription and SubscriptionSettings provides a single point for future expansion of interactions with a a Subscription. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@707808 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/RangeSet.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'cpp/src/qpid/RangeSet.h') diff --git a/cpp/src/qpid/RangeSet.h b/cpp/src/qpid/RangeSet.h index 2a88426f17..1ba4fbbcef 100644 --- a/cpp/src/qpid/RangeSet.h +++ b/cpp/src/qpid/RangeSet.h @@ -27,6 +27,7 @@ #include #include #include +#include namespace qpid { @@ -53,7 +54,7 @@ class Range { void begin(const T& t) { begin_ = t; } void end(const T& t) { end_ = t; } - + size_t size() const { return end_ - begin_; } bool empty() const { return begin_ == end_; } bool contains(const T& x) const { return begin_ <= x && x < end_; } @@ -172,6 +173,7 @@ class RangeSet // The difference between the start and end of this range set uint32_t span() const; + size_t size() const; bool empty() const { return ranges.empty(); } void clear() { ranges.clear(); } @@ -185,6 +187,7 @@ class RangeSet template void decode(S& s) { uint16_t sz; s(sz); ranges.resize(sz/sizeof(Range)); } private: + static size_t accumulateSize(size_t s, const Range& r) { return s+r.size(); } Ranges ranges; template friend std::ostream& operator<<(std::ostream& o, const RangeSet& r); @@ -317,6 +320,9 @@ template uint32_t RangeSet::span() const { return ranges.back().last() - ranges.front().first(); } +template size_t RangeSet::size() const { + return std::accumulate(rangesBegin(), rangesEnd(), 0, &RangeSet::accumulateSize); +} } // namespace qpid -- cgit v1.2.1