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 034D53858C41 for ; Tue, 2 Jan 2024 15:58:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 034D53858C41 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 034D53858C41 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704211085; cv=none; b=fTZTy50WCfV1rMj9c6OTO9uFKPj5ar+8Zjm228SSAXy8BLCmsYJ5DYFtvLA8VvX0ANgDPyQGB41ltaqKqyRxXdG9ee6MukB+im33HhKLTTGbGQ1oLe/1T0bHPaSARte2AAVbP/97t5TSBDITW+yb+5ggDxJ/UHzsuPCruD3rjos= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704211085; c=relaxed/simple; bh=rVc2WSKsqLLvOpieRYM3+Kkb3lV2kkGx7scr5khsRGU=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=nY6E3e7Pane580+8e/LAJjCbf3JXrd4d7XweEADqz2HfxrjQPqt0DkgGOa9/IFt0hVGLKAl9XNvcCOnuXxyNROFVZ57d71hG1OhLjAbDHdTTKXfiw2RWiLUh8aNEAk3W8ZIdnlYk05Jw9uSYPabxE2P/ufLX6AHwaluBsTv5oHs= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1704211081; 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=iJZA+LXg8tZ/lwPhGyGfyYpkJd3HAkuymxYVxQqXftU=; b=HYc46C3t9vrRgDhPmxG5pUQMeBAacikk7+qZ/rTrbFzB3cCOsDxeDler7PfLVDUowI55dY 2OqU9HSbTuCXc7CUQ5kNRZs4ODZJez3F5hCc3w/MeCsxLUn16fQZEEid03Nm9++cP71zXA DFXyLGi5j0U4V/l3ZMf4Pm6Af+ao7LI= 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_256_GCM_SHA384) id us-mta-632-d9QbrcJyP8WPBjcVfXHNnw-1; Tue, 02 Jan 2024 10:58:00 -0500 X-MC-Unique: d9QbrcJyP8WPBjcVfXHNnw-1 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-40d890b4536so13113285e9.2 for ; Tue, 02 Jan 2024 07:58:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704211078; x=1704815878; 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=iJZA+LXg8tZ/lwPhGyGfyYpkJd3HAkuymxYVxQqXftU=; b=H7qwVFb4SZVrItu8qRUjnxk320YFweXtSCKlqVKBGZGBPHieUg0K67Hh3LqTOsA981 nVCEbBhI0W/lZHZoHolUs9t8P5nqU7/xhuKM/jizAXUfIm0sZ0EoDQUl9uliDBiXhK6d oQGs4IExF0sr42+6bDBu9bDHDCVcC2obFurXIY5lYNVvIPzhnEvlj654VkuMl/hr+hI7 dtI+SsPXevTtR+RE6hDfWp1GrcmoSjvlfNv2RUnP+7ebffX1VjkFclFV2Ooq7JQNUqTt 6W+zgb3itb6E2nR0Npvf/jzIXm9QtuUHR+zJKSHcvlcX0kHPWKIAE1QGgisAKv4gdS9x 99GQ== X-Gm-Message-State: AOJu0Yz+AVldwLjBy7rvnrxlyGBXlFEMv7j+q72he+ssHX6eescQfJ9k QMZU9SlZ2CKgppVxDpDd+35CY8Ki/17uCmr+A/aFczs5kH+x6DBlg35uGbw32CyJNYpPLVL/Wvf D/RkXG7HxmyytFxHAzvhTuVYKxGfYqhEgHTKJSZhO+fQukeWHcmW4OQhLo8Ss5UfYvWQJdQGDyp hrFZRNeiIY6wvllg== X-Received: by 2002:a7b:c8d9:0:b0:40d:8bb4:25e3 with SMTP id f25-20020a7bc8d9000000b0040d8bb425e3mr805053wml.46.1704211078625; Tue, 02 Jan 2024 07:57:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IH+UZMudvknqcp/606hj3lBD5gFhkcz0zCXOnTt4zqyff3ZTeJeSJQpmwyxAfczzeespWyexA== X-Received: by 2002:a7b:c8d9:0:b0:40d:8bb4:25e3 with SMTP id f25-20020a7bc8d9000000b0040d8bb425e3mr805047wml.46.1704211078105; Tue, 02 Jan 2024 07:57:58 -0800 (PST) Received: from localhost (185.223.159.143.dyn.plus.net. [143.159.223.185]) by smtp.gmail.com with ESMTPSA id bh20-20020a05600c3d1400b0040d8eca092esm562358wmb.47.2024.01.02.07.57.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jan 2024 07:57:57 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess , Tankut Baris Aktemur Subject: [PATCHv10 1/5] Revert "gdb: remove unnecessary parameter wait_ptid from do_target_wait" Date: Tue, 2 Jan 2024 15:57:49 +0000 Message-Id: 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=-13.0 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_H3,RCVD_IN_MSPIKE_WL,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 1d863896c40..e04612f1a0f 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -4123,7 +4123,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; @@ -4133,9 +4134,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. */ @@ -4174,7 +4176,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); }; @@ -4624,7 +4626,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