/* Native-dependent code for OpenBSD.
- Copyright (C) 2012-2017 Free Software Foundation, Inc.
+ Copyright (C) 2012-2022 Free Software Foundation, Inc.
This file is part of GDB.
#include <sys/types.h>
#include <sys/ptrace.h>
-#include "gdb_wait.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
that maps userland threads directly onto kernel threads in a 1:1
fashion. */
-#ifdef PT_GET_THREAD_FIRST
-
-static char *
-obsd_pid_to_str (struct target_ops *ops, ptid_t ptid)
+std::string
+obsd_nat_target::pid_to_str (ptid_t ptid)
{
- if (ptid_get_lwp (ptid) != 0)
- {
- static char buf[64];
-
- xsnprintf (buf, sizeof buf, "thread %ld", ptid_get_lwp (ptid));
- return buf;
- }
+ if (ptid.lwp () != 0)
+ return string_printf ("thread %ld of process %d", ptid.lwp (), ptid.pid ());
return normal_pid_to_str (ptid);
}
-static void
-obsd_update_thread_list (struct target_ops *ops)
+void
+obsd_nat_target::update_thread_list ()
{
- pid_t pid = ptid_get_pid (inferior_ptid);
+ pid_t pid = inferior_ptid.pid ();
struct ptrace_thread_state pts;
prune_threads ();
while (pts.pts_tid != -1)
{
- ptid_t ptid = ptid_build (pid, pts.pts_tid, 0);
+ ptid_t ptid = ptid_t (pid, pts.pts_tid, 0);
- if (!in_thread_list (ptid))
+ if (!in_thread_list (this, ptid))
{
- if (ptid_get_lwp (inferior_ptid) == 0)
- thread_change_ptid (inferior_ptid, ptid);
+ if (inferior_ptid.lwp () == 0)
+ thread_change_ptid (this, inferior_ptid, ptid);
else
- add_thread (ptid);
+ add_thread (this, ptid);
}
if (ptrace (PT_GET_THREAD_NEXT, pid, (caddr_t)&pts, sizeof pts) == -1)
}
}
-static ptid_t
-obsd_wait (struct target_ops *ops,
- ptid_t ptid, struct target_waitstatus *ourstatus, int options)
-{
- pid_t pid;
- int status, save_errno;
+/* Enable additional event reporting on a new or existing process. */
- do
- {
- set_sigint_trap ();
-
- do
- {
- pid = waitpid (ptid_get_pid (ptid), &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 != ptid_get_pid (inferior_ptid))
- pid = -1;
- }
- while (pid == -1);
+static void
+obsd_enable_proc_events (pid_t pid)
+{
+ ptrace_event_t pe;
- ptid = pid_to_ptid (pid);
+ /* Set the initial event mask. */
+ memset (&pe, 0, sizeof pe);
+ pe.pe_set_event |= PTRACE_FORK;
+ if (ptrace (PT_SET_EVENT_MASK, pid,
+ (PTRACE_TYPE_ARG3)&pe, sizeof pe) == -1)
+ perror_with_name (("ptrace"));
+}
- if (WIFSTOPPED (status))
+ptid_t
+obsd_nat_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus,
+ target_wait_flags options)
+{
+ 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 pid = wptid.pid ();
if (ptrace (PT_GET_PROCESS_STATE, pid, (caddr_t)&pe, sizeof pe) == -1)
perror_with_name (("ptrace"));
+ wptid = ptid_t (pid, pe.pe_tid, 0);
+
switch (pe.pe_report_event)
{
case PTRACE_FORK:
- ourstatus->kind = TARGET_WAITKIND_FORKED;
- ourstatus->value.related_pid = pid_to_ptid (pe.pe_other_pid);
+ ourstatus->set_forked (ptid_t (pe.pe_other_pid));
/* Make sure the other end of the fork is stopped too. */
- fpid = waitpid (pe.pe_other_pid, &status, 0);
+ pid_t fpid = waitpid (pe.pe_other_pid, nullptr, 0);
if (fpid == -1)
perror_with_name (("waitpid"));
gdb_assert (pe.pe_report_event == PTRACE_FORK);
gdb_assert (pe.pe_other_pid == pid);
- if (fpid == ptid_get_pid (inferior_ptid))
+ if (find_inferior_pid (this, fpid) != nullptr)
{
- ourstatus->value.related_pid = pid_to_ptid (pe.pe_other_pid);
- return pid_to_ptid (fpid);
+ ourstatus->set_forked (ptid_t (pe.pe_other_pid));
+ wptid = ptid_t (fpid, pe.pe_tid, 0);
}
- return pid_to_ptid (pid);
+ obsd_enable_proc_events (ourstatus->child_ptid ().pid ());
+ break;
}
- ptid = ptid_build (pid, pe.pe_tid, 0);
- if (!in_thread_list (ptid))
+ /* Ensure the ptid is updated with an LWP id on the first stop
+ of a process. */
+ if (!in_thread_list (this, wptid))
{
- if (ptid_get_lwp (inferior_ptid) == 0)
- thread_change_ptid (inferior_ptid, ptid);
+ if (in_thread_list (this, ptid_t (pid)))
+ thread_change_ptid (this, ptid_t (pid), wptid);
else
- add_thread (ptid);
+ add_thread (this, wptid);
}
}
+ return wptid;
+}
- store_waitstatus (ourstatus, status);
- return ptid;
+void
+obsd_nat_target::post_attach (int pid)
+{
+ obsd_enable_proc_events (pid);
}
+/* Implement the virtual inf_ptrace_target::post_startup_inferior method. */
+
void
-obsd_add_target (struct target_ops *t)
+obsd_nat_target::post_startup_inferior (ptid_t pid)
{
- /* Override some methods to support threads. */
- t->to_pid_to_str = obsd_pid_to_str;
- t->to_update_thread_list = obsd_update_thread_list;
- t->to_wait = obsd_wait;
- add_target (t);
+ obsd_enable_proc_events (pid.pid ());
}
-#else
+/* Target hook for follow_fork. */
void
-obsd_add_target (struct target_ops *t)
+obsd_nat_target::follow_fork (inferior *child_inf, ptid_t child_ptid,
+ target_waitkind fork_kind,
+ bool follow_child, bool detach_fork)
+{
+ inf_ptrace_target::follow_fork (child_inf, child_ptid, fork_kind,
+ follow_child, detach_fork);
+
+ if (!follow_child && detach_fork)
+ {
+ /* Breakpoints have already been detached from the child by
+ infrun.c. */
+
+ if (ptrace (PT_DETACH, child_ptid.pid (), (PTRACE_TYPE_ARG3)1, 0) == -1)
+ perror_with_name (("ptrace"));
+ }
+}
+
+int
+obsd_nat_target::insert_fork_catchpoint (int pid)
{
- add_target (t);
+ return 0;
}
-#endif /* PT_GET_THREAD_FIRST */
+int
+obsd_nat_target::remove_fork_catchpoint (int pid)
+{
+ return 0;
+}
projects / binutils-gdb.git / blobdiff