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 416F8385829F for ; Tue, 5 Mar 2024 15:40:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 416F8385829F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 416F8385829F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709653246; cv=none; b=C2duGohttlsrBIOe+BzduBqe8DpLHSqq9yqZ+IYdL2VEAnOoSSzfhPlHUMa1kUY0fg4Hi8dEIEerp3Zin0C2vJR+nM9mt1j9/EQi1BPyNXm+tb8HfXQLvh8Hhz0RZghxuIGSexVijUf3w/3zAH0b9doXGpFAghkrNoX2oCOJrzk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709653246; c=relaxed/simple; bh=5ZO29cUxxENuwd7/aac8E1o3M9lV1qVsvvBKd+LMo1Q=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=M4q/vMdVQV2SzKwmZ4MuPnszyA4ocO+MOWV9fHLaGFBySMRSU+D8MjgRVpwwMWlr1culE4SRmt72+czV9wLybZjb7VJUDd6uL4aLAw38sxL3uAhRJZEDcdi1ulUAMtBxtnFhMczVAOmg1YqPT/aE5ZkLRocfj5R5Mv+sTyQpfyY= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709653244; 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=d/P5Fh0hpLfhg16onfOJ+79VVfOP3BayrEyd47v8uno=; b=Rgx1a9LtlxOCarzEba6AJZ+TTDytwkxsA9Dl2iQ0xzQRagU7WZ5stjAd9WCnOUCWz9jAdj Vp4CCl98ppZvL25E0zcT+cwYoT3hNlZ0a3KTyqRNnH6r5OUBPTVNXlSS8sUF6F8Zw0ps7b nMwlfJXktQtQLOCFUGUy7YwjavejcQE= 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-27--W8yImWwP2qPss_mAD9Cvg-1; Tue, 05 Mar 2024 10:40:43 -0500 X-MC-Unique: -W8yImWwP2qPss_mAD9Cvg-1 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-5679dcc29c5so366819a12.2 for ; Tue, 05 Mar 2024 07:40:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709653241; x=1710258041; 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=d/P5Fh0hpLfhg16onfOJ+79VVfOP3BayrEyd47v8uno=; b=lemjM2d8SXOFiXDd3wZM6VR3Hmv7sMskyEfcSs69ADzawBZNmGQp1QID6yA95H7Kp8 8R5XjHx9uLcbvX1tNge9JBlqpaTJ5NFN5weV34bOZD39pxmqhbeaJfHvI9kDw5EQQeij SZ724ByujmqwiqxeMepkWR4T/dYL1+j0ekV0O4B+PDSUOG584eLordN298SVmreHghys hulNagxi2Dug7KgqvGpbT9soESbguNlINQfxVn279jGrvIdtRROcZBZuKmrULFm2+EjF gC0/DnBanK4fIhJuZjF3JQ4nE/2JNsmz+/Q69/8pS2OQ54Ap/XWuKmEwec+hHVseJFLf VbHA== X-Gm-Message-State: AOJu0YzECbC4JsJcBD3AiuxTOnr8whkgEMxeTox2Y4Zaq8xLbOBGs5Vm 62o1kdaCOxN+X7Fvsdl7syBR6JzlVAvHPjirHvRH6rWUKQZwDKOOcQUFgTNHjDk3FFLo83lurWQ j8xi8EPDhJb0sJM3Qt++gsklg8XCEzWalJJXw1Kr9yJpqWW8ah6xewMLpTnCBl6/vFJxwsKbHVc tA8kLXmP/wHWLSnYoqnZ4boxKF/i9ssUgsqokBexi4ZBk= X-Received: by 2002:a05:6402:1d91:b0:566:4aa9:7143 with SMTP id dk17-20020a0564021d9100b005664aa97143mr8439855edb.14.1709653241153; Tue, 05 Mar 2024 07:40:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IFwOAdqwkYnTEr33ZUcIN3rDBH1f0h/ADiaG/BP7oxflntIzp3zYdo9NjwceyY2RBvGyPveVA== X-Received: by 2002:a05:6402:1d91:b0:566:4aa9:7143 with SMTP id dk17-20020a0564021d9100b005664aa97143mr8439838edb.14.1709653240790; Tue, 05 Mar 2024 07:40:40 -0800 (PST) Received: from localhost (185.223.159.143.dyn.plus.net. [143.159.223.185]) by smtp.gmail.com with ESMTPSA id dy25-20020a05640231f900b005655dd9492dsm5952617edb.53.2024.03.05.07.40.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Mar 2024 07:40:40 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess , Tankut Baris Aktemur Subject: [PATCHv11 1/5] Revert "gdb: remove unnecessary parameter wait_ptid from do_target_wait" Date: Tue, 5 Mar 2024 15:40:34 +0000 Message-Id: <2518a641106dfbb114e1bff7cc2de0ffbc915803.1709653159.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=-12.3 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,SPF_HELO_NONE,SPF_NONE,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 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'. Reviewed-By: Tankut Baris Aktemur --- gdb/infrun.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gdb/infrun.c b/gdb/infrun.c index bbb98f6dcdb..e0e0ba35a68 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -4125,7 +4125,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; @@ -4135,9 +4136,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. */ @@ -4176,7 +4178,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); }; @@ -4626,7 +4628,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