Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1D80E11988 for ; Tue, 26 Aug 2014 09:45:58 +0000 (UTC) Received: (qmail 82798 invoked by uid 500); 26 Aug 2014 09:45:57 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 82694 invoked by uid 500); 26 Aug 2014 09:45:57 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 82578 invoked by uid 99); 26 Aug 2014 09:45:57 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Aug 2014 09:45:57 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B04E2A03B79; Tue, 26 Aug 2014 09:45:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rnewson@apache.org To: commits@couchdb.apache.org Date: Tue, 26 Aug 2014 09:46:19 -0000 Message-Id: <88dc49643f3b45b7b7ade30c993ef67e@git.apache.org> In-Reply-To: <8277b323654141428b7adddf3d58b244@git.apache.org> References: <8277b323654141428b7adddf3d58b244@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [24/26] couch commit: updated refs/heads/windsor-merge to 14dc5e9 Use an API for setting the mp_att_writers Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/94a2474a Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/94a2474a Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/94a2474a Branch: refs/heads/windsor-merge Commit: 94a2474a4ae9cf8e6cce2511ccd26ab343fdeea8 Parents: 4f9cb35 Author: Paul J. Davis Authored: Fri Aug 22 02:13:05 2014 -0500 Committer: Robert Newson Committed: Tue Aug 26 10:44:12 2014 +0100 ---------------------------------------------------------------------- src/couch_doc.erl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/94a2474a/src/couch_doc.erl ---------------------------------------------------------------------- diff --git a/src/couch_doc.erl b/src/couch_doc.erl index 74450a4..d92412d 100644 --- a/src/couch_doc.erl +++ b/src/couch_doc.erl @@ -447,7 +447,7 @@ doc_from_multi_part_stream(ContentType, DataFun, Ref) -> {Parser, ParserRef} = spawn_monitor(fun() -> ParentRef = erlang:monitor(process, Parent), put(mp_parent_ref, ParentRef), - put(num_mp_writers, NumMpWriters), + num_mp_writers(NumMpWriters), {<<"--",_/binary>>, _, _} = couch_httpd:parse_multipart_request( ContentType, DataFun, fun(Next) -> mp_parse_doc(Next, []) end), @@ -594,6 +594,10 @@ maybe_send_data({Ref, Chunks, Offset, Counters, Waiting}) -> end. +num_mp_writers(N) -> + erlang:put(mp_att_writers, N). + + num_mp_writers() -> case erlang:get(mp_att_writers) of undefined -> 1;