From patchwork Mon Apr 15 15:56:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 88500 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6ED3D3846078 for ; Mon, 15 Apr 2024 15:56:49 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id C5EE33849AF1 for ; Mon, 15 Apr 2024 15:56:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C5EE33849AF1 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org C5EE33849AF1 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713196577; cv=none; b=cIV3vkJvSFddpLQksD1nB9VOzt1MPOIlsMBhtqCGzMfDlc2wfhGOdFGXQKmVunz3BRy4lNqnHLD3xdz9lNMpxdBPV4ZPz27gomic9309R8ScPG6z1KKk9TGIUjXT6e/NUbvkTxWsrTa3acr3CRLXNaGW8e7ETeoYUEhXUHabJqY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713196577; c=relaxed/simple; bh=a01uRe9/HMA+I3h3YtC5bhKiXxy5mQJcWr6qKXyTsOU=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=Eb+H6zWfZBRn4g+oPQF1/y4pZE+kIkQM8cUeS23yKI8bED0PYGQGrPGOdZ5XGBQeS5YU5qyQ5pLHdUMcGmmT3AvOuOZQfLf4azCzuOBTdk8hnm5gCccUA0nl24Ji4FnWh1rpG0ZzBX5yIa+9VlWfNiwxnqEdm23Ej0uGaBkidZ8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id B0AD65D2C7 for ; Mon, 15 Apr 2024 15:56:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1713196574; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/orhLhBFYvMs+v3OnB24aR1/oNGhqLIE96pk58CQIPc=; b=qk0unrQQj/+GAHwFS57/3c1oI1YN2co+1dcIiiHSp7DN3MUFbEV2Om/XS9qp5UgNRy/IaH st619Hx2NCNxCkAwZykbp6snBlZhgkxBuwCHgUHLh9iWVgNV2HD8bWD6p/D7A+DrNeShAw fnhijEH4QfvPk/woperHWg47nJrUuLw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1713196574; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/orhLhBFYvMs+v3OnB24aR1/oNGhqLIE96pk58CQIPc=; b=Y+tBGRA/TZXvp0aVlGu4d29V1VZx2bm+CR1rnVUUtBrz4qXJxsqI775kGbC2l+t8sUispF vBM0Cbkx0Arih4Bg== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=qk0unrQQ; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="Y+tBGRA/" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1713196574; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/orhLhBFYvMs+v3OnB24aR1/oNGhqLIE96pk58CQIPc=; b=qk0unrQQj/+GAHwFS57/3c1oI1YN2co+1dcIiiHSp7DN3MUFbEV2Om/XS9qp5UgNRy/IaH st619Hx2NCNxCkAwZykbp6snBlZhgkxBuwCHgUHLh9iWVgNV2HD8bWD6p/D7A+DrNeShAw fnhijEH4QfvPk/woperHWg47nJrUuLw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1713196574; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/orhLhBFYvMs+v3OnB24aR1/oNGhqLIE96pk58CQIPc=; b=Y+tBGRA/TZXvp0aVlGu4d29V1VZx2bm+CR1rnVUUtBrz4qXJxsqI775kGbC2l+t8sUispF vBM0Cbkx0Arih4Bg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 9BD6B1386E for ; Mon, 15 Apr 2024 15:56:14 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id aHDBJB5OHWaVRgAAD6G6ig (envelope-from ) for ; Mon, 15 Apr 2024 15:56:14 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 4/7] [gdb/testsuite] Factor out proc lock_dir Date: Mon, 15 Apr 2024 17:56:24 +0200 Message-Id: <20240415155627.22108-4-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240415155627.22108-1-tdevries@suse.de> References: <20240415155627.22108-1-tdevries@suse.de> MIME-Version: 1.0 X-Spam-Level: X-Spamd-Result: default: False [-3.97 / 50.00]; BAYES_HAM(-2.96)[99.81%]; MID_CONTAINS_FROM(1.00)[]; DWL_DNSWL_LOW(-1.00)[suse.de:dkim]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; FUZZY_BLOCKED(0.00)[rspamd.com]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; TO_DN_NONE(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim, imap1.dmz-prg2.suse.org:helo, imap1.dmz-prg2.suse.org:rdns] X-Rspamd-Action: no action X-Rspamd-Queue-Id: B0AD65D2C7 X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Score: -3.97 X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org In lib/rocm.exp we have: ... set gpu_lock_filename $objdir/gpu-parallel.lock ... This decides both the lock file name and directory. Factor out a new proc lock_dir that decides on the directory, leaving just: ... set gpu_lock_filename gpu-parallel.lock ... Tested on aarch64-linux. --- gdb/testsuite/lib/gdb-utils.exp | 7 +++++++ gdb/testsuite/lib/rocm.exp | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/lib/gdb-utils.exp b/gdb/testsuite/lib/gdb-utils.exp index 4205f8d1a22..c0b96d3c2bf 100644 --- a/gdb/testsuite/lib/gdb-utils.exp +++ b/gdb/testsuite/lib/gdb-utils.exp @@ -177,10 +177,17 @@ proc lock_file_release {info} { } } +# Return directory where we keep lock files. + +proc lock_dir {} { + return $objdir +} + # Run body under lock LOCK_FILE. proc with_lock { lock_file body } { if {[info exists ::GDB_PARALLEL]} { + set lock_file [file join [lock_dir] $lock_file] set lock_rc [lock_file_acquire $lock_file] } diff --git a/gdb/testsuite/lib/rocm.exp b/gdb/testsuite/lib/rocm.exp index 7dd7ef3f3b5..2276bb3640e 100644 --- a/gdb/testsuite/lib/rocm.exp +++ b/gdb/testsuite/lib/rocm.exp @@ -106,7 +106,7 @@ gdb_caching_proc allow_hipcc_tests {} { # The lock file used to ensure that only one GDB has access to the GPU # at a time. -set gpu_lock_filename $objdir/gpu-parallel.lock +set gpu_lock_filename gpu-parallel.lock # Run body under the GPU lock. Also calls gdb_exit before releasing # the GPU lock.