diff options
| author | Matthias Radestock <matthias@lshift.net> | 2009-09-25 11:26:08 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2009-09-25 11:26:08 +0100 |
| commit | c7f6e84de3e3df2d8069927ec16fa1d99ead6281 (patch) | |
| tree | 96492600c390a1d16247e28d19b6d49abe7c1136 | |
| parent | d98def54f39380e5bab33fde78cd863e436c7830 (diff) | |
| download | rabbitmq-server-git-c7f6e84de3e3df2d8069927ec16fa1d99ead6281.tar.gz | |
move constants to where they belong
| -rw-r--r-- | src/rabbit_disk_queue.erl | 9 | ||||
| -rw-r--r-- | src/rabbit_msg_store.erl | 15 |
2 files changed, 10 insertions, 14 deletions
diff --git a/src/rabbit_disk_queue.erl b/src/rabbit_disk_queue.erl index ee5fead7e4..6fe2a4b308 100644 --- a/src/rabbit_disk_queue.erl +++ b/src/rabbit_disk_queue.erl @@ -52,9 +52,6 @@ -include("rabbit.hrl"). --define(MAX_READ_FILE_HANDLES, 256). --define(FILE_SIZE_LIMIT, (256*1024*1024)). - -define(SEQUENCE_ETS_NAME, rabbit_disk_queue_sequences). -define(BATCH_SIZE, 10000). @@ -122,8 +119,7 @@ %%---------------------------------------------------------------------------- start_link() -> - gen_server2:start_link({local, ?SERVER}, ?MODULE, - [?FILE_SIZE_LIMIT, ?MAX_READ_FILE_HANDLES], []). + gen_server2:start_link({local, ?SERVER}, ?MODULE, [], []). publish(Q, Message = #basic_message {}, IsDelivered) -> gen_server2:cast(?SERVER, {publish, Q, Message, IsDelivered}). @@ -185,7 +181,7 @@ filesync() -> %% gen_server behaviour %%---------------------------------------------------------------------------- -init([FileSizeLimit, ReadFileHandlesLimit]) -> +init([]) -> %% If the gen_server is part of a supervision tree and is ordered %% by its supervisor to terminate, terminate will be called with %% Reason=shutdown if the following conditions apply: @@ -201,7 +197,6 @@ init([FileSizeLimit, ReadFileHandlesLimit]) -> ok = detect_shutdown_state_and_adjust_delivered_flags(), Store = rabbit_msg_store:init(base_directory(), - FileSizeLimit, ReadFileHandlesLimit, fun msg_ref_gen/1, msg_ref_gen_init()), ok = prune(Store), diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl index 66bfb719f8..06c61f3554 100644 --- a/src/rabbit_msg_store.erl +++ b/src/rabbit_msg_store.erl @@ -31,11 +31,14 @@ -module(rabbit_msg_store). --export([init/5, write/3, read/2, contains/2, remove/2, release/2, +-export([init/3, write/3, read/2, contains/2, remove/2, release/2, needs_sync/2, sync/1, cleanup/1]). %%---------------------------------------------------------------------------- +-define(MAX_READ_FILE_HANDLES, 256). +-define(FILE_SIZE_LIMIT, (256*1024*1024)). + -record(msstate, {dir, %% store directory msg_locations, %% where are messages? @@ -92,8 +95,7 @@ message_cache :: ets_table() }). --spec(init/5 :: (file_path(), - non_neg_integer(), non_neg_integer(), +-spec(init/3 :: (file_path(), (fun ((A) -> 'finished' | {msg_id(), non_neg_integer(), A})), A) -> msstate()). -spec(write/3 :: (msg_id(), msg(), msstate()) -> msstate()). @@ -231,14 +233,13 @@ %% public API %%---------------------------------------------------------------------------- -init(Dir, FileSizeLimit, ReadFileHandlesLimit, - MsgRefDeltaGen, MsgRefDeltaGenInit) -> +init(Dir, MsgRefDeltaGen, MsgRefDeltaGenInit) -> MsgLocations = ets:new(?MSG_LOC_NAME, [set, private, {keypos, #msg_location.msg_id}]), InitFile = 0, - HandleCache = rabbit_file_handle_cache:init(ReadFileHandlesLimit, + HandleCache = rabbit_file_handle_cache:init(?MAX_READ_FILE_HANDLES, ?BINARY_MODE ++ [read]), FileSummary = ets:new(?FILE_SUMMARY_ETS_NAME, [set, private, {keypos, #file_summary.file}]), @@ -251,7 +252,7 @@ init(Dir, FileSizeLimit, ReadFileHandlesLimit, current_file_handle = undefined, current_offset = 0, current_dirty = false, - file_size_limit = FileSizeLimit, + file_size_limit = ?FILE_SIZE_LIMIT, read_file_handle_cache = HandleCache, last_sync_offset = 0, message_cache = MessageCache |