From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by sourceware.org (Postfix) with ESMTPS id E23B9385781D for ; Tue, 30 Mar 2021 07:43:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E23B9385781D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tdevries@suse.de X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 13148B1BD; Tue, 30 Mar 2021 07:43:11 +0000 (UTC) Date: Tue, 30 Mar 2021 09:43:09 +0200 From: Tom de Vries To: dwz@sourceware.org, jakub@redhat.com, mark@klomp.org Subject: [committed] Use vars to name parallel parts in dwz_files_1 Message-ID: <20210330074308.GA11240@delia.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_NUMSUBJECT, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: dwz@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Dwz mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Mar 2021 07:43:13 -0000 Hi, Use variables initial_parallel_p and finalize_multifile_parallel_p to name parallel parts in dwz_files_1. Committed to trunk. Thanks, - Tom Use vars to name parallel parts in dwz_files_1 2021-03-29 Tom de Vries * dwz.c (dwz_files_1): Add variables initial_parallel_p and finalize_multifile_parallel_p. --- dwz.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dwz.c b/dwz.c index 3ad9c9e..037cb75 100644 --- a/dwz.c +++ b/dwz.c @@ -16537,8 +16537,8 @@ dwz_files_1 (int nr_files, char *files[], bool hardlink, workset[workset_size] = i; workset_size++; } - - if (max_forks > 1 && multifile == NULL) + bool initial_parallel_p = max_forks > 1 && multifile == NULL; + if (initial_parallel_p) { pid_t pids[nr_files]; int nr_forks = 0; @@ -16641,7 +16641,8 @@ dwz_files_1 (int nr_files, char *files[], bool hardlink, workset_size++; } - if (max_forks > 1) + bool finalize_multifile_parallel_p = max_forks > 1; + if (finalize_multifile_parallel_p) { pid_t pids[nr_files]; int nr_forks = 0;