summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2010-04-12 11:24:59 +0100
committerMatthias Radestock <matthias@lshift.net>2010-04-12 11:24:59 +0100
commita4196b06525dffd8fb53362d4a54dc55c17dbb7b (patch)
tree15dfedfd2188bb60f06ef3770a2898c04f9aa930 /src
parent16a3cbcf6e34977d6a4b49492b09e9ac512f2c02 (diff)
downloadrabbitmq-server-git-a4196b06525dffd8fb53362d4a54dc55c17dbb7b.tar.gz
rename rabbit_misc:geometric/1 to random_geometric/1
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_misc.erl6
-rw-r--r--src/rabbit_msg_store.erl2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl
index 4f0e1bb0c2..6be36a0def 100644
--- a/src/rabbit_misc.erl
+++ b/src/rabbit_misc.erl
@@ -60,7 +60,7 @@
-export([pid_to_string/1, string_to_pid/1]).
-export([version_compare/2, version_compare/3]).
-export([recursive_delete/1, dict_cons/3, unlink_and_capture_exit/1]).
--export([geometric/1]).
+-export([random_geometric/1]).
-import(mnesia).
-import(lists).
@@ -141,7 +141,7 @@
-spec(recursive_delete/1 :: (string()) -> 'ok' | {'error', any()}).
-spec(dict_cons/3 :: (any(), any(), dict()) -> dict()).
-spec(unlink_and_capture_exit/1 :: (pid()) -> 'ok').
--spec(geometric/1 :: (float()) -> non_neg_integer()).
+-spec(random_geometric/1 :: (float()) -> non_neg_integer()).
-endif.
@@ -642,6 +642,6 @@ unlink_and_capture_exit(Pid) ->
after 0 -> ok
end.
-geometric(P) when 0.0 < P andalso P < 1.0 ->
+random_geometric(P) when 0.0 < P andalso P < 1.0 ->
U = 1.0 - random:uniform(),
ceil(math:log(U) / math:log(1.0 - P)).
diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl
index 2af16bc1cc..322cad87ce 100644
--- a/src/rabbit_msg_store.erl
+++ b/src/rabbit_msg_store.erl
@@ -1444,7 +1444,7 @@ maybe_compact(State = #msstate { sum_valid_data = SumValid,
file_summary_ets = FileSummaryEts })
when (SumFileSize - SumValid) / SumFileSize > ?GARBAGE_FRACTION ->
First = ets:first(FileSummaryEts),
- N = rabbit_misc:geometric(?GEOMETRIC_P),
+ N = rabbit_misc:random_geometric(?GEOMETRIC_P),
case find_files_to_gc(FileSummaryEts, N, First) of
undefined ->
State;