summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAlexandru Scvortov <alexandru@rabbitmq.com>2012-02-12 15:24:25 +0000
committerAlexandru Scvortov <alexandru@rabbitmq.com>2012-02-12 15:24:25 +0000
commit1798766f85aa1b942647a6b6136e09cb251bd631 (patch)
treee260de52024bbfbe8a2d617cef606a61eda0ebc8 /include
parent7a1c79945a5b0c7e08cd19fd2881da81783583c6 (diff)
parent6e728902a8c7223a23b79b66e6dae23ee186e18d (diff)
downloadrabbitmq-server-git-1798766f85aa1b942647a6b6136e09cb251bd631.tar.gz
merge default into bug20337
All tests pass. This also fixes the rabbit_guid rename.
Diffstat (limited to 'include')
-rw-r--r--include/rabbit_backing_queue_spec.hrl14
1 files changed, 11 insertions, 3 deletions
diff --git a/include/rabbit_backing_queue_spec.hrl b/include/rabbit_backing_queue_spec.hrl
index 2a8cc13c92..918d587a5e 100644
--- a/include/rabbit_backing_queue_spec.hrl
+++ b/include/rabbit_backing_queue_spec.hrl
@@ -25,6 +25,12 @@
-type(async_callback() :: fun ((atom(), fun ((atom(), state()) -> state())) -> 'ok')).
-type(duration() :: ('undefined' | 'infinity' | number())).
+-type(msg_lookup_result() :: {rabbit_types:basic_message(), state()}).
+
+-type(msg_lookup_fun() :: fun((state()) -> msg_lookup_result())).
+
+-type(msg_fun() :: fun((msg_lookup_fun(), state()) -> state())).
+
-spec(start/1 :: ([rabbit_amqqueue:name()]) -> 'ok').
-spec(stop/0 :: () -> 'ok').
-spec(init/3 :: (rabbit_types:amqqueue(), attempt_recovery(),
@@ -42,12 +48,14 @@
rabbit_types:message_properties(), pid(), state())
-> {undefined, state()}).
-spec(drain_confirmed/1 :: (state()) -> {[rabbit_guid:guid()], state()}).
--spec(dropwhile/2 ::
- (fun ((rabbit_types:message_properties()) -> boolean()), state())
+-spec(dropwhile/3 ::
+ (fun ((rabbit_types:message_properties()) -> boolean()),
+ msg_fun(), state())
-> state()).
-spec(fetch/2 :: (true, state()) -> {fetch_result(ack()), state()};
(false, state()) -> {fetch_result(undefined), state()}).
--spec(ack/2 :: ([ack()], state()) -> {[rabbit_guid:guid()], state()}).
+-spec(ack/3 :: ([ack()], msg_fun(), state()) ->
+ {[rabbit_guid:guid()], state()}).
-spec(requeue/2 :: ([ack()], state())
-> {[rabbit_guid:guid()], state()}).
-spec(len/1 :: (state()) -> non_neg_integer()).