From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id iTC7IglPjGqWVTwAWB0awg (envelope-from ) for ; Mon, 24 Aug 2026 10:02:49 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=NhqhVU87; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=aK28une0; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=0RO/VzVb; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=H/P4SAmF; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 869D51E0A3; Mon, 24 Aug 2026 10:02:49 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 6C06F1E033 for ; Mon, 24 Aug 2026 10:02:48 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 095A34BA799F for ; Mon, 24 Aug 2026 14:02:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 095A34BA799F Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=NhqhVU87; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=aK28une0; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=0RO/VzVb; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=H/P4SAmF Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id ABFCA4BA9036 for ; Mon, 24 Aug 2026 13:59:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org ABFCA4BA9036 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 ABFCA4BA9036 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1787579953; cv=none; b=mFKXkgjAXEiIRO59i1b7Y1orfSO+Z/YNgTzCMsMUkwb6zQWSSrFnBKAHu02nnrvN8rA2faUDanyVeSdUhmDeHaeUSS78BTt26dSYi1sNV9SMbtjGW4AWunEOvPJQw0bBg3fT7XxAH/Kmluzb41Q+QGx0o3M5CGXYNWBzVxYty+4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1787579953; c=relaxed/simple; bh=tiRn360uNXdvMPS8vPqGbdS0Lupdu4zDm1HNUtEeJYA=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=OHkXf9fQnCOYrkPcPp+bPB9d2I3LP/8xMBLg+2YklkJGtKiC3U7s1U7YsB1xuXEjSBa/0x0XUsc1nxoKe8/xk3O0N6+binkauBd7+NA0wFLfsBK05hSuHm8NOKVFHE3W4CSJrfiKA7Yvcam0Wxluaac2Ufqq/2hnUt5/gMx2tfg= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=NhqhVU87; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=aK28une0; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=0RO/VzVb; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=H/P4SAmF DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org ABFCA4BA9036 Received: from imap1.dmz-prg2.suse.org (unknown [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-out1.suse.de (Postfix) with ESMTPS id 6D3EB868E3 for ; Mon, 24 Aug 2026 13:59:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1787579948; 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=gTARxaLBaPb7gs/mXKfjRpSVoRZKvtD+yTptQK3p4gI=; b=NhqhVU874KVtXPVh6sVq552+icQqdz7aXWkagCkcHsSsmQ7xPIVbi1pKksQMmbvne8q+6M rUTUIRoAqb4BL8BB2lWGRJWyWnzZDTUhUZ4X1Lhoubi3yGpmdIM6MOtHWM9zRirjZVkpzM rG+jArg0CQYeV0ylkbKsYIPV9kYEcn0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1787579948; 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=gTARxaLBaPb7gs/mXKfjRpSVoRZKvtD+yTptQK3p4gI=; b=aK28une0MWYN8+Aa7tUDbNf+RkXFT7btHRXa+F/NCUDPaZOvuDLC0heMhwfnazbLWWMNXw NNR6WoAXMdMRqtCQ== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1787579944; 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=gTARxaLBaPb7gs/mXKfjRpSVoRZKvtD+yTptQK3p4gI=; b=0RO/VzVbNu7NofzcnUumO22BgitWUINMnffzGtco4c1/YOHmKdSNhnNzidflZ3I8yvKkNZ DXluznyPFbpnilZW8K99BbyTAXhTDTHTvc9LKGfJvT69uvwonM/QROIIsPvD+wguuOYlk5 1jBd8B+mE10ixmfDLgqBkMSw+qGzVSU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1787579944; 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=gTARxaLBaPb7gs/mXKfjRpSVoRZKvtD+yTptQK3p4gI=; b=H/P4SAmFN5VWvOB7zkARohJgm/dLnyON40ZtPul9EJ+ik+WyCFqdjP8NBVGFRnp2sAU+YH fbSm2OUWjh/eycCQ== 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 BD4941340C for ; Mon, 24 Aug 2026 13:58:56 +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 0OgFLSBOjGo+eQAAD6G6ig (envelope-from ) for ; Mon, 24 Aug 2026 13:58:56 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 09/11] [gdb/testsuite] Refactor exception handling in lock_file_acquire/release Date: Mon, 24 Aug 2026 15:58:53 +0200 Message-ID: <20260824135855.1195963-10-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260824135855.1195963-1-tdevries@suse.de> References: <20260824135855.1195963-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.de:mid]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_TLS_ALL(0.00)[] 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~public-inbox=simark.ca@sourceware.org Use try/on-error to simplify lock_file_acquire/release. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=34552 --- gdb/testsuite/lib/gdb-utils.exp | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/gdb/testsuite/lib/gdb-utils.exp b/gdb/testsuite/lib/gdb-utils.exp index 1f04a626cbc..35329f3c46e 100644 --- a/gdb/testsuite/lib/gdb-utils.exp +++ b/gdb/testsuite/lib/gdb-utils.exp @@ -184,7 +184,9 @@ proc version_compare { l1 op l2 } { proc lock_file_acquire {lockfile} { verbose -log "acquiring lock file: $::subdir/${::gdb_test_file_name}.exp" while {true} { - if {![catch {open $lockfile {WRONLY CREAT EXCL}} rc]} { + try { + open $lockfile {WRONLY CREAT EXCL} + } on ok {rc} { set msg "locked by $::subdir/${::gdb_test_file_name}.exp" verbose -log "lock file: $msg" # For debugging, put info in the lockfile about who owns @@ -192,6 +194,8 @@ proc lock_file_acquire {lockfile} { puts $rc $msg flush $rc return [list $rc $lockfile] + } on error {} { + # Ignore and try again. } after 10 } @@ -202,18 +206,20 @@ proc lock_file_acquire {lockfile} { proc lock_file_release {info} { verbose -log "releasing lock file: $::subdir/${::gdb_test_file_name}.exp" - if {![catch {fconfigure [lindex $info 0]}]} { - if {![catch { - close [lindex $info 0] - file delete -force [lindex $info 1] - } rc]} { - return "" - } else { - return -code error "Error releasing lockfile: '$rc'" - } - } else { + try { + fconfigure [lindex $info 0] + } on error {} { error "invalid lock" } + + try { + close [lindex $info 0] + file delete -force [lindex $info 1] + } on error {rc} { + error "Error releasing lockfile: '$rc'" + } + + return "" } # Return directory where we keep lock files. -- 2.51.0