diff options
| author | John Christopher Anderson <jchris@apache.org> | 2010-03-04 03:10:19 +0000 |
|---|---|---|
| committer | John Christopher Anderson <jchris@apache.org> | 2010-03-04 03:10:19 +0000 |
| commit | d318717866ffa267781ab482e99a05415e2ac0e4 (patch) | |
| tree | 207409d78eacca8e206deb05b99689ec449722a4 /src/couchdb/couch_ref_counter.erl | |
| parent | 3a3a9c1efab1c9fe4cd5ebb6c80da4005eb0806b (diff) | |
reverting damien's latest commit until we can figure out why it's causing failures
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@918834 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_ref_counter.erl')
| -rw-r--r-- | src/couchdb/couch_ref_counter.erl | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/couchdb/couch_ref_counter.erl b/src/couchdb/couch_ref_counter.erl index 96d92333..5c8e7437 100644 --- a/src/couchdb/couch_ref_counter.erl +++ b/src/couchdb/couch_ref_counter.erl @@ -40,18 +40,17 @@ count(RefCounterPid) -> -record(srv, { - referrers=dict:new(), % a dict of each ref counting proc. - child_procs=[] + referrers=dict:new() % a dict of each ref counting proc. }). init({Pid, ChildProcs}) -> [link(ChildProc) || ChildProc <- ChildProcs], Referrers = dict:from_list([{Pid, {erlang:monitor(process, Pid), 1}}]), - {ok, #srv{referrers=Referrers, child_procs=ChildProcs}}. + {ok, #srv{referrers=Referrers}}. -terminate(_Reason, #srv{child_procs=ChildProcs}) -> - [couch_util:shutdown_sync(Pid) || Pid <- ChildProcs], +terminate(Reason, _Srv) -> + couch_util:terminate_linked(Reason), ok. |