/* Target-vector operations for controlling Unix child processes, for GDB.
- Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999,
- 2000, 2002
- Free Software Foundation, Inc.
+
+ Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999,
+ 2000, 2002, 2003 Free Software Foundation, Inc.
+
Contributed by Cygnus Support.
## Contains temporary hacks..
#include <fcntl.h>
#include "gdb_wait.h"
+#include "inflow.h"
extern struct symtab_and_line *child_enable_exception_callback (enum
exception_event_kind,
static void child_detach (char *, int);
-static void child_detach_from_process (int, char *, int, int);
-
static void child_attach (char *, int);
-static void child_attach_to_process (char *, int, int);
-
#if !defined(CHILD_POST_ATTACH)
extern void child_post_attach (int);
#endif
-static void child_require_attach (char *, int);
-
-static void child_require_detach (int, char *, int);
-
static void ptrace_me (void);
static void ptrace_him (int);
#endif
+/* Attach to process PID, then initialize for debugging it. */
+
static void
-child_attach_to_process (char *args, int from_tty, int after_fork)
+child_attach (char *args, int from_tty)
{
if (!args)
error_no_arg ("process-id to attach");
{
exec_file = (char *) get_exec_file (0);
- if (after_fork)
- printf_unfiltered ("Attaching after fork to %s\n",
- target_pid_to_str (pid_to_ptid (pid)));
- else if (exec_file)
+ if (exec_file)
printf_unfiltered ("Attaching to program: %s, %s\n", exec_file,
target_pid_to_str (pid_to_ptid (pid)));
else
gdb_flush (gdb_stdout);
}
- if (!after_fork)
- attach (pid);
- else
- REQUIRE_ATTACH (pid);
+ attach (pid);
inferior_ptid = pid_to_ptid (pid);
push_target (&child_ops);
#endif /* ATTACH_DETACH */
}
-
-/* Attach to process PID, then initialize for debugging it. */
-
-static void
-child_attach (char *args, int from_tty)
-{
- child_attach_to_process (args, from_tty, 0);
-}
-
#if !defined(CHILD_POST_ATTACH)
void
child_post_attach (int pid)
}
#endif
-static void
-child_require_attach (char *args, int from_tty)
-{
- child_attach_to_process (args, from_tty, 1);
-}
+/* Take a program previously attached to and detaches it.
+ The program resumes execution and will no longer stop
+ on signals, etc. We'd better not have left any breakpoints
+ in the program or it'll die when it hits one. For this
+ to work, it may be necessary for the process to have been
+ previously attached. It *might* work if the program was
+ started via the normal ptrace (PTRACE_TRACEME). */
static void
-child_detach_from_process (int pid, char *args, int from_tty, int after_fork)
+child_detach (char *args, int from_tty)
{
#ifdef ATTACH_DETACH
{
int siggnal = 0;
+ int pid = PIDGET (inferior_ptid);
if (from_tty)
{
char *exec_file = get_exec_file (0);
if (exec_file == 0)
exec_file = "";
- if (after_fork)
- printf_unfiltered ("Detaching after fork from %s\n",
- target_pid_to_str (pid_to_ptid (pid)));
- else
- printf_unfiltered ("Detaching from program: %s, %s\n", exec_file,
- target_pid_to_str (pid_to_ptid (pid)));
+ printf_unfiltered ("Detaching from program: %s, %s\n", exec_file,
+ target_pid_to_str (pid_to_ptid (pid)));
gdb_flush (gdb_stdout);
}
if (args)
siggnal = atoi (args);
- if (!after_fork)
- detach (siggnal);
- else
- REQUIRE_DETACH (pid, siggnal);
+ detach (siggnal);
+
+ inferior_ptid = null_ptid;
+ unpush_target (&child_ops);
}
#else
error ("This version of Unix does not support detaching a process.");
#endif
}
-/* Take a program previously attached to and detaches it.
- The program resumes execution and will no longer stop
- on signals, etc. We'd better not have left any breakpoints
- in the program or it'll die when it hits one. For this
- to work, it may be necessary for the process to have been
- previously attached. It *might* work if the program was
- started via the normal ptrace (PTRACE_TRACEME). */
-
-static void
-child_detach (char *args, int from_tty)
-{
- child_detach_from_process (PIDGET (inferior_ptid), args, from_tty, 0);
- inferior_ptid = null_ptid;
- unpush_target (&child_ops);
-}
-
-static void
-child_require_detach (int pid, char *args, int from_tty)
-{
- child_detach_from_process (pid, args, from_tty, 1);
-}
-
-
/* Get ready to modify the registers array. On machines which store
individual registers, this doesn't need to do anything. On machines
which store all the registers in one fell swoop, this makes sure
static void
child_stop (void)
{
- extern pid_t inferior_process_group;
-
kill (-inferior_process_group, SIGINT);
}
child_ops.to_open = child_open;
child_ops.to_attach = child_attach;
child_ops.to_post_attach = child_post_attach;
- child_ops.to_require_attach = child_require_attach;
child_ops.to_detach = child_detach;
- child_ops.to_require_detach = child_require_detach;
child_ops.to_resume = child_resume;
child_ops.to_wait = child_wait;
child_ops.to_post_wait = child_post_wait;
#define PROC_NAME_FMT "/proc/%05d"
#endif
sprintf (procname, PROC_NAME_FMT, getpid ());
- if ((fd = open (procname, O_RDONLY)) >= 0)
+ fd = open (procname, O_RDONLY);
+ if (fd >= 0)
{
close (fd);
return;