From f56944000c014116905d4fffe27da05ef8896cfd Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 3 Apr 2023 14:52:03 -0400 Subject: [PATCH] gdb: add inferior_forked observable In the upcoming patch to support fork in the amd-dbgapi target, the amd-dbgapi target will need to be notified of fork events through an observer, to attach itself (attach in the amd-dbgapi sense, not ptrace sense) to the new inferior / process. The reason that this can't be done through target_ops::follow_fork is that the amd-dbgapi target isn't pushed on the inferior's target stack right away. It attaches itself to the process and only pushes itself on its target stack if and when the inferior initializes the ROCm runtime. If an inferior that is not using the ROCm runtime forks, we want to be notified of it, so we can attach to the child, and catch if the child starts using the ROCm runtime. So, add a new observable and notify it in follow_fork_inferior. It will be used later in this series. Change-Id: I67fced5a9cba6d5da72b9c7ea1c8397644ca1d54 Reviewed-By: Pedro Alves --- gdb/infrun.c | 2 ++ gdb/observable.c | 1 + gdb/observable.h | 9 +++++++++ 3 files changed, 12 insertions(+) diff --git a/gdb/infrun.c b/gdb/infrun.c index e77ad31a7bc..6f02c6e1a37 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -624,6 +624,8 @@ holding the child stopped. Try \"set detach-on-fork\" or \ target_follow_fork (child_inf, child_ptid, fork_kind, follow_child, detach_fork); + gdb::observers::inferior_forked.notify (parent_inf, child_inf, fork_kind); + /* target_follow_fork must leave the parent as the current inferior. If we want to follow the child, we make it the current one below. */ gdb_assert (current_inferior () == parent_inf); diff --git a/gdb/observable.c b/gdb/observable.c index 28249a5ad01..49de89c25e0 100644 --- a/gdb/observable.c +++ b/gdb/observable.c @@ -44,6 +44,7 @@ DEFINE_OBSERVABLE (target_changed); DEFINE_OBSERVABLE (executable_changed); DEFINE_OBSERVABLE (inferior_created); DEFINE_OBSERVABLE (inferior_execd); +DEFINE_OBSERVABLE (inferior_forked); DEFINE_OBSERVABLE (record_changed); DEFINE_OBSERVABLE (solib_loaded); DEFINE_OBSERVABLE (solib_unloaded); diff --git a/gdb/observable.h b/gdb/observable.h index 00955cbc876..3066cf68f31 100644 --- a/gdb/observable.h +++ b/gdb/observable.h @@ -21,6 +21,7 @@ #define OBSERVABLE_H #include "gdbsupport/observable.h" +#include "target/waitstatus.h" struct bpstat; struct so_list; @@ -97,6 +98,14 @@ extern observable inferior_created; extern observable inferior_execd; +/* The inferior PARENT_INF has forked. If we are setting up an inferior for + the child (because we follow only the child or we follow both), CHILD_INF + is the child inferior. Otherwise, CHILD_INF is nullptr. + + FORK_KIND is TARGET_WAITKIND_FORKED or TARGET_WAITKIND_VFORKED. */ +extern observable inferior_forked; + /* The status of process record for inferior inferior in gdb has changed. The process record is started if STARTED is true, and the process record is stopped if STARTED is false. -- 2.30.2