From patchwork Fri Mar 15 14:29:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 87247 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 7BDDF385770F for ; Fri, 15 Mar 2024 14:30:14 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd32.google.com (mail-io1-xd32.google.com [IPv6:2607:f8b0:4864:20::d32]) by sourceware.org (Postfix) with ESMTPS id 0A06A3858403 for ; Fri, 15 Mar 2024 14:29:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0A06A3858403 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0A06A3858403 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d32 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710512989; cv=none; b=b3qStEOmfGOt2UsmSrLIn1Lz8BpQzbcuu6ThieQB9NVAxfSngNrK+zgolR1/t72GlbHJ+K/3kAE6Bw+hc3lJRq1PRpJUKViTM82TLKsNQuFzt6Qb8ygvk6x1HC0XglEQTN+LoqfJ8yn0lgYvsVmaB9l97Y4mEEai4TNmGHhoBkc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710512989; c=relaxed/simple; bh=oWFQyAXrudx2a0rmhmWQ0KBDE9xkcNJVAEYHzioLC3g=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=oc5arf2RruAQYDbYcH0bZfRy9cRMPNgA6JlqTX+cPPgMGn5BvrBYS4vSe6aFD7AWXDNMt8hZGhzY/+exwkYQOhQgS1fFr1q/yvq68DJy6zF3U4TvnqVYdr7TxC6i1X4qL3W6VNIM5CfdXXTppZE348DhF3LE4BHOns5G5tsnhPU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd32.google.com with SMTP id ca18e2360f4ac-7c7f3f66d17so39048439f.0 for ; Fri, 15 Mar 2024 07:29:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1710512986; x=1711117786; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=/pqEfLdegekaoaBixgOQ6YaSTWP67J9o7hXUKTyX658=; b=LsPAXSIT0ZCID+slQ5nUmDq7uIsFhdo/ClN8zYz/dDhfFiQZloYN0TrgiijdfWFWwb xIzTO9Bb9kTLGc5g32s2Xy09f56QBKWeoZGDIxz+9cYNOZAzT91UnP/ABtCvLyAR+Jhj ARXVKfOOnfiaErNMOrzXFSjZROI6S0xpwzI2fSUuCKS30hiRG79KbPeTUqEKzo0J2Jd/ jbmFnULlkkDl//sHQg+JKirTCCizypIAH8qBqbGeDLAy+DigiqnzwHVPJWBBuhmlRjU0 6PjSei7fOXDAOACY2DfRPCEe0asxHIyQEsKWF1mdd6LQeiTFyK+mIfkRF8rJ4w3eM69i HGSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710512986; x=1711117786; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=/pqEfLdegekaoaBixgOQ6YaSTWP67J9o7hXUKTyX658=; b=pJ5wHY26YJrrplfpLfVrbBkq/zcIUjbqJqtxScdXYRKSlXDiwBDOb7vX5FRgaLbpF1 Nt+gekauTVDB0fO9ypzgFUbKrWH6n0JsgmomkEE36pyQZKJBstr6V7n2TNJfixGeTDnM XSjO8qH70U2MToWPKXvu1FM86rdlmbRP0HG7kP7UUZaMDMxTTWl0RyMSNU2Up8cUp/pn DeJWtd92DYrvunmcruQYM2d+Bv+Q3iEHb4ZqY/oZIGtMTbxWTIIdZ3/bxurIWa/zervz 5G2hJUbGviINXhcsSkLqZjw2E6O5jULNHA28sckpfs+CW69+DX/ywTkTtQHFkvoIBJrt bUHQ== X-Gm-Message-State: AOJu0YwWfMbGCAin3za2HrX7Pst1VnOnYnpdgVj6xXoswbbly4uDebAH bD/163Cm4UEDtilCot4QwFk9KTQLVHD1YEvX+LCXxf79BZUrbdFc3YdSlZRnKpf5R8xV9FNuhio = X-Google-Smtp-Source: AGHT+IHjdXNyifGvkMmD0NMw+25j/i5231yKDy880Ps+oDWyfkWWEofbt7opTmn5Lp6/UjGyMK0hpQ== X-Received: by 2002:a5e:9914:0:b0:7c8:dc59:d541 with SMTP id t20-20020a5e9914000000b007c8dc59d541mr5706696ioj.0.1710512986147; Fri, 15 Mar 2024 07:29:46 -0700 (PDT) Received: from localhost.localdomain (97-122-82-115.hlrn.qwest.net. [97.122.82.115]) by smtp.gmail.com with ESMTPSA id u2-20020a5d83c2000000b007c8b969aa96sm885765ior.28.2024.03.15.07.29.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Mar 2024 07:29:45 -0700 (PDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v2] Clear board_info entry after waiting for process Date: Fri, 15 Mar 2024 08:29:35 -0600 Message-ID: <20240315142935.2040471-1-tromey@adacore.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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 certain DAP tests are run in a certain order, dejagnu will throw an exception during shutdown. After adding many logging statements, I tracked this down to kill_wait_spawned_process not clearing the 'fileid' board_info entry, causing dejagnu to try to wait for the process a second time -- and fail. Tom de Vries then pointed out a second instance of this, which I tracked down to the same problem occurring when spawning gdbserver. This version of the patch fixes this by adding a new proc that can be used to clean up board_info after waiting for a process to exit. I'm not sure why this problem hasn't affected the test suite in the past. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31435 --- gdb/testsuite/lib/gdb.exp | 15 +++++++++++++++ gdb/testsuite/lib/gdbserver-support.exp | 1 + 2 files changed, 16 insertions(+) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index fe4ac7d2719..4d27b60ef49 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -3310,6 +3310,20 @@ proc with_spawn_id { spawn_id body } { } } +# DejaGNU records spawn ids in a global array and tries to wait for +# them when exiting. Sometimes this caused problems if gdb's test +# suite has already waited for the particular spawn id. And, dejagnu +# only seems to allow a single spawn id per "machine". This proc can +# be used to clean up after a spawn id has been closed. +proc clean_up_spawn_id {host id} { + global board_info + set name [board_info $host name] + if {[info exists board_info($name,fileid)] + && $board_info($name,fileid) == $id} { + unset -nocomplain board_info($name,fileid) + } +} + # Select the largest timeout from all the timeouts: # - the local "timeout" variable of the scope two levels above, # - the global "timeout" variable, @@ -6194,6 +6208,7 @@ proc kill_wait_spawned_process { proc_spawn_id } { # wait for the PID in the background. That's fine because we # don't care about the exit status. */ wait -nowait -i $proc_spawn_id + clean_up_spawn_id target $proc_spawn_id } # Returns the process id corresponding to the given spawn id. diff --git a/gdb/testsuite/lib/gdbserver-support.exp b/gdb/testsuite/lib/gdbserver-support.exp index 8bcf4fbbb01..e8ab057647d 100644 --- a/gdb/testsuite/lib/gdbserver-support.exp +++ b/gdb/testsuite/lib/gdbserver-support.exp @@ -433,6 +433,7 @@ proc close_gdbserver {} { # -nowait makes expect tell Tcl to wait for the process in the # background. catch "wait -nowait -i $server_spawn_id" + clean_up_spawn_id target $server_spawn_id unset server_spawn_id }