From: John Baldwin <jhb@FreeBSD.org>
To: gdb-patches@sourceware.org
Subject: [PATCH v2 3/5] obsd-nat: Various fixes to obsd_nat_target::wait.
Date: Tue, 27 Jul 2021 10:41:08 -0700 [thread overview]
Message-ID: <20210727174110.62480-4-jhb@FreeBSD.org> (raw)
In-Reply-To: <20210727174110.62480-1-jhb@FreeBSD.org>
- Call inf_ptrace_target::wait instead of duplicating the code.
Replace a check for WIFSTOPPED on the returned status from waitpid
by checking for TARGET_WAITKIND_STOPPED in the parsed status as is
done in fbsd_nat_target::wait.
- Don't use inferior_ptid when deciding if a new process is a child vs
parent of the fork. Instead, use find_inferior_pid and assume that
if an inferior already exists, the pid in question is the parent;
otherwise, the pid is the child.
- Don't use inferior_ptid when deciding if the ptid of the process
needs to be updated with an LWP ID, or if this is a new thread.
Instead, use the approach from fbsd-nat which is to check if a ptid
without an LWP exists and if so update the ptid of that thread
instead of adding a new thread.
---
gdb/obsd-nat.c | 61 +++++++++++---------------------------------------
1 file changed, 13 insertions(+), 48 deletions(-)
diff --git a/gdb/obsd-nat.c b/gdb/obsd-nat.c
index 46fdc0676ea..8549c6ea66b 100644
--- a/gdb/obsd-nat.c
+++ b/gdb/obsd-nat.c
@@ -26,7 +26,7 @@
#include <sys/ptrace.h>
#include "gdbsupport/gdb_wait.h"
-#include "inf-child.h"
+#include "inf-ptrace.h"
#include "obsd-nat.h"
/* OpenBSD 5.2 and later include rthreads which uses a thread model
@@ -76,47 +76,14 @@ ptid_t
obsd_nat_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus,
target_wait_flags options)
{
- pid_t pid;
- int status, save_errno;
-
- do
- {
- set_sigint_trap ();
-
- do
- {
- pid = waitpid (ptid.pid (), &status, 0);
- save_errno = errno;
- }
- while (pid == -1 && errno == EINTR);
-
- clear_sigint_trap ();
-
- if (pid == -1)
- {
- fprintf_unfiltered (gdb_stderr,
- _("Child process unexpectedly missing: %s.\n"),
- safe_strerror (save_errno));
-
- /* Claim it exited with unknown signal. */
- ourstatus->kind = TARGET_WAITKIND_SIGNALLED;
- ourstatus->value.sig = GDB_SIGNAL_UNKNOWN;
- return inferior_ptid;
- }
-
- /* Ignore terminated detached child processes. */
- if (!WIFSTOPPED (status) && pid != inferior_ptid.pid ())
- pid = -1;
- }
- while (pid == -1);
-
- ptid = ptid_t (pid);
-
- if (WIFSTOPPED (status))
+ ptid_t wptid = inf_ptrace_target::wait (ptid, ourstatus, options);
+ if (ourstatus->kind == TARGET_WAITKIND_STOPPED)
{
ptrace_state_t pe;
- pid_t fpid;
+ pid_t fpid, pid;
+ int status;
+ pid = wptid.pid ();
if (ptrace (PT_GET_PROCESS_STATE, pid, (caddr_t)&pe, sizeof pe) == -1)
perror_with_name (("ptrace"));
@@ -137,7 +104,7 @@ obsd_nat_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus,
gdb_assert (pe.pe_report_event == PTRACE_FORK);
gdb_assert (pe.pe_other_pid == pid);
- if (fpid == inferior_ptid.pid ())
+ if (find_inferior_pid (this, fpid) != nullptr)
{
ourstatus->value.related_pid = ptid_t (pe.pe_other_pid);
return ptid_t (fpid);
@@ -146,18 +113,16 @@ obsd_nat_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus,
return ptid_t (pid);
}
- ptid = ptid_t (pid, pe.pe_tid, 0);
- if (!in_thread_list (this, ptid))
+ wptid = ptid_t (pid, pe.pe_tid, 0);
+ if (!in_thread_list (this, wptid))
{
- if (inferior_ptid.lwp () == 0)
- thread_change_ptid (this, inferior_ptid, ptid);
+ if (in_thread_list (this, ptid_t (pid)))
+ thread_change_ptid (this, ptid_t (pid), wptid);
else
- add_thread (this, ptid);
+ add_thread (this, wptid);
}
}
-
- store_waitstatus (ourstatus, status);
- return ptid;
+ return wptid;
}
#endif /* PT_GET_THREAD_FIRST */
--
2.31.1
next prev parent reply other threads:[~2021-07-27 17:42 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-27 17:41 [PATCH v2 0/5] A few fixes to OpenBSD's native target John Baldwin
2021-07-27 17:41 ` [PATCH v2 1/5] Don't compile x86 debug register support on OpenBSD John Baldwin
2021-07-27 17:41 ` [PATCH v2 2/5] x86-bsd-nat: Only define gdb_ptrace when using debug registers John Baldwin
2021-07-27 17:41 ` John Baldwin [this message]
2021-07-29 19:05 ` [PATCH v2 3/5] obsd-nat: Various fixes to obsd_nat_target::wait Simon Marchi
2021-07-29 19:11 ` Simon Marchi
2021-07-29 20:11 ` John Baldwin
2021-07-30 1:27 ` Simon Marchi
2021-07-27 17:41 ` [PATCH v2 4/5] obsd-nat: Various fixes for fork following John Baldwin
2021-07-29 19:14 ` Simon Marchi
2021-07-27 17:41 ` [PATCH v2 5/5] obsd-nat: Report both thread and PID in ::pid_to_str John Baldwin
2021-07-29 19:15 ` [PATCH v2 0/5] A few fixes to OpenBSD's native target Simon Marchi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210727174110.62480-4-jhb@FreeBSD.org \
--to=jhb@freebsd.org \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).