From patchwork Mon Oct 28 17:49:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 99714 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 A5FC9385841D for ; Mon, 28 Oct 2024 17:50:02 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id B1C133858D20 for ; Mon, 28 Oct 2024 17:49:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B1C133858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org B1C133858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1730137772; cv=none; b=kP520ce9dHI4U6eCz3TmxOwKeA1V35cX8vssW/rrJstlrEVbyBE/ROWPhv4DdttJDhkVEzhjhn46XrWifKnjirTkqLoo7rNftjjzajeX6j8T+MREMdGgKDaojVJdIRRtxQvjUeYeuZFQNtQarFlexe3EwiqHDoWH19vAcYI0nUM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1730137772; c=relaxed/simple; bh=WpPWkTb2VwGfZgYyBzZz+uCBnf4WFIknZuQSVdOtcec=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=XxwXcBOiH94JqI0shjRj7Qranodw3jrIrr/Wv0fCSHUmUwuDxlhEXkWo8ey+QKlYdRljdhDpNcBo4FAdd8hfS4kXEWyvd515NPYBKsGhEnNXMaGRAA3U5wDOXmT2tfkGoBEw6hgwnmL0mLByjfMuOgpdr3N8BPPAr0sOD2Vh6f8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id B410E21F57 for ; Mon, 28 Oct 2024 17:49:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1730137768; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KoMaVhw+DXuFyOLXeTIV8r8w7tE9kpDROxVkv81xHl0=; b=Y19c++uqTxMWE8wKfV3GIgvxZ5LgbR4ljPdP/2OqeaGVPYhhJYu6TgWe6s+9466lcGvqcE WKv0goFEUUETyUwz+dzl7vmKfD6QISJepRUFpDjLi6RaVfdkT6RY4SSa5Bqj9m2fo7V/V8 dJrgTPzg1tZShnKhmW16c/gX5RCscko= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1730137768; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KoMaVhw+DXuFyOLXeTIV8r8w7tE9kpDROxVkv81xHl0=; b=C7HdFz1+LJTrP2LjsB6TtayilyAvwrum6F61fqeORixjT0kJm4yPYAg0gOrCLCO+gyofw4 Ydnl8lS4cM7sxRAg== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1730137768; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KoMaVhw+DXuFyOLXeTIV8r8w7tE9kpDROxVkv81xHl0=; b=Y19c++uqTxMWE8wKfV3GIgvxZ5LgbR4ljPdP/2OqeaGVPYhhJYu6TgWe6s+9466lcGvqcE WKv0goFEUUETyUwz+dzl7vmKfD6QISJepRUFpDjLi6RaVfdkT6RY4SSa5Bqj9m2fo7V/V8 dJrgTPzg1tZShnKhmW16c/gX5RCscko= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1730137768; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KoMaVhw+DXuFyOLXeTIV8r8w7tE9kpDROxVkv81xHl0=; b=C7HdFz1+LJTrP2LjsB6TtayilyAvwrum6F61fqeORixjT0kJm4yPYAg0gOrCLCO+gyofw4 Ydnl8lS4cM7sxRAg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 97DE313866 for ; Mon, 28 Oct 2024 17:49:28 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id cFbZI6jOH2ccPQAAD6G6ig (envelope-from ) for ; Mon, 28 Oct 2024 17:49:28 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 2/3] [gdb] Use gdb::waitpid more often Date: Mon, 28 Oct 2024 18:49:12 +0100 Message-Id: <20241028174913.27056-2-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20241028174913.27056-1-tdevries@suse.de> References: <20241028174913.27056-1-tdevries@suse.de> MIME-Version: 1.0 X-Spam-Score: -2.80 X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.999]; MIME_GOOD(-0.10)[text/plain]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_TLS_ALL(0.00)[] X-Spam-Level: X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, DKIM_INVALID, DKIM_SIGNED, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, 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.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 Use gdb::waitpid instead of plain waitpid, making sure that EINTR is handled. Tested on x86_64-linux. --- gdb/darwin-nat.c | 3 ++- gdb/fbsd-nat.c | 5 +++-- gdb/inf-ptrace.c | 13 +++++-------- gdb/linux-fork.c | 7 ++++--- gdb/nat/linux-namespaces.c | 3 ++- gdb/nat/linux-ptrace.c | 3 ++- gdb/netbsd-nat.c | 9 +++------ gdb/obsd-nat.c | 3 ++- gdb/procfs.c | 2 +- gdb/rs6000-aix-nat.c | 9 +++------ gdb/utils.c | 5 +++-- 11 files changed, 30 insertions(+), 32 deletions(-) diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c index 7ba1fbb6775..3cfcab895e1 100644 --- a/gdb/darwin-nat.c +++ b/gdb/darwin-nat.c @@ -70,6 +70,7 @@ #include "gdbsupport/scoped_fd.h" #include "gdbsupport/scoped_restore.h" #include "nat/fork-inferior.h" +#include "gdbsupport/eintr.h" /* Quick overview. Darwin kernel is Mach + BSD derived kernel. Note that they share the @@ -1604,7 +1605,7 @@ darwin_attach_pid (struct inferior *inf) if (!inf->attach_flag) { kill (inf->pid, 9); - waitpid (inf->pid, &status, 0); + gdb::waitpid (inf->pid, &status, 0); } error diff --git a/gdb/fbsd-nat.c b/gdb/fbsd-nat.c index 6da32a4a50b..8e0523dd934 100644 --- a/gdb/fbsd-nat.c +++ b/gdb/fbsd-nat.c @@ -45,6 +45,7 @@ #include "elf-bfd.h" #include "fbsd-nat.h" #include "fbsd-tdep.h" +#include "gdbsupport/eintr.h" #ifndef PT_GETREGSET #define PT_GETREGSET 42 /* Get a target register set */ @@ -1150,7 +1151,7 @@ fbsd_wait_for_fork_child (pid_t pid) return ptid; int status; - pid_t wpid = waitpid (pid, &status, 0); + pid_t wpid = gdb::waitpid (pid, &status, 0); if (wpid == -1) perror_with_name (("waitpid")); @@ -2156,7 +2157,7 @@ fbsd_nat_target::kill () perror_with_name (("ptrace (PT_KILL)")); int status; - waitpid (pid, &status, 0); + gdb::waitpid (pid, &status, 0); target_mourn_inferior (inferior_ptid); } diff --git a/gdb/inf-ptrace.c b/gdb/inf-ptrace.c index 36d6e2aa697..a910b5dd46e 100644 --- a/gdb/inf-ptrace.c +++ b/gdb/inf-ptrace.c @@ -32,6 +32,7 @@ #include "nat/fork-inferior.h" #include "utils.h" #include "gdbarch.h" +#include "gdbsupport/eintr.h" @@ -122,7 +123,7 @@ inf_ptrace_target::mourn_inferior () Do not check whether this succeeds though, since we may be dealing with a process that we attached to. Such a process will only report its exit status to its original parent. */ - waitpid (inferior_ptid.pid (), &status, 0); + gdb::waitpid (inferior_ptid.pid (), &status, 0); inf_child_target::mourn_inferior (); } @@ -227,7 +228,7 @@ inf_ptrace_target::kill () return; ptrace (PT_KILL, pid, (PTRACE_TYPE_ARG3)0, 0); - waitpid (pid, &status, 0); + gdb::waitpid (pid, &status, 0); target_mourn_inferior (inferior_ptid); } @@ -307,12 +308,8 @@ inf_ptrace_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus, { set_sigint_trap (); - do - { - pid = waitpid (ptid.pid (), &status, options); - save_errno = errno; - } - while (pid == -1 && errno == EINTR); + pid = gdb::waitpid (ptid.pid (), &status, options); + save_errno = errno; clear_sigint_trap (); diff --git a/gdb/linux-fork.c b/gdb/linux-fork.c index c457a90556d..7d3505b5948 100644 --- a/gdb/linux-fork.c +++ b/gdb/linux-fork.c @@ -32,6 +32,7 @@ #include "nat/gdb_ptrace.h" #include "gdbsupport/gdb_wait.h" +#include "gdbsupport/eintr.h" #include "target/waitstatus.h" #include #include @@ -314,7 +315,7 @@ linux_fork_killall (void) /* Use SIGKILL instead of PTRACE_KILL because the former works even if the thread is running, while the later doesn't. */ kill (pid, SIGKILL); - ret = waitpid (pid, &status, 0); + ret = gdb::waitpid (pid, &status, 0); /* We might get a SIGCHLD instead of an exit status. This is aggravated by the first kill above - a child has just died. MVS comment cut-and-pasted from linux-nat. */ @@ -339,7 +340,7 @@ linux_fork_mourn_inferior (void) Do not check whether this succeeds though, since we may be dealing with a process that we attached to. Such a process will only report its exit status to its original parent. */ - waitpid (inferior_ptid.pid (), &status, 0); + gdb::waitpid (inferior_ptid.pid (), &status, 0); /* OK, presumably inferior_ptid is the one who has exited. We need to delete that one from the fork_list, and switch @@ -548,7 +549,7 @@ Please switch to another checkpoint before deleting the current one")); this succeeds though, since we may be dealing with a process that we attached to. Such a process will only report its exit status to its original parent. */ - waitpid (ptid.pid (), &status, 0); + gdb::waitpid (ptid.pid (), &status, 0); return; } diff --git a/gdb/nat/linux-namespaces.c b/gdb/nat/linux-namespaces.c index 9abd3d689ea..19a05eec905 100644 --- a/gdb/nat/linux-namespaces.c +++ b/gdb/nat/linux-namespaces.c @@ -28,6 +28,7 @@ #include #include #include "gdbsupport/scope-exit.h" +#include "gdbsupport/eintr.h" /* See nat/linux-namespaces.h. */ bool debug_linux_namespaces; @@ -722,7 +723,7 @@ mnsh_maybe_mourn_peer (void) return; } - pid = waitpid (helper->pid, &status, WNOHANG); + pid = gdb::waitpid (helper->pid, &status, WNOHANG); if (pid == 0) { /* The helper is still alive. */ diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c index 9ea0e22913f..f90183b63ec 100644 --- a/gdb/nat/linux-ptrace.c +++ b/gdb/nat/linux-ptrace.c @@ -22,6 +22,7 @@ #ifdef HAVE_SYS_PROCFS_H #include #endif +#include "gdbsupport/eintr.h" /* Stores the ptrace options supported by the running kernel. A value of -1 means we did not check for features yet. A value @@ -177,7 +178,7 @@ linux_ptrace_test_ret_to_nx (void) } errno = 0; - got_pid = waitpid (child, &status, 0); + got_pid = gdb::waitpid (child, &status, 0); if (got_pid != child) { warning (_("linux_ptrace_test_ret_to_nx: waitpid returned %ld: %s"), diff --git a/gdb/netbsd-nat.c b/gdb/netbsd-nat.c index 90456de165e..5005cb8307c 100644 --- a/gdb/netbsd-nat.c +++ b/gdb/netbsd-nat.c @@ -25,6 +25,7 @@ #include "inferior.h" #include "gdbarch.h" #include "gdbsupport/buildargv.h" +#include "gdbsupport/eintr.h" #include #include @@ -547,12 +548,8 @@ nbsd_wait (ptid_t ptid, struct target_waitstatus *ourstatus, set_sigint_trap (); - do - { - /* The common code passes WNOHANG that leads to crashes, overwrite it. */ - pid = waitpid (ptid.pid (), &status, 0); - } - while (pid == -1 && errno == EINTR); + /* The common code passes WNOHANG that leads to crashes, overwrite it. */ + pid = gdb::waitpid (ptid.pid (), &status, 0); clear_sigint_trap (); diff --git a/gdb/obsd-nat.c b/gdb/obsd-nat.c index 69a21ad71fc..701a3653d32 100644 --- a/gdb/obsd-nat.c +++ b/gdb/obsd-nat.c @@ -27,6 +27,7 @@ #include "inf-ptrace.h" #include "obsd-nat.h" +#include "gdbsupport/eintr.h" /* OpenBSD 5.2 and later include rthreads which uses a thread model that maps userland threads directly onto kernel threads in a 1:1 @@ -105,7 +106,7 @@ obsd_nat_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus, ourstatus->set_forked (ptid_t (pe.pe_other_pid)); /* Make sure the other end of the fork is stopped too. */ - pid_t fpid = waitpid (pe.pe_other_pid, nullptr, 0); + pid_t fpid = gdb::waitpid (pe.pe_other_pid, nullptr, 0); if (fpid == -1) perror_with_name (("waitpid")); diff --git a/gdb/procfs.c b/gdb/procfs.c index c6abe3ead44..22e012f0f31 100644 --- a/gdb/procfs.c +++ b/gdb/procfs.c @@ -2560,7 +2560,7 @@ unconditionally_kill_inferior (procinfo *pi) #if 0 int status, ret; - ret = waitpid (pi->pid, &status, 0); + ret = gdb::waitpid (pi->pid, &status, 0); #else wait (NULL); #endif diff --git a/gdb/rs6000-aix-nat.c b/gdb/rs6000-aix-nat.c index 6a20f612413..674189b0771 100644 --- a/gdb/rs6000-aix-nat.c +++ b/gdb/rs6000-aix-nat.c @@ -42,6 +42,7 @@ #include #include #include +#include "gdbsupport/eintr.h" #include #include @@ -865,12 +866,8 @@ rs6000_nat_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus, { set_sigint_trap (); - do - { - pid = waitpid (ptid.pid (), &status, 0); - save_errno = errno; - } - while (pid == -1 && errno == EINTR); + pid = gdb::waitpid (ptid.pid (), &status, 0); + save_errno = errno; clear_sigint_trap (); diff --git a/gdb/utils.c b/gdb/utils.c index a1bf9e46e02..ea98566dd3b 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -81,6 +81,7 @@ #include "pager.h" #include "run-on-main-thread.h" #include "gdbsupport/gdb_tilde_expand.h" +#include "gdbsupport/eintr.h" void (*deprecated_error_begin_hook) (void); @@ -3483,7 +3484,7 @@ wait_to_die_with_timeout (pid_t pid, int *status, int timeout) alarm (timeout); #endif - waitpid_result = waitpid (pid, status, 0); + waitpid_result = gdb::waitpid (pid, status, 0); #ifdef SIGALRM alarm (0); @@ -3495,7 +3496,7 @@ wait_to_die_with_timeout (pid_t pid, int *status, int timeout) #endif } else - waitpid_result = waitpid (pid, status, WNOHANG); + waitpid_result = gdb::waitpid (pid, status, WNOHANG); if (waitpid_result == pid) return pid;