summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@lshift.net>2010-04-09 17:09:48 +0100
committerMatthew Sackman <matthew@lshift.net>2010-04-09 17:09:48 +0100
commitfcb86e5510b702d78892eaa0de5d00471339918f (patch)
tree88ba3981485c313c156a7f99dd36fdaf34824f07 /src
parent603cb38b0b87d5efc6d7450640a074947c6f01b0 (diff)
downloadrabbitmq-server-git-fcb86e5510b702d78892eaa0de5d00471339918f.tar.gz
Corrections to specs, docs and exports
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_backing_queue_type.erl10
-rw-r--r--src/rabbit_variable_queue.erl4
2 files changed, 6 insertions, 8 deletions
diff --git a/src/rabbit_backing_queue_type.erl b/src/rabbit_backing_queue_type.erl
index 3ccd71d09f..526152f143 100644
--- a/src/rabbit_backing_queue_type.erl
+++ b/src/rabbit_backing_queue_type.erl
@@ -62,7 +62,7 @@ behaviour_info(callbacks) ->
%% Called for messages which have already been passed straight
%% out to a client. The queue will be empty for these calls
- %% (i.e. saves the round trip through the internal queue).
+ %% (i.e. saves the round trip through the backing queue).
{publish_delivered, 2},
%% Produce the next message
@@ -112,10 +112,10 @@ behaviour_info(callbacks) ->
%% the current rates of the queue.
{ram_duration, 1},
- %% Can return 'undefined' or a function atom name plus list of
- %% arguments to be invoked in the internal queue module as soon
- %% as the queue process can manage (either on an empty mailbox,
- %% or when a timer fires).
+ %% Can return 'undefined' or a thunk which will receive the
+ %% state, and must return the state, as soon as the queue process
+ %% can manage (either on an empty mailbox, or when a timer
+ %% fires).
{sync_callback, 1},
%% Called immediately before the queue hibernates
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl
index 0048925ac0..1c29c19367 100644
--- a/src/rabbit_variable_queue.erl
+++ b/src/rabbit_variable_queue.erl
@@ -39,8 +39,6 @@
-export([start/1]).
--export([tx_commit_post_msg_store/5, tx_commit_index/1]). %% internal
-
%%----------------------------------------------------------------------------
%% Definitions:
@@ -227,7 +225,7 @@
avg_ingress_rate :: float(),
rate_timestamp :: {integer(), integer(), integer()},
len :: non_neg_integer(),
- on_sync :: {[ack()], [msg_id()], [{pid(), any()}]},
+ on_sync :: {[[ack()]], [[msg_id()]], [{pid(), any()}]},
msg_store_clients :: {{any(), binary()}, {any(), binary()}},
persistent_store :: pid() | atom(),
persistent_count :: non_neg_integer(),