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 | 0306da03a9f08ec1aba7614738a769bec37518cb (patch) | |
| tree | 44328ecb159eab99534491f4f756487f26dcb287 | |
| parent | f0c9be010738e572cba6bfbf8a8639bdb43f8485 (diff) | |
| parent | 55e8015c1a6068dd39bb53c625b3cf5b3374f928 (diff) | |
| download | rabbitmq-server-0306da03a9f08ec1aba7614738a769bec37518cb.tar.gz | |
merge heads
| -rw-r--r-- | src/file_handle_cache.erl | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/file_handle_cache.erl b/src/file_handle_cache.erl index 60991e1d..940ffb32 100644 --- a/src/file_handle_cache.erl +++ b/src/file_handle_cache.erl @@ -761,7 +761,7 @@ handle_call({open, Pid, EldestUnusedSince}, From, when EldestUnusedSince =/= undefined -> Elders1 = dict:store(Pid, EldestUnusedSince, Elders), Item = {open, Pid, From}, - ok = ensure_mref(Pid, Clients), + ok = track_client(Pid, Clients), State1 = State #fhc_state { elders = Elders1 }, case needs_reduce(State1 #fhc_state { open_count = Count + 1 }) of true -> case ets:lookup(Clients, Pid) of @@ -784,7 +784,7 @@ handle_call({obtain, Pid}, From, State = #fhc_state { obtain_limit = Limit, obtain_pending = Pending, clients = Clients }) when Limit =/= infinity andalso Count >= Limit -> - ok = ensure_mref(Pid, Clients), + ok = track_client(Pid, Clients), true = ets:update_element(Clients, Pid, {#cstate.blocked, true}), Item = {obtain, Pid, From}, {noreply, State #fhc_state { obtain_pending = [Item | Pending] }}; @@ -792,7 +792,7 @@ handle_call({obtain, Pid}, From, State = #fhc_state { obtain_count = Count, obtain_pending = Pending, clients = Clients }) -> Item = {obtain, Pid, From}, - ok = ensure_mref(Pid, Clients), + ok = track_client(Pid, Clients), case needs_reduce(State #fhc_state { obtain_count = Count + 1 }) of true -> true = ets:update_element(Clients, Pid, {#cstate.blocked, true}), @@ -804,7 +804,7 @@ handle_call({obtain, Pid}, From, State = #fhc_state { obtain_count = Count, handle_cast({register_callback, Pid, MFA}, State = #fhc_state { clients = Clients }) -> - ok = ensure_mref(Pid, Clients), + ok = track_client(Pid, Clients), true = ets:update_element(Clients, Pid, {#cstate.callback, MFA}), {noreply, State}; @@ -828,7 +828,7 @@ handle_cast({close, Pid, EldestUnusedSince}, State #fhc_state { elders = Elders1 }))}; handle_cast({transfer, FromPid, ToPid}, State) -> - ok = ensure_mref(ToPid, State#fhc_state.clients), + ok = track_client(ToPid, State#fhc_state.clients), {noreply, process_pending( update_counts(obtain, ToPid, +1, update_counts(obtain, FromPid, -1, State)))}; @@ -1001,12 +1001,12 @@ notify(Clients, Required, [#cstate{ pid = Pid, ets:update_element(Clients, Pid, {#cstate.pending_closes, Opened}), notify(Clients, Required - Opened, Notifications). -ensure_mref(Pid, Clients) -> - case ets:insert_new(Clients, #cstate { pid = Pid, - callback = undefined, - opened = 0, - obtained = 0, - blocked = false, +track_client(Pid, Clients) -> + case ets:insert_new(Clients, #cstate { pid = Pid, + callback = undefined, + opened = 0, + obtained = 0, + blocked = false, pending_closes = 0 }) of true -> _MRef = erlang:monitor(process, Pid), ok; |