* inf-ttrace.c (inf_ttrace_mourn_inferior): Remove redundant cast.

(inf_ttrace_kill): Renamed from inf_ttrace_kill_inferior.
(inf_ttrace_target): Resort assignments.
This commit is contained in:
Mark Kettenis 2005-10-28 18:20:35 +00:00
parent 656d5e120f
commit 346e281c43
2 changed files with 41 additions and 35 deletions

View File

@ -1,3 +1,9 @@
2005-10-28 Mark Kettenis <kettenis@gnu.org>
* inf-ttrace.c (inf_ttrace_mourn_inferior): Remove redundant cast.
(inf_ttrace_kill): Renamed from inf_ttrace_kill_inferior.
(inf_ttrace_target): Resort assignments.
2005-10-28 Nick Roberts <nickrob@snap.net.nz>
* mi/gdb-mi.el: Sync with Emacs 22.0.50.

View File

@ -644,28 +644,6 @@ inf_ttrace_create_inferior (char *exec_file, char *allargs, char **env,
proceed ((CORE_ADDR) -1, TARGET_SIGNAL_0, 0);
}
static void
inf_ttrace_kill_inferior (void)
{
pid_t pid = ptid_get_pid (inferior_ptid);
if (pid == 0)
return;
if (ttrace (TT_PROC_EXIT, pid, 0, 0, 0, 0) == -1)
perror_with_name (("ttrace"));
/* ??? Is it necessary to call ttrace_wait() here? */
if (inf_ttrace_vfork_ppid != -1)
{
if (ttrace (TT_PROC_DETACH, inf_ttrace_vfork_ppid, 0, 0, 0, 0) == -1)
perror_with_name (("ttrace"));
inf_ttrace_vfork_ppid = -1;
}
target_mourn_inferior ();
}
static void
inf_ttrace_mourn_inferior (void)
{
@ -715,7 +693,7 @@ inf_ttrace_attach (char *args, int from_tty)
if (from_tty)
{
exec_file = (char *) get_exec_file (0);
exec_file = get_exec_file (0);
if (exec_file)
printf_unfiltered (_("Attaching to program: %s, %s\n"), exec_file,
@ -792,6 +770,28 @@ inf_ttrace_detach (char *args, int from_tty)
inferior_ptid = null_ptid;
}
static void
inf_ttrace_kill (void)
{
pid_t pid = ptid_get_pid (inferior_ptid);
if (pid == 0)
return;
if (ttrace (TT_PROC_EXIT, pid, 0, 0, 0, 0) == -1)
perror_with_name (("ttrace"));
/* ??? Is it necessary to call ttrace_wait() here? */
if (inf_ttrace_vfork_ppid != -1)
{
if (ttrace (TT_PROC_DETACH, inf_ttrace_vfork_ppid, 0, 0, 0, 0) == -1)
perror_with_name (("ttrace"));
inf_ttrace_vfork_ppid = -1;
}
target_mourn_inferior ();
}
static int
inf_ttrace_resume_callback (struct thread_info *info, void *arg)
{
@ -1081,9 +1081,9 @@ inf_ttrace_xfer_partial (struct target_ops *ops, enum target_object object,
static void
inf_ttrace_files_info (struct target_ops *ignore)
{
printf_unfiltered (_("\tUsing the running image of %s %s.\n"),
attach_flag ? "attached" : "child",
target_pid_to_str (inferior_ptid));
printf_filtered (_("\tUsing the running image of %s %s.\n"),
attach_flag ? "attached" : "child",
target_pid_to_str (inferior_ptid));
}
static int
@ -1115,24 +1115,24 @@ inf_ttrace_target (void)
{
struct target_ops *t = inf_child_target ();
t->to_create_inferior = inf_ttrace_create_inferior;
t->to_kill = inf_ttrace_kill_inferior;
t->to_mourn_inferior = inf_ttrace_mourn_inferior;
t->to_attach = inf_ttrace_attach;
t->to_detach = inf_ttrace_detach;
t->to_resume = inf_ttrace_resume;
t->to_wait = inf_ttrace_wait;
t->to_xfer_partial = inf_ttrace_xfer_partial;
t->to_files_info = inf_ttrace_files_info;
t->to_thread_alive = inf_ttrace_thread_alive;
t->to_pid_to_str = inf_ttrace_pid_to_str;
t->to_follow_fork = inf_ttrace_follow_fork;
t->to_can_use_hw_breakpoint = inf_ttrace_can_use_hw_breakpoint;
t->to_region_size_ok_for_hw_watchpoint =
inf_ttrace_region_size_ok_for_hw_watchpoint;
t->to_insert_watchpoint = inf_ttrace_insert_watchpoint;
t->to_remove_watchpoint = inf_ttrace_remove_watchpoint;
t->to_stopped_by_watchpoint = inf_ttrace_stopped_by_watchpoint;
t->to_region_size_ok_for_hw_watchpoint =
inf_ttrace_region_size_ok_for_hw_watchpoint;
t->to_kill = inf_ttrace_kill;
t->to_create_inferior = inf_ttrace_create_inferior;
t->to_follow_fork = inf_ttrace_follow_fork;
t->to_mourn_inferior = inf_ttrace_mourn_inferior;
t->to_thread_alive = inf_ttrace_thread_alive;
t->to_pid_to_str = inf_ttrace_pid_to_str;
t->to_xfer_partial = inf_ttrace_xfer_partial;
ttrace_ops_hack = t;
return t;