FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

convert to_follow_fork

Browse source 
2014-02-19  Tom Tromey  <tromey@redhat.com>

	* target-delegates.c: Rebuild.
	* target.c (default_follow_fork): New function.
	(target_follow_fork): Unconditionally delegate.
	* target.h (struct target_ops) <to_follow_fork>: Use
	TARGET_DEFAULT_FUNC.
This commit is contained in:
Tom Tromey 2013-12-18 14:38:04 -07:00
parent 423a48075e
commit 098dba18ee
4 changed files with 39 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gdb/ChangeLog
View file

@ -1,3 +1,11 @@
2014-02-19 Tom Tromey <tromey@redhat.com>
* target-delegates.c: Rebuild.
* target.c (default_follow_fork): New function.
(target_follow_fork): Unconditionally delegate.
* target.h (struct target_ops) <to_follow_fork>: Use
TARGET_DEFAULT_FUNC.
2014-02-19 Tom Tromey <tromey@redhat.com> 2014-02-19 Tom Tromey <tromey@redhat.com>
* target-delegates.c: Rebuild. * target-delegates.c: Rebuild.

10
gdb/target-delegates.c
View file

@ -451,6 +451,13 @@ tdefault_remove_vfork_catchpoint (struct target_ops *self, int arg1)
return 1; return 1;
} }
static int
delegate_follow_fork (struct target_ops *self, int arg1, int arg2)
{
self = self->beneath;
return self->to_follow_fork (self, arg1, arg2);
}
static int static int
delegate_insert_exec_catchpoint (struct target_ops *self, int arg1) delegate_insert_exec_catchpoint (struct target_ops *self, int arg1)
{ {
@ -1230,6 +1237,8 @@ install_delegators (struct target_ops *ops)
ops->to_insert_vfork_catchpoint = delegate_insert_vfork_catchpoint; ops->to_insert_vfork_catchpoint = delegate_insert_vfork_catchpoint;
if (ops->to_remove_vfork_catchpoint == NULL) if (ops->to_remove_vfork_catchpoint == NULL)
ops->to_remove_vfork_catchpoint = delegate_remove_vfork_catchpoint; ops->to_remove_vfork_catchpoint = delegate_remove_vfork_catchpoint;
if (ops->to_follow_fork == NULL)
ops->to_follow_fork = delegate_follow_fork;
if (ops->to_insert_exec_catchpoint == NULL) if (ops->to_insert_exec_catchpoint == NULL)
ops->to_insert_exec_catchpoint = delegate_insert_exec_catchpoint; ops->to_insert_exec_catchpoint = delegate_insert_exec_catchpoint;
if (ops->to_remove_exec_catchpoint == NULL) if (ops->to_remove_exec_catchpoint == NULL)
@ -1389,6 +1398,7 @@ install_dummy_methods (struct target_ops *ops)
ops->to_remove_fork_catchpoint = tdefault_remove_fork_catchpoint; ops->to_remove_fork_catchpoint = tdefault_remove_fork_catchpoint;
ops->to_insert_vfork_catchpoint = tdefault_insert_vfork_catchpoint; ops->to_insert_vfork_catchpoint = tdefault_insert_vfork_catchpoint;
ops->to_remove_vfork_catchpoint = tdefault_remove_vfork_catchpoint; ops->to_remove_vfork_catchpoint = tdefault_remove_vfork_catchpoint;
ops->to_follow_fork = default_follow_fork;
ops->to_insert_exec_catchpoint = tdefault_insert_exec_catchpoint; ops->to_insert_exec_catchpoint = tdefault_insert_exec_catchpoint;
ops->to_remove_exec_catchpoint = tdefault_remove_exec_catchpoint; ops->to_remove_exec_catchpoint = tdefault_remove_exec_catchpoint;
ops->to_set_syscall_catchpoint = tdefault_set_syscall_catchpoint; ops->to_set_syscall_catchpoint = tdefault_set_syscall_catchpoint;

27
gdb/target.c
View file

@ -60,6 +60,9 @@ static void default_rcmd (struct target_ops *, char *, struct ui_file *);
static ptid_t default_get_ada_task_ptid (struct target_ops *self, static ptid_t default_get_ada_task_ptid (struct target_ops *self,
long lwp, long tid); long lwp, long tid);
static int default_follow_fork (struct target_ops *self, int follow_child,
int detach_fork);
static void tcomplain (void) ATTRIBUTE_NORETURN; static void tcomplain (void) ATTRIBUTE_NORETURN;
static int nomemory (CORE_ADDR, char *, int, int, struct target_ops *); static int nomemory (CORE_ADDR, char *, int, int, struct target_ops *);
@ -2632,31 +2635,29 @@ target_program_signals (int numsigs, unsigned char *program_signals)
} }
} }
static int
default_follow_fork (struct target_ops *self, int follow_child,
int detach_fork)
{
/* Some target returned a fork event, but did not know how to follow it. */
internal_error (__FILE__, __LINE__,
_("could not find a target to follow fork"));
}
/* Look through the list of possible targets for a target that can /* Look through the list of possible targets for a target that can
follow forks. */ follow forks. */
int int
target_follow_fork (int follow_child, int detach_fork) target_follow_fork (int follow_child, int detach_fork)
{ {
struct target_ops *t; int retval = current_target.to_follow_fork (&current_target,
follow_child, detach_fork);
for (t = current_target.beneath; t != NULL; t = t->beneath)
{
if (t->to_follow_fork != NULL)
{
int retval = t->to_follow_fork (t, follow_child, detach_fork);
if (targetdebug) if (targetdebug)
fprintf_unfiltered (gdb_stdlog, fprintf_unfiltered (gdb_stdlog,
"target_follow_fork (%d, %d) = %d\n", "target_follow_fork (%d, %d) = %d\n",
follow_child, detach_fork, retval); follow_child, detach_fork, retval);
return retval; return retval;
}
}
/* Some target returned a fork event, but did not know how to follow it. */
internal_error (__FILE__, __LINE__,
_("could not find a target to follow fork"));
} }
void void

3
gdb/target.h
View file

@ -533,7 +533,8 @@ struct target_ops
TARGET_DEFAULT_RETURN (1); TARGET_DEFAULT_RETURN (1);
int (*to_remove_vfork_catchpoint) (struct target_ops *, int) int (*to_remove_vfork_catchpoint) (struct target_ops *, int)
TARGET_DEFAULT_RETURN (1); TARGET_DEFAULT_RETURN (1);
int (*to_follow_fork) (struct target_ops *, int, int); int (*to_follow_fork) (struct target_ops *, int, int)
TARGET_DEFAULT_FUNC (default_follow_fork);
int (*to_insert_exec_catchpoint) (struct target_ops *, int) int (*to_insert_exec_catchpoint) (struct target_ops *, int)
TARGET_DEFAULT_RETURN (1); TARGET_DEFAULT_RETURN (1);
int (*to_remove_exec_catchpoint) (struct target_ops *, int) int (*to_remove_exec_catchpoint) (struct target_ops *, int)