From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gnu.wildebeest.org (gnu.wildebeest.org [45.83.234.184]) by sourceware.org (Postfix) with ESMTPS id 949853858D28 for ; Thu, 26 Jan 2023 14:34:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 949853858D28 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=klomp.org Received: from r6.localdomain (82-217-174-174.cable.dynamic.v4.ziggo.nl [82.217.174.174]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id 05E6B302BBEC; Thu, 26 Jan 2023 15:34:13 +0100 (CET) Received: by r6.localdomain (Postfix, from userid 1000) id BD650340196; Thu, 26 Jan 2023 15:34:12 +0100 (CET) Message-ID: <3fa74c6c1f99765430b0e041c050d47b0a993aec.camel@klomp.org> Subject: Re: [PATCH] find-debuginfo: Pass -j down to dwz From: Mark Wielaard To: Kalev Lember , debugedit@sourceware.org Date: Thu, 26 Jan 2023 15:34:12 +0100 In-Reply-To: <20230119160318.3868439-1-klember@redhat.com> References: <20230119160318.3868439-1-klember@redhat.com> Content-Type: multipart/mixed; boundary="=-g4Dcd/ANNrpGbzratBd8" User-Agent: Evolution 3.46.2 (3.46.2-1.fc37) MIME-Version: 1.0 X-Spam-Status: No, score=-3036.6 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,RCVD_IN_BARRACUDACENTRAL,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --=-g4Dcd/ANNrpGbzratBd8 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi Kalev, On Thu, 2023-01-19 at 17:03 +0100, Kalev Lember wrote: > Now that dwz 0.15 supports parallel jobs, add a way to control it from > here. find-debuginfo already has a -j parameter so we can just extend it > and pass the value down to dwz as well. >=20 > This should fix building large packages on memory constrained builders, > such as webkitgtk on s390x in Fedora koji build system, where we can now > use the -j option to tune down parallelism to avoid running out of > memory during dwz run. Aha, you want to reduce the default parallelism (processors / 2)? > diff --git a/scripts/find-debuginfo.in b/scripts/find-debuginfo.in > index b07a52f..8cc1bfd 100755 > --- a/scripts/find-debuginfo.in > +++ b/scripts/find-debuginfo.in > @@ -585,7 +585,7 @@ if $run_dwz \ > dwz_multifile_suffix=3D".${dwz_multifile_idx}" > done > dwz_multifile_name=3D"${dwz_multifile_name}${dwz_multifile_suffix}" > - dwz_opts=3D"-h -q -r" > + dwz_opts=3D"-h -q -r -j ${n_jobs}" > [ ${#dwz_files[@]} -gt 1 ] && [ "$dwz_single_file_mode" =3D "false" = ] \ > && dwz_opts=3D"${dwz_opts} -m .dwz/${dwz_multifile_name}" > mkdir -p "${RPM_BUILD_ROOT}/usr/lib/debug/.dwz" I agree with Panu that a configure check would be nice to make sure the installed dwz does support -j. Would the attached patch work for you? Thanks, Mark --=-g4Dcd/ANNrpGbzratBd8 Content-Disposition: inline; filename="dwz_j.patch" Content-Type: text/x-patch; name="dwz_j.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL01ha2VmaWxlLmFtIGIvTWFrZWZpbGUuYW0KaW5kZXggMjA2MGI5Ni4uNGE1 MDkyZCAxMDA2NDQKLS0tIGEvTWFrZWZpbGUuYW0KKysrIGIvTWFrZWZpbGUuYW0KQEAgLTMzLDcg KzMzLDggQEAgQ0xFQU5GSUxFUyA9ICQoYmluX1NDUklQVFMpCiAjIFNvbWUgc3RhbmRhcmQgc3Vi c3RpdHV0aW9ucyBmb3Igc2NyaXB0cwogZG9fc3Vic3QgPSAoJChTRUQpIC1lICdzLFtAXVBBQ0tB R0VbQF0sJChQQUNLQUdFKSxnJyBcCiAJCSAgIC1lICdzLFtAXVZFUlNJT05bQF0sJChWRVJTSU9O KSxnJyBcCi0JCSAgIC1lICdzLFtAXVJFQURFTEZbQF0sJChSRUFERUxGKSxnJykKKwkJICAgLWUg J3MsW0BdUkVBREVMRltAXSwkKFJFQURFTEYpLGcnIFwKKwkJICAgLWUgJ3MsW0BdRFdaX0pbQF0s JChEV1pfSiksZycpCiAKIGZpbmQtZGVidWdpbmZvOiAkKHRvcF9zcmNkaXIpL3NjcmlwdHMvZmlu ZC1kZWJ1Z2luZm8uaW4gTWFrZWZpbGUKIAkkKGRvX3N1YnN0KSA8ICIkKHRvcF9zcmNkaXIpL3Nj cmlwdHMvJEAuaW4iID4gIiRAIgpkaWZmIC0tZ2l0IGEvY29uZmlndXJlLmFjIGIvY29uZmlndXJl LmFjCmluZGV4IDZhNTMzNjUuLmYyZDE1NzEgMTAwNjQ0Ci0tLSBhL2NvbmZpZ3VyZS5hYworKysg Yi9jb25maWd1cmUuYWMKQEAgLTQ3LDYgKzQ3LDI3IEBAIEFDX0NIRUNLX1RPT0woW0xEXSwgW2xk XSkKIEFDX0NIRUNLX1RPT0woW1JFQURFTEZdLCBbcmVhZGVsZl0pCiBBTV9NSVNTSU5HX1BST0co SEVMUDJNQU4sIGhlbHAybWFuKQogCisjIFdoZXRoZXIgZHd6IHN1cHBvcnQgLWouCisjIE1ha2Ug c3VyZSB0byBjb21waWxlIHNvbWV0aGluZyB3aXRoIC1nLgorIyBSdW4gZHd6IG9uIGl0IHdpdGgg LWoxLgorRFdaX0o9IiIKK0FDX0NIRUNLX1BST0coW0RXWl0sIFtkd3pdLCBbZHd6XSkKK2lmIHRl c3QgIngkRFdaIiA9ICJ4ZHd6IjsgdGhlbgorICBzYXZlX0NGTEFHUz0iJENGTEFHUyIKKyAgQ0ZM QUdTPSIkc2F2ZV9DRkxBR1MgLWciCisgIEFDX0NBQ0hFX0NIRUNLKFt3aGV0aGVyIHRoZSBkd3og c3VwcG9ydCAtal0sIGFjX2N2X2R3el9qLCBbZG5sCisgICAgQUNfTElOS19JRkVMU0UoW0FDX0xB TkdfUFJPR1JBTSgpXSxbZG5sCisgICAgICBhY19jdl9kd3pfaj15ZXM7ICR7RFdafSAtajEgY29u ZnRlc3QkRVhFRVhUIDI+L2Rldi9udWxsIHx8IGFjX2N2X2R3el9qPW5vXSwKKyAgICAgIEFDX01T R19GQUlMVVJFKFt1bmV4cGVjdGVkIGNvbXBpbGUgZmFpbHVyZV0pKV0pCisgIGlmIHRlc3QgIngk YWNfY3ZfZHd6X2oiID0gInh5ZXMiOyB0aGVuCisgICAgRFdaX0o9Ii1qIgorICBmaQorICBDRkxB R1M9IiRzYXZlX0NGTEFHUyIKK2Vsc2UKKyAgQUNfTVNHX1dBUk4oW2R3eiBub3QgaW5zdGFsbGVk XSkKK2ZpCitBQ19TVUJTVChbRFdaX0pdKQorCiAjIE9ubHkgcmVhbGx5IGFuIGlzc3VlIG9uIDMy Yml0IHBsYXRmb3Jtcy4gTWFrZXMgc3VyZSB3ZSdsbCBnZXQgbGFyZ2Ugb2ZmX3QuCiBBQ19TWVNf TEFSR0VGSUxFCiAKZGlmZiAtLWdpdCBhL3NjcmlwdHMvZmluZC1kZWJ1Z2luZm8uaW4gYi9zY3Jp cHRzL2ZpbmQtZGVidWdpbmZvLmluCmluZGV4IGIwN2E1MmYuLjgwOTBjODQgMTAwNzU1Ci0tLSBh L3NjcmlwdHMvZmluZC1kZWJ1Z2luZm8uaW4KKysrIGIvc2NyaXB0cy9maW5kLWRlYnVnaW5mby5p bgpAQCAtNTg2LDYgKzU4Niw3IEBAIGlmICRydW5fZHd6IFwKICAgICBkb25lCiAgICAgZHd6X211 bHRpZmlsZV9uYW1lPSIke2R3el9tdWx0aWZpbGVfbmFtZX0ke2R3el9tdWx0aWZpbGVfc3VmZml4 fSIKICAgICBkd3pfb3B0cz0iLWggLXEgLXIiCisgICAgWyAtbiAiQERXWl9KQCIgXSAmJiBkd3pf b3B0cz0iJHtkd3pfb3B0c30gLWogJHtuX2pvYnN9IgogICAgIFsgJHsjZHd6X2ZpbGVzW0BdfSAt Z3QgMSBdICYmIFsgIiRkd3pfc2luZ2xlX2ZpbGVfbW9kZSIgPSAiZmFsc2UiIF0gXAogICAgICAg JiYgZHd6X29wdHM9IiR7ZHd6X29wdHN9IC1tIC5kd3ovJHtkd3pfbXVsdGlmaWxlX25hbWV9Igog ICAgIG1rZGlyIC1wICIke1JQTV9CVUlMRF9ST09UfS91c3IvbGliL2RlYnVnLy5kd3oiCg== --=-g4Dcd/ANNrpGbzratBd8--