mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-15 04:31:49 +08:00
2090129c36
This is the most important (and the biggest, sorry) patch of the series. It moves fork_inferior from gdb/fork-child.c to nat/fork-inferior.c and makes all the necessary adjustments to both GDB and gdbserver to make sure everything works OK. There is no "most important change" with this patch; all changes are made in a progressive way, making sure that gdbserver had the necessary features while not breaking GDB at the same time. I decided to go ahead and implement a partial support for starting the inferior with a shell on gdbserver, although the full feature comes in the next patch. The user won't have the option to disable the startup-with-shell, and also won't be able to change which shell gdbserver will use (other than setting the $SHELL environment variable, that is). Everything is working as expected, and no regressions were present during the tests. gdb/ChangeLog: 2017-06-07 Sergio Durigan Junior <sergiodj@redhat.com> Pedro Alves <palves@redhat.com> * Makefile.in (HFILES_NO_SRCDIR): Add "common/common-inferior.h" and "nat/fork-inferior.h". * common/common-inferior.h: New file, with contents from "gdb/inferior.h". * commom/common-utils.c: Include "common-utils.h". (stringify_argv): New function. * common/common-utils.h (stringify_argv): New prototype. * configure.nat: Add "fork-inferior.o" as a dependency for "*linux*", "fbsd*" and "nbsd*" hosts. * corefile.c (get_exec_file): Update comment. * darwin-nat.c (darwin_ptrace_him): Call "gdb_startup_inferior" instead of "startup_inferior". (darwin_create_inferior): Call "add_thread_silent" after "fork_inferior". * fork-child.c: Cleanup unnecessary includes. (SHELL_FILE): Move to "common/common-fork-child.c". (environ): Likewise. (exec_wrapper): Initialize. (get_exec_wrapper): New function. (breakup_args): Move to "common/common-fork-child.c"; rename to "breakup_args_for_exec". (escape_bang_in_quoted_argument): Move to "common/common-fork-child.c". (saved_ui): New variable. (prefork_hook): New function. (postfork_hook): Likewise. (postfork_child_hook): Likewise. (gdb_startup_inferior): Likewise. (fork_inferior): Move to "common/common-fork-child.c". Update function to support gdbserver. (startup_inferior): Likewise. * gdbcore.h (get_exec_file): Remove declaration. * gnu-nat.c (gnu_create_inferior): Call "gdb_startup_inferior" instead of "startup_inferior". Call "add_thread_silent" after "fork_inferior". * inf-ptrace.c: Include "nat/fork-inferior.h" and "utils.h". (inf_ptrace_create_inferior): Call "gdb_startup_inferior" instead of "startup_inferior". Call "add_thread_silent" after "fork_inferior". * inferior.h: Include "common-inferior.h". (trace_start_error): Move to "common/common-utils.h". (trace_start_error_with_name): Likewise. (fork_inferior): Move prototype to "nat/fork-inferior.h". (startup_inferior): Likewise. (gdb_startup_inferior): New prototype. * nat/fork-inferior.c: New file, with contents from "fork-child.c". * nat/fork-inferior.h: New file. * procfs.c (procfs_init_inferior): Call "gdb_startup_inferior" instead of "startup_inferior". Call "add_thread_silent" after "fork_inferior". * target.h (target_terminal_init): Move prototype to "target/target.h". (target_terminal_inferior): Likewise. (target_terminal_ours): Likewise. * target/target.h (target_terminal_init): New prototype, moved from "target.h". (target_terminal_inferior): Likewise. (target_terminal_ours): Likewise. * utils.c (gdb_flush_out_err): New function. gdb/gdbserver/ChangeLog: 2017-06-07 Sergio Durigan Junior <sergiodj@redhat.com> Pedro Alves <palves@redhat.com> * Makefile.in (SFILES): Add "nat/fork-inferior.o". * configure: Regenerate. * configure.srv (srv_linux_obj): Add "fork-child.o" and "fork-inferior.o". (i[34567]86-*-lynxos*): Likewise. (spu*-*-*): Likewise. * fork-child.c: New file. * linux-low.c: Include "common-inferior.h", "nat/fork-inferior.h" and "environ.h". (linux_ptrace_fun): New function. (linux_create_inferior): Adjust function prototype to reflect change on "target.h". Adjust function code to use "fork_inferior". (linux_request_interrupt): Delete "signal_pid". * lynx-low.c: Include "common-inferior.h" and "nat/fork-inferior.h". (lynx_ptrace_fun): New function. (lynx_create_inferior): Adjust function prototype to reflect change on "target.h". Adjust function code to use "fork_inferior". * nto-low.c (nto_create_inferior): Adjust function prototype and code to reflect change on "target.h". Update comments. * server.c: Include "common-inferior.h", "nat/fork-inferior.h", "common-terminal.h" and "environ.h". (terminal_fd): Moved to fork-child.c. (old_foreground_pgrp): Likewise. (restore_old_foreground_pgrp): Likewise. (last_status): Make it global. (last_ptid): Likewise. (our_environ): New variable. (startup_with_shell): Likewise. (program_name): Likewise. (program_argv): Rename to... (program_args): ...this. (wrapper_argv): New variable. (start_inferior): Delete function. (get_exec_wrapper): New function. (get_exec_file): Likewise. (get_environ): Likewise. (prefork_hook): Likewise. (post_fork_inferior): Likewise. (postfork_hook): Likewise. (postfork_child_hook): Likewise. (handle_v_run): Update code to deal with arguments coming from the remote host. Update calls from "start_inferior" to "create_inferior". (captured_main): Likewise. Initialize environment variable. Call "have_job_control". * server.h (post_fork_inferior): New prototype. (get_environ): Likewise. (last_status): Declare. (last_ptid): Likewise. (signal_pid): Likewise. * spu-low.c: Include "common-inferior.h" and "nat/fork-inferior.h". (spu_ptrace_fun): New function. (spu_create_inferior): Adjust function prototype to reflect change on "target.h". Adjust function code to use "fork_inferior". * target.c (target_terminal_init): New function. (target_terminal_inferior): Likewise. (target_terminal_ours): Likewise. * target.h: Include <vector>. (struct target_ops) <create_inferior>: Update prototype. (create_inferior): Update macro. * utils.c (gdb_flush_out_err): New function. * win32-low.c (win32_create_inferior): Adjust function prototype and code to reflect change on "target.h". gdb/testsuite/ChangeLog: 2017-06-07 Sergio Durigan Junior <sergiodj@redhat.com> * gdb.server/non-existing-program.exp: Update regex in order to reflect the fact that gdbserver is now using fork_inferior (with a shell) to startup the inferior.
188 lines
4.8 KiB
C
188 lines
4.8 KiB
C
/* Fork a Unix child process, and set up to debug it, for GDB.
|
|
|
|
Copyright (C) 1990-2017 Free Software Foundation, Inc.
|
|
|
|
Contributed by Cygnus Support.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "defs.h"
|
|
#include "inferior.h"
|
|
#include "gdbcmd.h"
|
|
#include "terminal.h"
|
|
#include "gdbthread.h"
|
|
#include "top.h"
|
|
#include "job-control.h"
|
|
#include "filestuff.h"
|
|
#include "nat/fork-inferior.h"
|
|
#include "common/common-inferior.h"
|
|
|
|
/* The exec-wrapper, if any, that will be used when starting the
|
|
inferior. */
|
|
|
|
static char *exec_wrapper = NULL;
|
|
|
|
/* See common/common-inferior.h. */
|
|
|
|
const char *
|
|
get_exec_wrapper ()
|
|
{
|
|
return exec_wrapper;
|
|
}
|
|
|
|
/* See nat/fork-inferior.h. */
|
|
|
|
void
|
|
gdb_flush_out_err ()
|
|
{
|
|
gdb_flush (main_ui->m_gdb_stdout);
|
|
gdb_flush (main_ui->m_gdb_stderr);
|
|
}
|
|
|
|
/* The ui structure that will be saved on 'prefork_hook' and
|
|
restored on 'postfork_hook'. */
|
|
static struct ui *saved_ui = NULL;
|
|
|
|
/* See nat/fork-inferior.h. */
|
|
|
|
void
|
|
prefork_hook (const char *args)
|
|
{
|
|
const char *inferior_io_terminal = get_inferior_io_terminal ();
|
|
|
|
gdb_assert (saved_ui == NULL);
|
|
/* Retain a copy of our UI, since the child will replace this value
|
|
and if we're vforked, we have to restore it. */
|
|
saved_ui = current_ui;
|
|
|
|
/* Tell the terminal handling subsystem what tty we plan to run on;
|
|
it will just record the information for later. */
|
|
new_tty_prefork (inferior_io_terminal);
|
|
}
|
|
|
|
/* See nat/fork-inferior.h. */
|
|
|
|
void
|
|
postfork_hook (pid_t pid)
|
|
{
|
|
struct inferior *inf;
|
|
|
|
if (!have_inferiors ())
|
|
init_thread_list ();
|
|
|
|
inf = current_inferior ();
|
|
|
|
inferior_appeared (inf, pid);
|
|
|
|
/* Needed for wait_for_inferior stuff. */
|
|
inferior_ptid = pid_to_ptid (pid);
|
|
|
|
gdb_assert (saved_ui != NULL);
|
|
current_ui = saved_ui;
|
|
saved_ui = NULL;
|
|
|
|
new_tty_postfork ();
|
|
}
|
|
|
|
/* See nat/fork-inferior.h. */
|
|
|
|
void
|
|
postfork_child_hook ()
|
|
{
|
|
/* This is set to the result of setpgrp, which if vforked, will be
|
|
visible to you in the parent process. It's only used by humans
|
|
for debugging. */
|
|
static int debug_setpgrp = 657473;
|
|
|
|
/* Make sure we switch to main_ui here in order to be able to
|
|
use the fprintf_unfiltered/warning/error functions. */
|
|
current_ui = main_ui;
|
|
|
|
/* Create a new session for the inferior process, if necessary.
|
|
It will also place the inferior in a separate process group. */
|
|
if (create_tty_session () <= 0)
|
|
{
|
|
/* No session was created, but we still want to run the inferior
|
|
in a separate process group. */
|
|
debug_setpgrp = gdb_setpgid ();
|
|
if (debug_setpgrp == -1)
|
|
perror (_("setpgrp failed in child"));
|
|
}
|
|
|
|
/* Ask the tty subsystem to switch to the one we specified
|
|
earlier (or to share the current terminal, if none was
|
|
specified). */
|
|
new_tty ();
|
|
}
|
|
|
|
/* See inferior.h. */
|
|
|
|
ptid_t
|
|
gdb_startup_inferior (pid_t pid, int num_traps)
|
|
{
|
|
ptid_t ptid = startup_inferior (pid, num_traps, NULL, NULL);
|
|
|
|
/* Mark all threads non-executing. */
|
|
set_executing (ptid, 0);
|
|
|
|
return ptid;
|
|
}
|
|
|
|
/* Implement the "unset exec-wrapper" command. */
|
|
|
|
static void
|
|
unset_exec_wrapper_command (char *args, int from_tty)
|
|
{
|
|
xfree (exec_wrapper);
|
|
exec_wrapper = NULL;
|
|
}
|
|
|
|
static void
|
|
show_startup_with_shell (struct ui_file *file, int from_tty,
|
|
struct cmd_list_element *c, const char *value)
|
|
{
|
|
fprintf_filtered (file,
|
|
_("Use of shell to start subprocesses is %s.\n"),
|
|
value);
|
|
}
|
|
|
|
/* Provide a prototype to silence -Wmissing-prototypes. */
|
|
extern initialize_file_ftype _initialize_fork_child;
|
|
|
|
void
|
|
_initialize_fork_child (void)
|
|
{
|
|
add_setshow_filename_cmd ("exec-wrapper", class_run, &exec_wrapper, _("\
|
|
Set a wrapper for running programs.\n\
|
|
The wrapper prepares the system and environment for the new program."),
|
|
_("\
|
|
Show the wrapper for running programs."), NULL,
|
|
NULL, NULL,
|
|
&setlist, &showlist);
|
|
|
|
add_cmd ("exec-wrapper", class_run, unset_exec_wrapper_command,
|
|
_("Disable use of an execution wrapper."),
|
|
&unsetlist);
|
|
|
|
add_setshow_boolean_cmd ("startup-with-shell", class_support,
|
|
&startup_with_shell, _("\
|
|
Set use of shell to start subprocesses. The default is on."), _("\
|
|
Show use of shell to start subprocesses."), NULL,
|
|
NULL,
|
|
show_startup_with_shell,
|
|
&setlist, &showlist);
|
|
}
|