diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2010-08-20 16:12:21 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2010-08-20 16:12:21 +0100 |
| commit | 7447d62cf43fd76548238c327ac69c7deadf7552 (patch) | |
| tree | 44328ecb159eab99534491f4f756487f26dcb287 | |
| parent | 2cdb16fae7781de9a926e165255983197ccb4542 (diff) | |
| parent | cddda05d40947735d5dbd4566b5ee323cd3b38b8 (diff) | |
| download | rabbitmq-server-git-7447d62cf43fd76548238c327ac69c7deadf7552.tar.gz | |
merge heads
| -rw-r--r-- | src/file_handle_cache.erl | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/src/file_handle_cache.erl b/src/file_handle_cache.erl index 70fbcf8bc7..940ffb32df 100644 --- a/src/file_handle_cache.erl +++ b/src/file_handle_cache.erl @@ -947,9 +947,10 @@ reduce(State = #fhc_state { open_pending = OpenPending, Now = now(), {CStates, Sum, ClientCount} = dict:fold(fun (Pid, Eldest, {CStatesAcc, SumAcc, CountAcc} = Accs) -> - [#cstate { pending_closes = PendingCloses, - opened = Opened, blocked = Blocked } = - CState] = ets:lookup(Clients, Pid), + [#cstate { opened = Opened, + blocked = Blocked, + pending_closes = PendingCloses }] = + CState = ets:lookup(Clients, Pid), case Blocked orelse PendingCloses =:= Opened of true -> Accs; false -> {[CState | CStatesAcc], @@ -977,11 +978,10 @@ reduce(State = #fhc_state { open_pending = OpenPending, end. notify_age(CStates, AverageAge) -> - lists:foreach(fun (#cstate { callback = undefined }) -> - ok; - (#cstate { callback = {M, F, A} }) -> - apply(M, F, A ++ [AverageAge]) - end, CStates). + lists:foreach( + fun (#cstate { callback = undefined }) -> ok; + (#cstate { callback = {M, F, A} }) -> apply(M, F, A ++ [AverageAge]) + end, CStates). notify_age0(Clients, CStates, Required) -> Notifications = @@ -994,14 +994,12 @@ notify(_Clients, _Required, []) -> ok; notify(_Clients, Required, _Notifications) when Required =< 0 -> ok; -notify(Clients, Required, [#cstate{ callback = {M, F, A}, opened = Opened, - pid = Pid, pending_closes = PendingCloses } - | Notifications]) -> - Closable = Opened - PendingCloses, +notify(Clients, Required, [#cstate{ pid = Pid, + callback = {M, F, A}, + opened = Opened } | Notifications]) -> apply(M, F, A ++ [0]), - ets:update_element(Clients, Pid, - {#cstate.pending_closes, PendingCloses + Closable}), - notify(Clients, Required - Closable, Notifications). + ets:update_element(Clients, Pid, {#cstate.pending_closes, Opened}), + notify(Clients, Required - Opened, Notifications). track_client(Pid, Clients) -> case ets:insert_new(Clients, #cstate { pid = Pid, |