From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 585EC3858D35 for ; Thu, 16 Mar 2023 17:37:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 585EC3858D35 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678988242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=66qO+m3Q7wQxeXZo/sK0QQai2mk0YACweOo/j+ZndCw=; b=VLkNd42j96BjlU4aLpIQVd8g3v6KqG9mc0OmaWlMDjp5eA724cbT5QVHwU4vQhdB2dv/Aw YGIheTHjmM8tEm2HJlY2x/8uRlRHtjPKYCVxxL7Jw0hkkS+QmGyEoO71HxO53QhsmSsX0H s4bpraGKUYTXxd+HTITwBHDamawdVNM= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-3-GaVpTPrbNh6WwuuKk77lYw-1; Thu, 16 Mar 2023 13:37:21 -0400 X-MC-Unique: GaVpTPrbNh6WwuuKk77lYw-1 Received: by mail-ed1-f71.google.com with SMTP id h11-20020a0564020e8b00b004e59d4722a3so4063205eda.6 for ; Thu, 16 Mar 2023 10:37:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678988239; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=66qO+m3Q7wQxeXZo/sK0QQai2mk0YACweOo/j+ZndCw=; b=icNnfCtHf2fprJw/Z2kaCHsTUHUn6//I9Mo9Yf9Z1JiBKOFfEvIqwuuZrWpMPndm6R eUkpOylO9tKDF4Ep3fBFhCCf+Kd81UjYQR7Ia/MXvMf6jgqabS/bVdUj8zqRwT2JiwQC ELpobrOGC8AwN/c2bp2t0syfXjo67/TtQtZvG8roBrTlK0C1Kg0eajn/iQSIDHCUNPPp f8J5XneHt8W5GZDUmp7IpzmC39gTzU5x01FWNiEXq7nL3U/0IxqywNg742BouWfi+j0e kW+3RnJlne8Kyae5/etbHcmNIJxy4srgHlYW/1BU2N8s1JxDNHkhaJeR9L68aNKz2r5f 3WAA== X-Gm-Message-State: AO0yUKUziW2kKPvUnk07RJaqzXyQsn2rJ/x7QtUyLTB0BJAp1XL1W1aO 1cSMPZcy2i/xfODEWkidNCxMn9VscuEBOnRE/lg5vjmDoYE7z4pPV392C6Wq5gi3aeRg4EeY3SC bmOgsDP4LZtw0xc9AlP4TjctivD1YgwIANLrbslvchbgGoKwh//GbFkOXWjuGW9QXqRDhMvnFqz WOy/iLpQ== X-Received: by 2002:aa7:c90f:0:b0:4bf:c590:3c57 with SMTP id b15-20020aa7c90f000000b004bfc5903c57mr465493edt.2.1678988239737; Thu, 16 Mar 2023 10:37:19 -0700 (PDT) X-Google-Smtp-Source: AK7set/rdo71dk37CtGobcuNj5Bvf3ANCoCfSQMuHmUXyHq7nwl2NOccxVq+5nM4rIsZ1EoUYBqRsA== X-Received: by 2002:aa7:c90f:0:b0:4bf:c590:3c57 with SMTP id b15-20020aa7c90f000000b004bfc5903c57mr465480edt.2.1678988239464; Thu, 16 Mar 2023 10:37:19 -0700 (PDT) Received: from localhost (95.72.115.87.dyn.plus.net. [87.115.72.95]) by smtp.gmail.com with ESMTPSA id o10-20020a50c28a000000b004fc03360acbsm36018edf.63.2023.03.16.10.37.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 10:37:19 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv5 06/11] Revert "gdb: remove unnecessary parameter wait_ptid from do_target_wait" Date: Thu, 16 Mar 2023 17:37:01 +0000 Message-Id: <144c351087da7740f9ec1bfc01f70eb4b26e18b8.1678987897.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,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: This reverts commit ac0d67ed1dcf470bad6a3bc4800c2ddc9bedecca. There was nothing wrong with the commit which I'm reverting here, but it removed some functionality that will be needed for a later commit; that is, the ability for GDB to ask for events from a specific ptid_t via the do_target_wait function. In a follow up commit, this functionality will be used to implement inferior function calls in multi-threaded inferiors. This is not a straight revert of the above commit. Reverting the above commit replaces a 'nullptr' with 'NULL', I've gone in and changed that, preserving the 'nullptr'. --- gdb/infrun.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gdb/infrun.c b/gdb/infrun.c index 33aa0c8794b..9f8c8412183 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -3830,7 +3830,8 @@ do_target_wait_1 (inferior *inf, ptid_t ptid, more events. Polls for events from all inferiors/targets. */ static bool -do_target_wait (execution_control_state *ecs, target_wait_flags options) +do_target_wait (ptid_t wait_ptid, execution_control_state *ecs, + target_wait_flags options) { int num_inferiors = 0; int random_selector; @@ -3840,9 +3841,10 @@ do_target_wait (execution_control_state *ecs, target_wait_flags options) polling the rest of the inferior list starting from that one in a circular fashion until the whole list is polled once. */ - auto inferior_matches = [] (inferior *inf) + auto inferior_matches = [&wait_ptid] (inferior *inf) { - return inf->process_target () != nullptr; + return (inf->process_target () != nullptr + && ptid_t (inf->pid).matches (wait_ptid)); }; /* First see how many matching inferiors we have. */ @@ -3881,7 +3883,7 @@ do_target_wait (execution_control_state *ecs, target_wait_flags options) auto do_wait = [&] (inferior *inf) { - ecs->ptid = do_target_wait_1 (inf, minus_one_ptid, &ecs->ws, options); + ecs->ptid = do_target_wait_1 (inf, wait_ptid, &ecs->ws, options); ecs->target = inf->process_target (); return (ecs->ws.kind () != TARGET_WAITKIND_IGNORE); }; @@ -4311,7 +4313,7 @@ fetch_inferior_event () the event. */ scoped_disable_commit_resumed disable_commit_resumed ("handling event"); - if (!do_target_wait (&ecs, TARGET_WNOHANG)) + if (!do_target_wait (minus_one_ptid, &ecs, TARGET_WNOHANG)) { infrun_debug_printf ("do_target_wait returned no event"); disable_commit_resumed.reset_and_commit (); -- 2.25.4