diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-04-22 23:53:26 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-04-22 23:53:26 +0100 |
| commit | 09b7163518b2b1e1ad6114ac1badee17f0171bb6 (patch) | |
| tree | f50436c1ad3c97102df9f1e7ffecef49923052f5 | |
| parent | 269f1dc10a1b2727f799730bd48ed452620e2f0b (diff) | |
| download | rabbitmq-server-git-09b7163518b2b1e1ad6114ac1badee17f0171bb6.tar.gz | |
just taking out the param of file handles
| -rw-r--r-- | src/rabbit_disk_queue.erl | 10 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/rabbit_disk_queue.erl b/src/rabbit_disk_queue.erl index b32fffe4d1..55840ce9d1 100644 --- a/src/rabbit_disk_queue.erl +++ b/src/rabbit_disk_queue.erl @@ -33,7 +33,7 @@ -behaviour(gen_server). --export([start_link/2]). +-export([start_link/1]). -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). @@ -59,6 +59,8 @@ -define(SERVER, ?MODULE). +-define(MAX_READ_FILE_HANDLES, 256). + -record(dqstate, {msg_location, %% where are messages? file_summary, %% what's in the files? sequences, %% next read and write for each q @@ -212,7 +214,7 @@ -type(seq_id() :: non_neg_integer()). --spec(start_link/2 :: (non_neg_integer(), non_neg_integer()) -> +-spec(start_link/1 :: (non_neg_integer()) -> {'ok', pid()} | 'ignore' | {'error', any()}). -spec(publish/3 :: (queue_name(), msg_id(), binary()) -> 'ok'). -spec(deliver/1 :: (queue_name()) -> @@ -229,9 +231,9 @@ %% ---- PUBLIC API ---- -start_link(FileSizeLimit, ReadFileHandlesLimit) -> +start_link(FileSizeLimit) -> gen_server:start_link({local, ?SERVER}, ?MODULE, - [FileSizeLimit, ReadFileHandlesLimit], []). + [FileSizeLimit, ?MAX_READ_FILE_HANDLES], []). publish(Q, MsgId, Msg) when is_binary(Msg) -> gen_server:cast(?SERVER, {publish, Q, MsgId, Msg}). diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index 4b72a7422b..2f1d0c4339 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -769,7 +769,7 @@ rdq_stress_gc(MsgCount) -> rdq_time_insane_startup() -> rdq_virgin(), OneGig = 1024*1024*1024, - rabbit_disk_queue:start_link(OneGig, 5), + rabbit_disk_queue:start_link(OneGig), Msg = <<>>, List = lists:seq(1, 1024*1024), %% 1M empty messages, at say, 100B per message, should all fit @@ -788,12 +788,12 @@ rdq_time_commands(Funcs) -> rdq_virgin() -> {Micros, {ok, _}} = - timer:tc(rabbit_disk_queue, start_link, [1024*1024, 5]), + timer:tc(rabbit_disk_queue, start_link, [1024*1024]), ok = rabbit_disk_queue:stop_and_obliterate(), Micros. rdq_start() -> - {ok, _} = rabbit_disk_queue:start_link(1024*1024, 5). + {ok, _} = rabbit_disk_queue:start_link(1024*1024). rdq_stop() -> rabbit_disk_queue:stop(). |