binutils-gdb/gdb/inf-child.c
Pedro Alves e671cd59d7 Per-inferior target_terminal state, fix PR gdb/13211, more
In my multi-target branch I ran into problems with GDB's terminal
handling that exist in master as well, with multi-inferior debugging.

This patch adds a testcase for said problems
(gdb.multi/multi-term-settings.exp), fixes the problems, fixes PR
gdb/13211 as well (and adds a testcase for that too,
gdb.base/interrupt-daemon.exp).

The basis of the problem I ran into is the following.  Consider a
scenario where you have:

 - inferior 1 - started with "attach", process is running on some
   other terminal.

 - inferior 2 - started with "run", process is sharing gdb's terminal.

In this scenario, when you stop/resume both inferiors, you want GDB to
save/restore the terminal settings of inferior 2, the one that is
sharing GDB's terminal.  I.e., you want inferior 2 to "own" the
terminal (in target_terminal::is_ours/target_terminal::is_inferior
sense).

Unfortunately, that's not what you get currently.  Because GDB doesn't
know whether an attached inferior is actually sharing GDB's terminal,
it tries to save/restore its settings anyway, ignoring errors.  In
this case, this is pointless, because inferior 1 is running on a
different terminal, but GDB doesn't know better.

And then, because it is only possible to have the terminal settings of
a single inferior be in effect at a time, or make one inferior/pgrp be
the terminal's foreground pgrp (aka, only one inferior can "own" the
terminal, ignoring fork children here), if GDB happens to try to
restore the terminal settings of inferior 1 first, then GDB never
restores the terminal settings of inferior 2.

This patch fixes that and a few things more along the way:

 - Moves enum target_terminal::terminal_state out of the
   target_terminal class (it's currently private) and makes it a
   scoped enum so that it can be easily used elsewhere.

 - Replaces the inflow.c:terminal_is_ours boolean with a
   target_terminal_state variable.  This allows distinguishing is_ours
   and is_ours_for_output states.  This allows finally making
   child_terminal_ours_1 do something with its "output_only"
   parameter.

 - Makes each inferior have its own copy of the
   is_ours/is_ours_for_output/is_inferior state.

 - Adds a way for GDB to tell whether the inferior is sharing GDB's
   terminal.  Works best on Linux and Solaris; the fallback works just
   as well as currently.

 - With that, we can remove the inf->attach_flag tests from
   child_terminal_inferior/child_terminal_ours.

 - Currently target_ops.to_ours is responsible for both saving the
   current inferior's terminal state, and restoring gdb's state.
   Because each inferior has its own terminal state (possibly handled
   by different targets in a multi-target world, even), we need to
   split the inferior-saving part from the gdb-restoring part.  The
   patch adds a new target_ops.to_save_inferior target method for
   that.

 - Adds a new target_terminal::save_inferior() function, so that
   sequences like:

     scoped_restore_terminal_state save_state;
     target_terminal::ours_for_output ();

   ... restore back inferiors that were
   target_terminal_state::is_inferior before back to is_inferior, and
   leaves inferiors that were is_ours alone.

 - Along the way, this adds a default implementation of
   target_pass_ctrlc to inflow.c (for inf-child.c), that handles
   passing the Ctrl-C to a process running on GDB's terminal or to
   some other process otherwise.

 - Similarly, adds a new target default implementation of
   target_interrupt, for the "interrupt" command.  The current
   implementation of this hook in inf-ptrace.c kills the whole process
   group, but that's incorrect/undesirable because we may not be
   attached to all processes in the process group.  And also, it's
   incorrect because inferior_process_group() doesn't really return
   the inferior's real process group id if the inferior is not a
   process group leader...  This is the cause of PR gdb/13211 [1],
   which this patch fixes.  While at it, that target method's "ptid"
   parameter is eliminated, because it's not really used.

 - A new test is included that exercises and fixes PR gdb/13211, and
   also fixes a GDB issue reported on stackoverflow that I ran into
   while working on this [2].  The problem is similar to PR gdb/13211,
   except that it also triggers with Ctrl-C.  When debugging a daemon
   (i.e., a process that disconnects from the controlling terminal and
   is not a process group leader, then Ctrl-C doesn't work, you just
   can't interrupt the inferior at all, resulting in a hung debug
   session.  The problem is that since the inferior is no longer
   associated with gdb's session / controlling terminal, then trying
   to put the inferior in the foreground fails.  And so Ctrl-C never
   reaches the inferior directly.  pass_signal is only used when the
   inferior is attached, but that is not the case here.  This is fixed
   by the new child_pass_ctrlc.  Without the fix, the new
   interrupt-daemon.exp testcase fails with timeout waiting for a
   SIGINT that never arrives.

[1] PR gdb/13211 - Async / Process group and interrupt not working
https://sourceware.org/bugzilla/show_bug.cgi?id=13211

[2] GDB not reacting Ctrl-C when after fork() and setsid()
https://stackoverflow.com/questions/46101292/gdb-not-reacting-ctrl-c-when-after-fork-and-setsid

Note this patch does _not_ fix:

 - PR gdb/14559 - The 'interrupt' command does not work if sigwait is in use
   https://sourceware.org/bugzilla/show_bug.cgi?id=14559

 - PR gdb/9425 - When using "sigwait" GDB doesn't trap SIGINT. Ctrl+C terminates program when should break gdb.
   https://sourceware.org/bugzilla/show_bug.cgi?id=9425

The only way to fix that that I know of (without changing the kernel)
is to make GDB put inferiors in a separate session (create a
pseudo-tty master/slave pair, make the inferior run with the slave as
its terminal, and have gdb pump output/input on the master end).

gdb/ChangeLog:
2018-01-30  Pedro Alves  <palves@redhat.com>

	PR gdb/13211
	* config.in, configure: Regenerate.
	* configure.ac: Check for getpgid.
	* go32-nat.c (go32_pass_ctrlc): New.
	(go32_target): Install it.
	* inf-child.c (inf_child_target): Install
	child_terminal_save_inferior, child_pass_ctrlc and
	child_interrupt.
	* inf-ptrace.c (inf_ptrace_interrupt): Delete.
	(inf_ptrace_target): No longer install it.
	* infcmd.c (interrupt_target_1): Adjust.
	* inferior.h (child_terminal_save_inferior, child_pass_ctrlc)
	(child_interrupt): Declare.
	(inferior::terminal_state): New.
	* inflow.c (struct terminal_info): Update comments.
	(inferior_process_group): Delete.
	(terminal_is_ours): Delete.
	(gdb_tty_state): New.
	(child_terminal_init): Adjust.
	(is_gdb_terminal, sharing_input_terminal_1)
	(sharing_input_terminal): New functions.
	(child_terminal_inferior): Adjust.  Use sharing_input_terminal.
	Set the process's actual process group in the foreground if
	possible.  Handle is_ours_for_output/is_ours distinction.  Don't
	mark terminal as the inferior's if not sharing GDB's terminal.
	Don't check attach_flag.
	(child_terminal_ours_for_output, child_terminal_ours): Adjust to
	pass down a target_terminal_state.
	(child_terminal_save_inferior): New, factored out from ...
	(child_terminal_ours_1): ... this.  Handle
	target_terminal_state::is_ours_for_output.
	(child_interrupt, child_pass_ctrlc): New.
	(inflow_inferior_exit): Clear the inferior's terminal_state.
	(copy_terminal_info): Copy the inferior's terminal state.
	(_initialize_inflow): Remove reference to terminal_is_ours.
	* inflow.h (inferior_process_group): Delete.
	* nto-procfs.c (nto_handle_sigint, procfs_interrupt): Adjust.
	* procfs.c (procfs_target): Don't install procfs_interrupt.
	(procfs_interrupt): Delete.
	* remote.c (remote_serial_quit_handler): Adjust.
	(remote_interrupt): Remove ptid parameter.  Adjust.
	* target-delegates.c: Regenerate.
	* target.c: Include "terminal.h".
	(target_terminal::terminal_state): Rename to ...
	(target_terminal::m_terminal_state): ... this.
	(target_terminal::init): Adjust.
	(target_terminal::inferior): Adjust to per-inferior
	terminal_state.
	(target_terminal::restore_inferior, target_terminal_is_ours_kind): New.
	(target_terminal::ours, target_terminal::ours_for_output): Use
	target_terminal_is_ours_kind.
	(target_interrupt): Remove ptid parameter.  Adjust.
	(default_target_pass_ctrlc): Adjust.
	* target.h (target_ops::to_terminal_save_inferior): New field.
	(target_ops::to_interrupt): Remove ptid_t parameter.
	(target_interrupt): Remove ptid_t parameter.  Update comment.
	(target_pass_ctrlc): Update comment.
	* target/target.h (target_terminal_state): New scoped enum,
	factored out of ...
	(target_terminal::terminal_state): ... here.
	(target_terminal::inferior): Update comments.
	(target_terminal::restore_inferior): New.
	(target_terminal::is_inferior, target_terminal::is_ours)
	(target_terminal::is_ours_for_output): Adjust.
	(target_terminal::scoped_restore_terminal_state): Adjust to
	rename, and call restore_inferior() instead of inferior().
	(target_terminal::scoped_restore_terminal_state::m_state): Change
	type.
	(target_terminal::terminal_state): Rename to ...
	(target_terminal::m_terminal_state): ... this and change type.

gdb/gdbserver/ChangeLog:
2018-01-30  Pedro Alves  <palves@redhat.com>

	PR gdb/13211
	* target.c (target_terminal::terminal_state): Rename to ...
	(target_terminal::m_terminal_state): ... this.

gdb/testsuite/ChangeLog:
2018-01-30  Pedro Alves  <palves@redhat.com>

	PR gdb/13211
	* gdb.base/interrupt-daemon.c: New.
	* gdb.base/interrupt-daemon.exp: New.
	* gdb.multi/multi-term-settings.c: New.
	* gdb.multi/multi-term-settings.exp: New.
2018-01-30 14:55:18 +00:00

448 lines
11 KiB
C

/* Base/prototype target for default child (native) targets.
Copyright (C) 1988-2018 Free Software Foundation, Inc.
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/>. */
/* This file provides a common base class/target that all native
target implementations extend, by calling inf_child_target to get a
new prototype target and then overriding target methods as
necessary. */
#include "defs.h"
#include "regcache.h"
#include "memattr.h"
#include "symtab.h"
#include "target.h"
#include "inferior.h"
#include <sys/stat.h>
#include "inf-child.h"
#include "fileio.h"
#include "agent.h"
#include "gdb_wait.h"
#include "filestuff.h"
#include <sys/types.h>
#include <fcntl.h>
#include <unistd.h>
/* A pointer to what is returned by inf_child_target. Used by
inf_child_open to push the most-derived target in reaction to
"target native". */
static struct target_ops *inf_child_ops = NULL;
/* Helper function for child_wait and the derivatives of child_wait.
HOSTSTATUS is the waitstatus from wait() or the equivalent; store our
translation of that in OURSTATUS. */
void
store_waitstatus (struct target_waitstatus *ourstatus, int hoststatus)
{
if (WIFEXITED (hoststatus))
{
ourstatus->kind = TARGET_WAITKIND_EXITED;
ourstatus->value.integer = WEXITSTATUS (hoststatus);
}
else if (!WIFSTOPPED (hoststatus))
{
ourstatus->kind = TARGET_WAITKIND_SIGNALLED;
ourstatus->value.sig = gdb_signal_from_host (WTERMSIG (hoststatus));
}
else
{
ourstatus->kind = TARGET_WAITKIND_STOPPED;
ourstatus->value.sig = gdb_signal_from_host (WSTOPSIG (hoststatus));
}
}
/* Fetch register REGNUM from the inferior. If REGNUM is -1, do this
for all registers. */
static void
inf_child_fetch_inferior_registers (struct target_ops *ops,
struct regcache *regcache, int regnum)
{
if (regnum == -1)
{
for (regnum = 0;
regnum < gdbarch_num_regs (regcache->arch ());
regnum++)
regcache_raw_supply (regcache, regnum, NULL);
}
else
regcache_raw_supply (regcache, regnum, NULL);
}
/* Store register REGNUM back into the inferior. If REGNUM is -1, do
this for all registers (including the floating point registers). */
static void
inf_child_store_inferior_registers (struct target_ops *ops,
struct regcache *regcache, int regnum)
{
}
static void
inf_child_post_attach (struct target_ops *self, int pid)
{
/* This target doesn't require a meaningful "post attach" operation
by a debugger. */
}
/* 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 that registers contains all the registers from the
program being debugged. */
static void
inf_child_prepare_to_store (struct target_ops *self,
struct regcache *regcache)
{
}
/* True if the user did "target native". In that case, we won't
unpush the child target automatically when the last inferior is
gone. */
static int inf_child_explicitly_opened;
/* See inf-child.h. */
void
inf_child_open_target (struct target_ops *target, const char *arg,
int from_tty)
{
target_preopen (from_tty);
push_target (target);
inf_child_explicitly_opened = 1;
if (from_tty)
printf_filtered ("Done. Use the \"run\" command to start a process.\n");
}
static void
inf_child_open (const char *arg, int from_tty)
{
inf_child_open_target (inf_child_ops, arg, from_tty);
}
/* Implement the to_disconnect target_ops method. */
static void
inf_child_disconnect (struct target_ops *target, const char *args, int from_tty)
{
if (args != NULL)
error (_("Argument given to \"disconnect\"."));
/* This offers to detach/kill current inferiors, and then pops all
targets. */
target_preopen (from_tty);
}
/* Implement the to_close target_ops method. */
static void
inf_child_close (struct target_ops *target)
{
/* In case we were forcibly closed. */
inf_child_explicitly_opened = 0;
}
void
inf_child_mourn_inferior (struct target_ops *ops)
{
generic_mourn_inferior ();
inf_child_maybe_unpush_target (ops);
}
/* See inf-child.h. */
void
inf_child_maybe_unpush_target (struct target_ops *ops)
{
if (!inf_child_explicitly_opened && !have_inferiors ())
unpush_target (ops);
}
static void
inf_child_post_startup_inferior (struct target_ops *self, ptid_t ptid)
{
/* This target doesn't require a meaningful "post startup inferior"
operation by a debugger. */
}
static int
inf_child_follow_fork (struct target_ops *ops, int follow_child,
int detach_fork)
{
/* This target doesn't support following fork or vfork events. */
return 0;
}
static int
inf_child_can_run (struct target_ops *self)
{
return 1;
}
static char *
inf_child_pid_to_exec_file (struct target_ops *self, int pid)
{
/* This target doesn't support translation of a process ID to the
filename of the executable file. */
return NULL;
}
/* Implementation of to_fileio_open. */
static int
inf_child_fileio_open (struct target_ops *self,
struct inferior *inf, const char *filename,
int flags, int mode, int warn_if_slow,
int *target_errno)
{
int nat_flags;
mode_t nat_mode;
int fd;
if (fileio_to_host_openflags (flags, &nat_flags) == -1
|| fileio_to_host_mode (mode, &nat_mode) == -1)
{
*target_errno = FILEIO_EINVAL;
return -1;
}
fd = gdb_open_cloexec (filename, nat_flags, nat_mode);
if (fd == -1)
*target_errno = host_to_fileio_error (errno);
return fd;
}
/* Implementation of to_fileio_pwrite. */
static int
inf_child_fileio_pwrite (struct target_ops *self,
int fd, const gdb_byte *write_buf, int len,
ULONGEST offset, int *target_errno)
{
int ret;
#ifdef HAVE_PWRITE
ret = pwrite (fd, write_buf, len, (long) offset);
#else
ret = -1;
#endif
/* If we have no pwrite or it failed for this file, use lseek/write. */
if (ret == -1)
{
ret = lseek (fd, (long) offset, SEEK_SET);
if (ret != -1)
ret = write (fd, write_buf, len);
}
if (ret == -1)
*target_errno = host_to_fileio_error (errno);
return ret;
}
/* Implementation of to_fileio_pread. */
static int
inf_child_fileio_pread (struct target_ops *self,
int fd, gdb_byte *read_buf, int len,
ULONGEST offset, int *target_errno)
{
int ret;
#ifdef HAVE_PREAD
ret = pread (fd, read_buf, len, (long) offset);
#else
ret = -1;
#endif
/* If we have no pread or it failed for this file, use lseek/read. */
if (ret == -1)
{
ret = lseek (fd, (long) offset, SEEK_SET);
if (ret != -1)
ret = read (fd, read_buf, len);
}
if (ret == -1)
*target_errno = host_to_fileio_error (errno);
return ret;
}
/* Implementation of to_fileio_fstat. */
static int
inf_child_fileio_fstat (struct target_ops *self, int fd,
struct stat *sb, int *target_errno)
{
int ret;
ret = fstat (fd, sb);
if (ret == -1)
*target_errno = host_to_fileio_error (errno);
return ret;
}
/* Implementation of to_fileio_close. */
static int
inf_child_fileio_close (struct target_ops *self, int fd, int *target_errno)
{
int ret;
ret = close (fd);
if (ret == -1)
*target_errno = host_to_fileio_error (errno);
return ret;
}
/* Implementation of to_fileio_unlink. */
static int
inf_child_fileio_unlink (struct target_ops *self,
struct inferior *inf, const char *filename,
int *target_errno)
{
int ret;
ret = unlink (filename);
if (ret == -1)
*target_errno = host_to_fileio_error (errno);
return ret;
}
/* Implementation of to_fileio_readlink. */
static char *
inf_child_fileio_readlink (struct target_ops *self,
struct inferior *inf, const char *filename,
int *target_errno)
{
/* We support readlink only on systems that also provide a compile-time
maximum path length (PATH_MAX), at least for now. */
#if defined (PATH_MAX)
char buf[PATH_MAX];
int len;
char *ret;
len = readlink (filename, buf, sizeof buf);
if (len < 0)
{
*target_errno = host_to_fileio_error (errno);
return NULL;
}
ret = (char *) xmalloc (len + 1);
memcpy (ret, buf, len);
ret[len] = '\0';
return ret;
#else
*target_errno = FILEIO_ENOSYS;
return NULL;
#endif
}
static int
inf_child_use_agent (struct target_ops *self, int use)
{
if (agent_loaded_p ())
{
use_agent = use;
return 1;
}
else
return 0;
}
static int
inf_child_can_use_agent (struct target_ops *self)
{
return agent_loaded_p ();
}
/* Default implementation of the to_can_async_p and
to_supports_non_stop methods. */
static int
return_zero (struct target_ops *ignore)
{
return 0;
}
struct target_ops *
inf_child_target (void)
{
struct target_ops *t = XCNEW (struct target_ops);
t->to_shortname = "native";
t->to_longname = "Native process";
t->to_doc = "Native process (started by the \"run\" command).";
t->to_open = inf_child_open;
t->to_close = inf_child_close;
t->to_disconnect = inf_child_disconnect;
t->to_post_attach = inf_child_post_attach;
t->to_fetch_registers = inf_child_fetch_inferior_registers;
t->to_store_registers = inf_child_store_inferior_registers;
t->to_prepare_to_store = inf_child_prepare_to_store;
t->to_insert_breakpoint = memory_insert_breakpoint;
t->to_remove_breakpoint = memory_remove_breakpoint;
t->to_terminal_init = child_terminal_init;
t->to_terminal_inferior = child_terminal_inferior;
t->to_terminal_save_inferior = child_terminal_save_inferior;
t->to_terminal_ours_for_output = child_terminal_ours_for_output;
t->to_terminal_ours = child_terminal_ours;
t->to_terminal_info = child_terminal_info;
t->to_pass_ctrlc = child_pass_ctrlc;
t->to_interrupt = child_interrupt;
t->to_post_startup_inferior = inf_child_post_startup_inferior;
t->to_follow_fork = inf_child_follow_fork;
t->to_can_run = inf_child_can_run;
/* We must default these because they must be implemented by any
target that can run. */
t->to_can_async_p = return_zero;
t->to_supports_non_stop = return_zero;
t->to_pid_to_exec_file = inf_child_pid_to_exec_file;
t->to_stratum = process_stratum;
t->to_has_all_memory = default_child_has_all_memory;
t->to_has_memory = default_child_has_memory;
t->to_has_stack = default_child_has_stack;
t->to_has_registers = default_child_has_registers;
t->to_has_execution = default_child_has_execution;
t->to_fileio_open = inf_child_fileio_open;
t->to_fileio_pwrite = inf_child_fileio_pwrite;
t->to_fileio_pread = inf_child_fileio_pread;
t->to_fileio_fstat = inf_child_fileio_fstat;
t->to_fileio_close = inf_child_fileio_close;
t->to_fileio_unlink = inf_child_fileio_unlink;
t->to_fileio_readlink = inf_child_fileio_readlink;
t->to_magic = OPS_MAGIC;
t->to_use_agent = inf_child_use_agent;
t->to_can_use_agent = inf_child_can_use_agent;
/* Store a pointer so we can push the most-derived target from
inf_child_open. */
inf_child_ops = t;
return t;
}