diff options
| author | Matthew Sackman <matthew@lshift.net> | 2010-04-08 17:20:11 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2010-04-08 17:20:11 +0100 |
| commit | 67dcfb8be3b0f44ef22064452e7af9b387ece627 (patch) | |
| tree | 14fb6e04347ba0a4ba8ee526ea2b0ad74c6ad580 /include | |
| parent | 332d920fa5d8c1ba3adb249f638ff07587bdcbf4 (diff) | |
| download | rabbitmq-server-git-67dcfb8be3b0f44ef22064452e7af9b387ece627.tar.gz | |
Rearranging GC code and tidying up of some common dialyzer type defs
Diffstat (limited to 'include')
| -rw-r--r-- | include/rabbit.hrl | 7 | ||||
| -rw-r--r-- | include/rabbit_msg_store.hrl | 20 | ||||
| -rw-r--r-- | include/rabbit_msg_store_index.hrl | 5 |
3 files changed, 11 insertions, 21 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl index e9fa6e376c..35134ee7bc 100644 --- a/include/rabbit.hrl +++ b/include/rabbit.hrl @@ -90,6 +90,7 @@ %% this is really an abstract type, but dialyzer does not support them -type(guid() :: binary()). +-type(msg_id() :: guid()). -type(txn() :: guid()). -type(pkey() :: guid()). -type(r(Kind) :: @@ -168,6 +169,9 @@ #amqp_error{name :: atom(), explanation :: string(), method :: atom()}). + +-type(msg() :: any()). + -endif. %%---------------------------------------------------------------------------- @@ -180,6 +184,9 @@ -define(PERSISTENT_MSG_STORE, msg_store_persistent). -define(TRANSIENT_MSG_STORE, msg_store_transient). +-define(HIBERNATE_AFTER_MIN, 1000). +-define(DESIRED_HIBERNATE, 10000). + -ifdef(debug). -define(LOGDEBUG0(F), rabbit_log:debug(F)). -define(LOGDEBUG(F,A), rabbit_log:debug(F,A)). diff --git a/include/rabbit_msg_store.hrl b/include/rabbit_msg_store.hrl index 2c2735d483..112588f38b 100644 --- a/include/rabbit_msg_store.hrl +++ b/include/rabbit_msg_store.hrl @@ -29,23 +29,7 @@ %% Contributor(s): ______________________________________. %% +-include("rabbit.hrl"). + -record(msg_location, {msg_id, ref_count, file, offset, total_size}). - --record(file_summary, - {file, valid_total_size, contiguous_top, left, right, file_size, - locked, readers}). - --define(BINARY_MODE, [raw, binary]). --define(READ_MODE, [read]). --define(READ_AHEAD_MODE, [read_ahead | ?READ_MODE]). --define(WRITE_MODE, [write]). - --define(HIBERNATE_AFTER_MIN, 1000). --define(DESIRED_HIBERNATE, 10000). --define(FILE_EXTENSION, ".rdq"). --define(FILE_EXTENSION_TMP, ".rdt"). - --define(FILE_SIZE_LIMIT, (16*1024*1024)). - --define(HANDLE_CACHE_BUFFER_SIZE, 1048576). %% 1MB diff --git a/include/rabbit_msg_store_index.hrl b/include/rabbit_msg_store_index.hrl index db7e3b9f53..9b3332eed0 100644 --- a/include/rabbit_msg_store_index.hrl +++ b/include/rabbit_msg_store_index.hrl @@ -29,11 +29,12 @@ %% Contributor(s): ______________________________________. %% +-include("rabbit_msg_store.hrl"). + %%---------------------------------------------------------------------------- -ifdef(use_specs). --type(msg_id() :: binary()). -type(dir() :: any()). -type(index_state() :: any()). -type(keyvalue() :: any()). @@ -55,5 +56,3 @@ -endif. %%---------------------------------------------------------------------------- - --include("rabbit_msg_store.hrl"). |