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.133.124]) by sourceware.org (Postfix) with ESMTPS id 7BD253856168 for ; Fri, 21 Oct 2022 08:44:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7BD253856168 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-224-ZG3ndIUWNSOQsTGVBjN5Xw-1; Fri, 21 Oct 2022 04:44:04 -0400 X-MC-Unique: ZG3ndIUWNSOQsTGVBjN5Xw-1 Received: by mail-wm1-f72.google.com with SMTP id bg21-20020a05600c3c9500b003c2acbff422so2037201wmb.0 for ; Fri, 21 Oct 2022 01:44:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=l7M/wtwtiivTcSlwU3MTNeRFyPZjHt7vS0UJyTsznRw=; b=eFgWDYKuhjh3KW0nSpk6I6paQscDOJoVxwRiYC0OxpXvAA8Zo7rwrVSSTQfrElk/kY 8juUFnBgY6UkbtZyLd1/ex3zDXrYsdir9+oL82mXug9Vaovy2op7uJB4baGF/N2FF8uF ZSxwf5sgP9KuqxxJbMZ9SEBB/u1z47N+vqpVxbvjo4NxN2VcmITXSBNk5pg9fuE6PBpP s48zCOvbnEVWDh21lQH0z7JELRqiT/ztRixh16uiK+xuJB0SMupNh13EDQU5TRKYis56 lLmcDcpzGBA0jQWnOJrPnT/voRlY1Hs0YZtLd45JqanlKUeekB9o0211tiI0S0q8hzpt +VQw== X-Gm-Message-State: ACrzQf2Bz+8vhxe34OFO244gm/z/UDnS4VwUJhfnmDtjxrFJ8bq8z8Bs ExN8ApogFdTkOwYkaaKF1EDzpn6NbmO3pypi3NbWQ+3DprSxGBFTCUbN4p4g0DoITno0idEBEZ4 f+1SVjZpX79MjJtMWoY2TPJXaCmz4aZGwQTlLEvuASd6l8iXxOe+2Af0r/hgW4PAe/jTZjeY9tQ == X-Received: by 2002:a05:600c:468a:b0:3c6:f84a:1fae with SMTP id p10-20020a05600c468a00b003c6f84a1faemr16385957wmo.148.1666341842789; Fri, 21 Oct 2022 01:44:02 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5sSYz2G15c9ArPXffg9kTB3+z0ZbbCkIKCzREVhHj69d+lMNndDD/y7GxcF/XOB/8G3pOnnA== X-Received: by 2002:a05:600c:468a:b0:3c6:f84a:1fae with SMTP id p10-20020a05600c468a00b003c6f84a1faemr16385944wmo.148.1666341842458; Fri, 21 Oct 2022 01:44:02 -0700 (PDT) Received: from localhost ([31.111.84.238]) by smtp.gmail.com with ESMTPSA id l14-20020a05600c1d0e00b003b435c41103sm2723332wms.0.2022.10.21.01.44.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Oct 2022 01:44:02 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Subject: [PATCH 09/12] Revert "gdb: remove unnecessary parameter wait_ptid from do_target_wait" Date: Fri, 21 Oct 2022 09:43:45 +0100 Message-Id: <05a361f66e12aed286a5f16af402a0dd1100af93.1666341010.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.9 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Oct 2022 08:44:57 -0000 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. --- gdb/infrun.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gdb/infrun.c b/gdb/infrun.c index c28bf28a4d9..b23c3e3918e 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -3770,7 +3770,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; @@ -3780,9 +3781,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 () != NULL + && ptid_t (inf->pid).matches (wait_ptid)); }; /* First see how many matching inferiors we have. */ @@ -3821,7 +3823,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); }; @@ -4200,7 +4202,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