From patchwork Mon Apr 15 15:56:21 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: 88501 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 1E15D3858CDA for ; Mon, 15 Apr 2024 15:56:56 +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 D76673849AF5 for ; Mon, 15 Apr 2024 15:56:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D76673849AF5 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 D76673849AF5 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=1713196578; cv=none; b=ixuTEFH2Qbbimcw3H7YWgoxPpznqinZMNmVHS3l45HC84ttshWqR+RScRoAo/dm3ff2Rc08zODn2+t6f6f32PTRuX4UJ/+5LpkzzNHS7AKnVyLEhfqTnI+wIaITccVTTp0mE7+/zjX7cbNyctf7TtnRBoeaH/tqy2onqBzJUmLI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713196578; c=relaxed/simple; bh=CgivRwauee3IW0afWdASLxxRL8uwwi+gyOliGdc1Lew=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=QKLg4wEHTwLXflgobbex20OI02nWnH0m5Du1pndItS9D7SeAuyzsZ60hYlYrI6y8BBzuQCA8Z6EvACD62x9wv3oLYg4xIUWOVBKqc3izQwBfmZZLaAs8f6ePj+W7pJP71hOD+jWuA4zngyIljJA5yQ5hqe2VhxtkrKHUB/80wD8= 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 5DEAF5D2C4 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; bh=OTjTtc5WVIP76/JtfeifPONDTuhKaM+FUyS+y3+uNVU=; b=utkYooskc7hEYLZMZV936raF3AVAGbE4JreXwIBm7amFWLc+PozT8OuXvcaeu1+FuWAtVQ CM0T1LA+j05XohZAYtDBm7eXB6lWERjm2GyhygTdORQ98UeGrCDhYBnVA9CH7WbxBsZFkE VVJI4a6tgtEUJJk3+XQW4v0Db6n2JXw= 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; bh=OTjTtc5WVIP76/JtfeifPONDTuhKaM+FUyS+y3+uNVU=; b=eDl0Qj4/rXowBp4GNLSPbqDnb1Pmne9JLoF3uUJreZ5r8PHH5L74zBcp3aXrdAIKZ3p591 U24t+yDYLeTrL2AA== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=utkYoosk; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="eDl0Qj4/" 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; bh=OTjTtc5WVIP76/JtfeifPONDTuhKaM+FUyS+y3+uNVU=; b=utkYooskc7hEYLZMZV936raF3AVAGbE4JreXwIBm7amFWLc+PozT8OuXvcaeu1+FuWAtVQ CM0T1LA+j05XohZAYtDBm7eXB6lWERjm2GyhygTdORQ98UeGrCDhYBnVA9CH7WbxBsZFkE VVJI4a6tgtEUJJk3+XQW4v0Db6n2JXw= 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; bh=OTjTtc5WVIP76/JtfeifPONDTuhKaM+FUyS+y3+uNVU=; b=eDl0Qj4/rXowBp4GNLSPbqDnb1Pmne9JLoF3uUJreZ5r8PHH5L74zBcp3aXrdAIKZ3p591 U24t+yDYLeTrL2AA== 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 47A311386E 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 uV8qEB5OHWaVRgAAD6G6ig (envelope-from ) for ; Mon, 15 Apr 2024 15:56:14 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 1/7] [gdb/testsuite] Factor out proc get_portnum Date: Mon, 15 Apr 2024 17:56:21 +0200 Message-Id: <20240415155627.22108-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Spam-Score: -4.01 X-Rspamd-Action: no action X-Rspamd-Queue-Id: 5DEAF5D2C4 X-Spam-Level: X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-4.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; 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-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 gdbserver_start, we have some code that determines what port number to use: ... # Port id -- either specified in baseboard file, or managed here. if [target_info exists gdb,socketport] { set portnum [target_info gdb,socketport] } else { # Bump the port number to avoid conflicts with hung ports. incr portnum } ... Factor this out into a new proc get_portnum. Tested on aarch64-linux. --- gdb/testsuite/lib/gdbserver-support.exp | 40 ++++++++++++++++++------- 1 file changed, 29 insertions(+), 11 deletions(-) base-commit: 9dd918142787246ea7ed53494d9cbc6b51486133 diff --git a/gdb/testsuite/lib/gdbserver-support.exp b/gdb/testsuite/lib/gdbserver-support.exp index 727a66e2ab1..bf000119db6 100644 --- a/gdb/testsuite/lib/gdbserver-support.exp +++ b/gdb/testsuite/lib/gdbserver-support.exp @@ -129,8 +129,31 @@ proc gdb_target_cmd { args } { return [expr $res == 0 ? 0 : 1] } -global portnum -set portnum "2345" +# Return a usable port number. + +proc get_portnum {} { + if { [target_info exists gdb,socketport] } { + # Hard-coded in target board. + return [target_info gdb,socketport] + } + + # Not hard-coded in target board. Return increasing port numbers, + # starting at $initial_portnum, to avoid conflicts with hung ports. + set initial_portnum 2345 + + # Currently available port number. + global portnum + + # Initialize, if necessary. + if { ![info exists portnum] } { + set portnum $initial_portnum + } + + # Return currently available port number, and update it. + set res $portnum + incr portnum + return $res +} # Locate the gdbserver binary. Returns "" if gdbserver could not be found. @@ -247,16 +270,10 @@ proc gdbserver_default_get_comm_port { port } { # Returns the target protocol and socket to connect to. proc gdbserver_start { options arguments } { - global portnum global GDB_TEST_SOCKETHOST # Port id -- either specified in baseboard file, or managed here. - if [target_info exists gdb,socketport] { - set portnum [target_info gdb,socketport] - } else { - # Bump the port number to avoid conflicts with hung ports. - incr portnum - } + set portnum [get_portnum] # Extract the local and remote host ids from the target board struct. if { [info exists GDB_TEST_SOCKETHOST] } { @@ -372,10 +389,11 @@ proc gdbserver_start { options arguments } { -re "Listening on" { } -re "Can't (bind address|listen on socket): Address already in use\\.\r\n" { verbose -log "Port $portnum is already in use." - if ![target_info exists gdb,socketport] { + set other_portnum [get_portnum] + if { $other_portnum != $portnum } { # Bump the port number to avoid the conflict. wait -i $expect_out(spawn_id) - incr portnum + set portnum $other_portnum continue } } From patchwork Mon Apr 15 15:56:22 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: 88505 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 9A4193858427 for ; Mon, 15 Apr 2024 15:58:16 +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 84AD9385F014 for ; Mon, 15 Apr 2024 15:56:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 84AD9385F014 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 84AD9385F014 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=f3/Q5GTFRPcua+Kj6ZnzDEBSqT6iglqd8czRUzVuxyyADuYr0G6ydKb+GGgbZHyw9DtDhtbzkbXBs6fQSvFLSOd2jElC6rESKenTAfXmYRwpNkMd+StJhT+LDXEV1pn/49TIt/SMtIr4XAy33X7xQ3XzMqWhUXyfKIbnui9mkKM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713196577; c=relaxed/simple; bh=J1AY6Z1gdGIbeNuf8r1BXPEQyqDpPFb1HOvgRQNOkfg=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=q2o+UViS7c60m8rUZJ5EbhrhcTcoarG3nr2toZPfXtBfCmkXdWaeRBDrcMtxd2C5msA+2dB6CdtsBYUv7fqlAki8ompfkPFVFsqTZkwCGlJcb51ICxy7kW9OfwOLWzRfQNwQ3Pu4Wv781/LqCk0yrTGAnQuaGikJLPl1e+FA8bc= 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 890625D2C5 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=6P57/O+LpsE9Bh1qr96rEUK52ah3bUDROrG2nl9d83Q=; b=MMkFMhvYj30Of+Bg3+3QGjd439iB5hpBLj/f3aySZp8aMHLgq1o/tKwRKwnBNQhMZcsNBQ cAkln93YL5SjcIdhmlWSSaG6EgbLHIdN8fsnf7POageYGXCtYgNUl0L5GtqNJBnE7VtU0C QupIPfe4ZkOUIARpI9JNA2KBk75seKE= 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=6P57/O+LpsE9Bh1qr96rEUK52ah3bUDROrG2nl9d83Q=; b=isAZkOZ0l5UOkYcUDtGlq1rCVTIsZ7rZb7bTx7ZESgzfAZhc7Q/58PZU0N6aiC9AGIYw63 bO0VBsz6lA0B0ADw== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=MMkFMhvY; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=isAZkOZ0 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=6P57/O+LpsE9Bh1qr96rEUK52ah3bUDROrG2nl9d83Q=; b=MMkFMhvYj30Of+Bg3+3QGjd439iB5hpBLj/f3aySZp8aMHLgq1o/tKwRKwnBNQhMZcsNBQ cAkln93YL5SjcIdhmlWSSaG6EgbLHIdN8fsnf7POageYGXCtYgNUl0L5GtqNJBnE7VtU0C QupIPfe4ZkOUIARpI9JNA2KBk75seKE= 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=6P57/O+LpsE9Bh1qr96rEUK52ah3bUDROrG2nl9d83Q=; b=isAZkOZ0l5UOkYcUDtGlq1rCVTIsZ7rZb7bTx7ZESgzfAZhc7Q/58PZU0N6aiC9AGIYw63 bO0VBsz6lA0B0ADw== 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 64A4E13957 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 aIVQFx5OHWaVRgAAD6G6ig (envelope-from ) for ; Mon, 15 Apr 2024 15:56:14 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 2/7] [gdb/testsuite] Make portnum a persistent global Date: Mon, 15 Apr 2024 17:56:22 +0200 Message-Id: <20240415155627.22108-2-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.99 / 50.00]; BAYES_HAM(-2.98)[99.91%]; 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: 890625D2C5 X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Score: -3.99 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 When instrumenting get_portnum using: ... puts "PORTNUM: $res" ... and running: ... $ cd build/gdb $ make check TESTS=gdb.server/*.exp ... we get: ... Running gdb.server/target-exec-file.exp ... PORTNUM: 2345 Running gdb.server/stop-reply-no-thread-multi.exp ... PORTNUM: 2345 PORTNUM: 2346 PORTNUM: 2347 PORTNUM: 2348 PORTNUM: 2349 PORTNUM: 2350 ... So, while get_portnum does return increasing numbers in a single test-case, it restarts at each test-case. This is a regression since the introduction of persistent globals. Fix this by using "gdb_persistent_global portnum", such that we get: ... Running gdb.server/target-exec-file.exp ... PORTNUM: 2345 Running gdb.server/stop-reply-no-thread-multi.exp ... PORTNUM: 2346 PORTNUM: 2347 PORTNUM: 2348 PORTNUM: 2349 PORTNUM: 2350 PORTNUM: 2351 ... Tested on aarch64-linux. --- gdb/testsuite/lib/gdbserver-support.exp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/testsuite/lib/gdbserver-support.exp b/gdb/testsuite/lib/gdbserver-support.exp index bf000119db6..0f97ce9c0fd 100644 --- a/gdb/testsuite/lib/gdbserver-support.exp +++ b/gdb/testsuite/lib/gdbserver-support.exp @@ -142,7 +142,7 @@ proc get_portnum {} { set initial_portnum 2345 # Currently available port number. - global portnum + gdb_persistent_global portnum # Initialize, if necessary. if { ![info exists portnum] } { From patchwork Mon Apr 15 15:56:23 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: 88502 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 8E4DC3858C78 for ; Mon, 15 Apr 2024 15:57:04 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org 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 D3EE33849AF3 for ; Mon, 15 Apr 2024 15:56:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D3EE33849AF3 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 D3EE33849AF3 Authentication-Results: server2.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=1713196578; cv=none; b=IPHAWywQyPs8UqHNGx/u1f9Pw49T6BHfa90ff0sJ1d1fMDFDagbvSC/63+DgZ9uX2g54tGsFLZN513Y0xXwqP5BieyU34IJsv+PL7ZL8V1aFzuGPVaaSWVwhMfBWvfLnaNSjr/lc2pdjAPGp7KF5m+vnrsWNOFUH9EN55nX3HIE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713196578; c=relaxed/simple; bh=xaR3YcmEuwU1rZO7/4NG2mK8nJZqY67Ei9Xb1vtKsNA=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=ueynmtZbicfdFiUw8AP+iicT8W1nr2uxGki0DsxeWRUkE8twlzOx86afUP1QNKUfwYakPm7MOtoKMKrYj+k522xXbxdEF4xYn3Oo3ndmY2ECEGg9t0AO47zyzyRZWnNirYXA3SlRyZ7zFiedfz4WdRvqpy+XyiAnMBB9gRlZ/KI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [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 96C08372E6 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=s6RibtNVytSctH0ld00WZMr430imwdQEQleSjpA/UNc=; b=blEvK7H238Cbis1xn9n80VH/EALi4XsLGjBWNLQcDWK53+OQUrRQRB9B+1njkqFyenJ9yk emhu2yw9AGlK0faWC+bHO1fF+C0LGCnceLTFFuVxKPwkydRcCCEIW3a8RzIX6BMdgUOLsm adJBZ5pxnBE0qCzMcHrExDxW7cXDVDM= 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=s6RibtNVytSctH0ld00WZMr430imwdQEQleSjpA/UNc=; b=00tddPbEw9saWmNplzR15rBcXN+a38mavvaYnBrQEu1ClBQAopKiCbV+kXwLsZGLGpG/Kh W8uT+kDZoGYqm6BQ== Authentication-Results: smtp-out1.suse.de; none 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=s6RibtNVytSctH0ld00WZMr430imwdQEQleSjpA/UNc=; b=blEvK7H238Cbis1xn9n80VH/EALi4XsLGjBWNLQcDWK53+OQUrRQRB9B+1njkqFyenJ9yk emhu2yw9AGlK0faWC+bHO1fF+C0LGCnceLTFFuVxKPwkydRcCCEIW3a8RzIX6BMdgUOLsm adJBZ5pxnBE0qCzMcHrExDxW7cXDVDM= 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=s6RibtNVytSctH0ld00WZMr430imwdQEQleSjpA/UNc=; b=00tddPbEw9saWmNplzR15rBcXN+a38mavvaYnBrQEu1ClBQAopKiCbV+kXwLsZGLGpG/Kh W8uT+kDZoGYqm6BQ== 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 807E81395B 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 UMUcHh5OHWaVRgAAD6G6ig (envelope-from ) for ; Mon, 15 Apr 2024 15:56:14 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 3/7] [gdb/testsuite] Factor out proc with_lock Date: Mon, 15 Apr 2024 17:56:23 +0200 Message-Id: <20240415155627.22108-3-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-Score: -2.80 X-Spam-Level: X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; 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]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_TLS_ALL(0.00)[] 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 Factor out proc with_lock from with_rocm_gpu_lock, and move required procs lock_file_acquire and lock_file_release to lib/gdb-utils.exp. Tested on aarch64-linux. --- gdb/testsuite/lib/gdb-utils.exp | 59 +++++++++++++++++++++++++++++++++ gdb/testsuite/lib/rocm.exp | 55 +----------------------------- 2 files changed, 60 insertions(+), 54 deletions(-) diff --git a/gdb/testsuite/lib/gdb-utils.exp b/gdb/testsuite/lib/gdb-utils.exp index 34752081b60..4205f8d1a22 100644 --- a/gdb/testsuite/lib/gdb-utils.exp +++ b/gdb/testsuite/lib/gdb-utils.exp @@ -138,3 +138,62 @@ proc version_compare { l1 op l2 } { } return 1 } + +# Acquire lock file LOCKFILE. Tries forever until the lock file is +# successfully created. + +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]} { + 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 + # it. + puts $rc $msg + flush $rc + return [list $rc $lockfile] + } + after 10 + } +} + +# Release a lock file. + +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 { + error "invalid lock" + } +} + +# Run body under lock LOCK_FILE. + +proc with_lock { lock_file body } { + if {[info exists ::GDB_PARALLEL]} { + set lock_rc [lock_file_acquire $lock_file] + } + + set code [catch {uplevel 1 $body} result] + + if {[info exists ::GDB_PARALLEL]} { + lock_file_release $lock_rc + } + + if {$code == 1} { + global errorInfo errorCode + return -code $code -errorinfo $errorInfo -errorcode $errorCode $result + } else { + return -code $code $result + } +} diff --git a/gdb/testsuite/lib/rocm.exp b/gdb/testsuite/lib/rocm.exp index ab21db6685c..7dd7ef3f3b5 100644 --- a/gdb/testsuite/lib/rocm.exp +++ b/gdb/testsuite/lib/rocm.exp @@ -108,68 +108,15 @@ gdb_caching_proc allow_hipcc_tests {} { # at a time. set gpu_lock_filename $objdir/gpu-parallel.lock -# Acquire lock file LOCKFILE. Tries forever until the lock file is -# successfully created. - -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]} { - 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 - # it. - puts $rc $msg - flush $rc - return [list $rc $lockfile] - } - after 10 - } -} - -# Release a lock file. - -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 { - error "invalid lock" - } -} - # Run body under the GPU lock. Also calls gdb_exit before releasing # the GPU lock. proc with_rocm_gpu_lock { body } { - if {[info exists ::GDB_PARALLEL]} { - set lock_rc [lock_file_acquire $::gpu_lock_filename] - } - - set code [catch {uplevel 1 $body} result] + with_lock $::gpu_lock_filename $body # In case BODY returned early due to some testcase failing, and # left GDB running, debugging the GPU. gdb_exit - - if {[info exists ::GDB_PARALLEL]} { - lock_file_release $lock_rc - } - - if {$code == 1} { - global errorInfo errorCode - return -code $code -errorinfo $errorInfo -errorcode $errorCode $result - } else { - return -code $code $result - } } # Return true if all the devices support debugging multiple processes 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. From patchwork Mon Apr 15 15:56:25 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: 88503 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 CA713384646C for ; Mon, 15 Apr 2024 15:57:35 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id 081693858426 for ; Mon, 15 Apr 2024 15:56:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 081693858426 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 081693858426 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713196578; cv=none; b=vY6RMI2FklTZSvciZKnbjbr/aQ4FAhR98vbmjBCfP/5wwGsckWpEBV9R2XR9wk+ipaCGKPg7a5+MrYTkzvQzmVYBb2CCntxqLi9jU+Tulkwvw2C40+CU5d6ZJK6yvBkMmcVolp3UlPqfHpHA9GUHMJ8dFLLcQBm5cIBEnOZGm3I= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713196578; c=relaxed/simple; bh=Q4leltYKt7zUraippRAsgg3uYvL1BWrIW/0QlTNI6gA=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=XpAUfzKHML5WnA9AgxcrX75rDwS2BJ3qDim9xaV058wT42BWj0ydZmMRHIqLZMepkv9s4vqmr0FcmHyWa02eV9SgLOxy09E0eOPw0S4bqlz1lpzfivyX+PUPKORtEtgazgfDywA2Nu4lv9+PiNuvidgVpe7DC1+8+Ym0vl1H5rI= 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-out1.suse.de (Postfix) with ESMTPS id CBB7E372E7 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=UhRowhe4jsIESZnTNVERpxrwMsuCkce6AoSkLqT2DBo=; b=k+vEc3PyHGLqhADZXV+WMD+8J1IhlE6yTMxYllgyf3lKNA4Es7Ehxo8xJO6kuItZlSYIHQ oKbDVrgV+oeNsa1r1FgvJCW9VICVZ1Uyo74VbAKlCdukC/Us4j86pLClu93LRxyvXGBb0j wlZCFqhuDng2lx/T0jdg3SpRhC/aj0E= 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=UhRowhe4jsIESZnTNVERpxrwMsuCkce6AoSkLqT2DBo=; b=6m6bS7jm/UKQneUhue0KJbONkRkRaD8GDYMJQmZKLFfXzBNBdpbgV+pYK1e53LJrjqpJs6 p/CxttziV6r1i7Dw== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=k+vEc3Py; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=6m6bS7jm 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=UhRowhe4jsIESZnTNVERpxrwMsuCkce6AoSkLqT2DBo=; b=k+vEc3PyHGLqhADZXV+WMD+8J1IhlE6yTMxYllgyf3lKNA4Es7Ehxo8xJO6kuItZlSYIHQ oKbDVrgV+oeNsa1r1FgvJCW9VICVZ1Uyo74VbAKlCdukC/Us4j86pLClu93LRxyvXGBb0j wlZCFqhuDng2lx/T0jdg3SpRhC/aj0E= 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=UhRowhe4jsIESZnTNVERpxrwMsuCkce6AoSkLqT2DBo=; b=6m6bS7jm/UKQneUhue0KJbONkRkRaD8GDYMJQmZKLFfXzBNBdpbgV+pYK1e53LJrjqpJs6 p/CxttziV6r1i7Dw== 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 B6B1F13957 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 qM1jKx5OHWaVRgAAD6G6ig (envelope-from ) for ; Mon, 15 Apr 2024 15:56:14 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 5/7] [gdb/testsuite] Move gpu-parallel.lock to cache dir Date: Mon, 15 Apr 2024 17:56:25 +0200 Message-Id: <20240415155627.22108-5-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-Score: -3.17 X-Rspamd-Action: no action X-Rspamd-Queue-Id: CBB7E372E7 X-Spam-Level: X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-3.17 / 50.00]; BAYES_HAM(-2.16)[95.97%]; 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)[imap1.dmz-prg2.suse.org:helo, imap1.dmz-prg2.suse.org:rdns, suse.de:dkim] 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 The lock directory returned by lock_dir is currently $objdir. It seems possible to leave a stale lock file that blocks progress in a following run. Fix this by using a directory that is guaranteed to be initially empty when using GDB_PARALLEL, like temp or cache. In gdb/testsuite/README I found: ... cache in particular is used to share data across invocations of runtest ... which seems appropriate, so let's use cache for this. Tested on aarch64-linux. --- gdb/testsuite/lib/gdb-utils.exp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/testsuite/lib/gdb-utils.exp b/gdb/testsuite/lib/gdb-utils.exp index c0b96d3c2bf..1f30d807ff0 100644 --- a/gdb/testsuite/lib/gdb-utils.exp +++ b/gdb/testsuite/lib/gdb-utils.exp @@ -180,7 +180,7 @@ proc lock_file_release {info} { # Return directory where we keep lock files. proc lock_dir {} { - return $objdir + return [make_gdb_parallel_path cache] } # Run body under lock LOCK_FILE. From patchwork Mon Apr 15 15:56:26 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: 88506 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 16EED3849AFC for ; Mon, 15 Apr 2024 15:58:47 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id 09C2A3858282 for ; Mon, 15 Apr 2024 15:56:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 09C2A3858282 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 09C2A3858282 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713196578; cv=none; b=B/Tf2mZZ+krD6RdnFxvz+YguzyZwIZl3dg9dXuGND8pqiOb1Ole0Bhcng3a2ygLHo8qWP83EMO1e472+TL2oqGVh31y3rI4WlcNS5HUBcTdp+sSSN8Xn0Zw/mKizN2ErWjD7Y9XV8xyB1pZgfL59cRx/c1SM9xgqrynFUY65G4Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713196578; c=relaxed/simple; bh=GU5HWyqS2LbFeu1txd8VArYWqZUGaLZq/k7fqK1X8KE=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=SC/9DVr7vq+EN0K4elCbo0NqMK+R+ZdR1ydRE8Z5zpLEub51gMBHYo12h7TJIXMC+//Yi/O6FxR5G/bGtLg5JOmVlrfEBl19bHTh9BXFXyeT7eKMYniTWfNhYR7IZWjrue2EwnxdcZm4tARQQ2Kt9xJxDHqaB7zeuC1Euq6gyis= 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-out1.suse.de (Postfix) with ESMTPS id E8DFD372E8 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=1713196575; 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=Y3wu2zwBD/fbralhFzY60lAcV97nvZNsbWt4JTxnUDU=; b=YQOSUChMcXJNXd7H5n7k2PrU/Q/emP8QBeNxl7o1LnYFlnFpua4pRyZpea99ulzhSMlJgZ T6BxIKz/6gzZ+OubxD1L5PbBYonRc2RHO+VYaP1G910K/LnM+5NfVhlQJbKcAXpNBuw8cM hkjbw3xrv5EpoZXulFifbjYLEHhnBrw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1713196575; 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=Y3wu2zwBD/fbralhFzY60lAcV97nvZNsbWt4JTxnUDU=; b=Fh900LZO8wMo/n3gP4e74OERP9Qk06jEecfishu5k4GPZFFx7/Zt0HRJb50NV3rpkm+4ul D90w7KcMoOS5rjBA== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=mpGoe7mz; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=lZ50e1Fx 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=Y3wu2zwBD/fbralhFzY60lAcV97nvZNsbWt4JTxnUDU=; b=mpGoe7mzvOxqJy6Cuvgg5nGU9hSLftVfZpAYCyDhYShOyP+XDJHKKpA/Evw4RQ0nU8WDYE Um36QabIgANropZEejj370Uh9wfDNA1hq0rV4It0/usB3gBueO79q0ZjewO6nkI5MBVUDX CkaHEfjPF70MWjt/bTvu3Kw2Z1OCuQo= 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=Y3wu2zwBD/fbralhFzY60lAcV97nvZNsbWt4JTxnUDU=; b=lZ50e1Fxuo9Jg4iwChNv1UDAflxv00bbuojQ1e+4u3KaCU6fcm2OEvYi8nGQi+S09VaYNK WBNsgt1PclB7tsCg== 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 D232C1386E 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 yAsTMh5OHWaVRgAAD6G6ig (envelope-from ) for ; Mon, 15 Apr 2024 15:56:14 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 6/7] [gdb/testsuite] Use unique portnum in parallel testing Date: Mon, 15 Apr 2024 17:56:26 +0200 Message-Id: <20240415155627.22108-6-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 [-4.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; 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: E8DFD372E8 X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Score: -4.01 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 When instrumenting get_portnum using: ... puts "PORTNUM: $res" ... and running: ... $ cd build/gdb $ make check-parallel -j2 TESTS=gdb.server/*.exp ... we run into: ... Running gdb.server/abspath.exp ... PORTNUM: 2345 ... and: ... Running gdb.server/bkpt-other-inferior.exp ... PORTNUM: 2345 ... This is because the test-cases are run in independent runtest invocations. Fix this by handling the parallel case in get_portnum using: - a file $objdir/cache/portnum to keep the portnum variable, and - a file $objdir/cache/portnum.lock to serialize access to it. Tested on aarch64-linux. --- gdb/testsuite/lib/gdbserver-support.exp | 47 ++++++++++++++++++++----- 1 file changed, 38 insertions(+), 9 deletions(-) diff --git a/gdb/testsuite/lib/gdbserver-support.exp b/gdb/testsuite/lib/gdbserver-support.exp index 0f97ce9c0fd..41ad5e6cbfb 100644 --- a/gdb/testsuite/lib/gdbserver-support.exp +++ b/gdb/testsuite/lib/gdbserver-support.exp @@ -141,18 +141,47 @@ proc get_portnum {} { # starting at $initial_portnum, to avoid conflicts with hung ports. set initial_portnum 2345 - # Currently available port number. - gdb_persistent_global portnum + if { ![info exists ::GDB_PARALLEL] } { + # Sequential case. - # Initialize, if necessary. - if { ![info exists portnum] } { - set portnum $initial_portnum + # Currently available port number. + gdb_persistent_global portnum + + # Initialize, if necessary. + if { ![info exists portnum] } { + set portnum $initial_portnum + } + + # Return currently available port number, and update it. + set res $portnum + incr portnum + return $res + } + + # Parallel case. + with_lock portnum.lock { + # Keep portnum file alongside the lock that guards it. + set portnum_file [lock_dir]/portnum + + if { [file exists $portnum_file] } { + set fd [open $portnum_file r] + set portnum [read $fd] + close $fd + + set portnum [string trim $portnum] + } else { + # Initialize. + set portnum $initial_portnum + } + + set next_portnum [expr $portnum + 1] + + set fd [open $portnum_file w] + puts $fd $next_portnum + close $fd } - # Return currently available port number, and update it. - set res $portnum - incr portnum - return $res + return $portnum } # Locate the gdbserver binary. Returns "" if gdbserver could not be found. From patchwork Mon Apr 15 15:56:27 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: 88504 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 7676C3858C60 for ; Mon, 15 Apr 2024 15:58:08 +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 [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id 88C523858408 for ; Mon, 15 Apr 2024 15:56:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 88C523858408 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 88C523858408 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713196581; cv=none; b=UjCSXdRYpGYUUCLlQ1cmECM58UmAx7HLbBD88bHT/eOMcK8HuTH9rEBMP3eV+6EYwFM7yN4YD8qlkTZvcHWynKTb1HwHHcQe04ZiuPhzyc7QF2TfrATU51fJrJDEUvkHG2Vc5HY187xO113EC47wuuTJPbr9gBUGO80dS/Povs4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713196581; c=relaxed/simple; bh=uoCrGR9/qdJFFJcYbaYqmfw1+xCTu8p6IEEVO0xug3A=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=VEn4CEnmlQYjM6F2ZFCxLzmi3PsUTbCGSjjesScm0CgUO36zLBr7x8PqYhO0DSBtt+jnvw6Jqpi8k3zYtrDGcZTAojhbvm7/+M2wAJAjif43oFl0DpWwOyWkNndpXvFIZ5r9yUg+siGvHMbPbRg6jOBBP65U3cqPJVPwJlGpm7c= 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 0F8915D2C8 for ; Mon, 15 Apr 2024 15:56:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1713196576; 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=jHJdF6qJNUENq21wP+CpK3BUKD4I/GHZPU93acdvWXA=; b=zw/xVNW88Xx8PCosB681JlJp5RuA6VtVBNgKTiP4jkCNUmcmwMvsle5TxPHPUYUAwgYvM2 m0sRHhTH4IjbiWGfjvgAyb8o3Mm0vCEJA8rYYk+huRQcefFG7W8YuhvtLHpZpZHOR7Qaok ijQDTmbG5JxKcFV8tadXa42EzEbr71I= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1713196576; 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=jHJdF6qJNUENq21wP+CpK3BUKD4I/GHZPU93acdvWXA=; b=AVMGQSlgEpyhyl1NtuG8Q0HSu729E6jWUb5xqW4q82CPVz6Fmby+8H6/WleWlo7X+5VwSz k7RxUOAqx5wAYwAw== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=HAAe3p27; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=cVElV3yf DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1713196575; 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=jHJdF6qJNUENq21wP+CpK3BUKD4I/GHZPU93acdvWXA=; b=HAAe3p27PNA4dLv8Pernw+FO448RfPiis8pq1PlAHBifnBeSIRIj/HiqcSYTNET38mdNj4 nHAj9gAVPGluVVK9WN6hDz8lSKNqIDane3okwEd8/V0gI0+5JznCv2lA649j4bGVWjxGDd czzxuRASBkFk505wJaBhpiIWIs0yNL4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1713196575; 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=jHJdF6qJNUENq21wP+CpK3BUKD4I/GHZPU93acdvWXA=; b=cVElV3yfUxndNyFsryDLMy1bkp7Y/ioUfGSBFG3wg+qfOUyd9HyvVG3ztBFtVp9fqEQkJV bS6jWFIe7dGq/uDw== 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 EED9813957 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 iN4UOR5OHWaVRgAAD6G6ig (envelope-from ) for ; Mon, 15 Apr 2024 15:56:14 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 7/7] [gdb/testsuite] Use unique portnum in parallel testing (check//% case) Date: Mon, 15 Apr 2024 17:56:27 +0200 Message-Id: <20240415155627.22108-7-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 [-4.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; 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, sourceware.org:url, gnu.org:url, imap1.dmz-prg2.suse.org:helo, imap1.dmz-prg2.suse.org:rdns] X-Rspamd-Action: no action X-Rspamd-Queue-Id: 0F8915D2C8 X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Score: -4.01 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, KAM_SHORT, 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 Make target check//% is the gdb variant of a similar gcc make target [1]. When running tests using check//%: ... $ cd build/gdb $ make check//unix/{-fPIE/-pie,-fno-PIE/-no-pie} -j2 TESTS=gdb.server/*.exp ... we get: ... $ cat build/gdb/testsuite.unix.-fPIE.-pie/cache/portnum 2427 $ cat build/gdb/testsuite.unix.-fno-PIE.-no-pie/cache/portnum 2423 ... The problem is that there are two portnum files used in parallel. Fix this by: - creating a common lockdir build/gdb/testsuite.lockdir for make target check//%, - passing this down to the runtests invocations using variable GDB_LOCK_DIR, and - using GDB_LOCK_DIR in lock_dir. Tested on aarch64-linux. PR testsuite/31632 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31632 [1] https://gcc.gnu.org/install/test.html --- gdb/Makefile.in | 8 ++++++-- gdb/testsuite/lib/gdb-utils.exp | 5 +++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 23894ea4a4d..5a63f166107 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -2002,6 +2002,10 @@ check-all-boards: force $(MAKE) $(TARGET_FLAGS_TO_PASS) check-all-boards; \ else true; fi +testsuite.lockdir: force + rm -rf $@ + mkdir -p $@ + # The idea is to parallelize testing of multilibs, for example: # make -j3 check//sh-hms-sim/{-m1,-m2,-m3,-m3e,-m4}/{,-nofpu} # will run 3 concurrent sessions of check, eventually testing all 10 @@ -2010,7 +2014,7 @@ check-all-boards: force # used, this rule will harmlessly fail to match. Used FORCE_PARALLEL to # prevent serialized checking due to the passed RUNTESTFLAGS. # FIXME: use config.status --config not --version, when available. -check//%: force +check//%: force testsuite.lockdir @if [ -f testsuite/config.status ]; then \ rootme=`pwd`; export rootme; \ rootsrc=`cd $(srcdir); pwd`; export rootsrc; \ @@ -2028,7 +2032,7 @@ check//%: force ); \ else :; fi && cd $$testdir && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) \ - RUNTESTFLAGS="--target_board=$$variant $(RUNTESTFLAGS)" \ + RUNTESTFLAGS="GDB_LOCK_DIR=$$rootme/testsuite.lockdir --target_board=$$variant $(RUNTESTFLAGS)" \ FORCE_PARALLEL=$(if $(FORCE_PARALLEL),1,$(if $(RUNTESTFLAGS),,1)) \ "$$target"; \ else true; fi diff --git a/gdb/testsuite/lib/gdb-utils.exp b/gdb/testsuite/lib/gdb-utils.exp index 1f30d807ff0..95c53d030d8 100644 --- a/gdb/testsuite/lib/gdb-utils.exp +++ b/gdb/testsuite/lib/gdb-utils.exp @@ -180,6 +180,11 @@ proc lock_file_release {info} { # Return directory where we keep lock files. proc lock_dir {} { + if { [info exists ::GDB_LOCK_DIR] } { + # When using check//. + return $::GDB_LOCK_DIR + } + return [make_gdb_parallel_path cache] }