aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Jung Bauermann <bauerman@br.ibm.com>2008-03-12 14:10:56 +0000
committerThiago Jung Bauermann <bauerman@br.ibm.com>2008-03-12 14:10:56 +0000
commit83116857a35fc5125d098984fae29a549a2b29f3 (patch)
tree345c301a7e13d9bdb1cbd65fb38a0fbe0bf92e26
parent2774f1a679efef2fc5f9f9a445f7c1e904a13225 (diff)
downloadgdb-83116857a35fc5125d098984fae29a549a2b29f3.zip
gdb-83116857a35fc5125d098984fae29a549a2b29f3.tar.gz
gdb-83116857a35fc5125d098984fae29a549a2b29f3.tar.bz2
* configure.ac (AC_CHECK_FUNCS): Add check for setsid.
* config.in, configure: Regenerate. * fork-child.c (fork_inferior): Call create_tty_session. * inflow.c (new_tty): Set controlling terminal with TIOCSCTTY. (create_tty_session): New function. * terminal.h: Declare create_tty_session.
-rw-r--r--gdb/ChangeLog9
-rw-r--r--gdb/config.in3
-rwxr-xr-xgdb/configure3
-rw-r--r--gdb/configure.ac2
-rw-r--r--gdb/fork-child.c14
-rw-r--r--gdb/inflow.c37
-rw-r--r--gdb/terminal.h2
7 files changed, 64 insertions, 6 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5e3bce1..ed3a1bf 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2008-03-12 Thiago Jung Bauermann <bauerman.ibm.com>
+
+ * configure.ac (AC_CHECK_FUNCS): Add check for setsid.
+ * config.in, configure: Regenerate.
+ * fork-child.c (fork_inferior): Call create_tty_session.
+ * inflow.c (new_tty): Set controlling terminal with TIOCSCTTY.
+ (create_tty_session): New function.
+ * terminal.h: Declare create_tty_session.
+
2008-03-12 Alan Modra <amodra@bigpond.net.au>
PR 5900
diff --git a/gdb/config.in b/gdb/config.in
index b6aba7d..fd83c62 100644
--- a/gdb/config.in
+++ b/gdb/config.in
@@ -278,6 +278,9 @@
/* Define to 1 if you have the `setpgrp' function. */
#undef HAVE_SETPGRP
+/* Define to 1 if you have the `setsid' function. */
+#undef HAVE_SETSID
+
/* Define to 1 if you have the <sgtty.h> header file. */
#undef HAVE_SGTTY_H
diff --git a/gdb/configure b/gdb/configure
index 5faaeba..b4930c4 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -18503,7 +18503,8 @@ done
-for ac_func in setpgid setpgrp
+
+for ac_func in setpgid setpgrp setsid
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 2f1c33b..fcc3513 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -603,7 +603,7 @@ AC_CHECK_FUNCS(getuid getgid)
AC_CHECK_FUNCS(poll)
AC_CHECK_FUNCS(pread64)
AC_CHECK_FUNCS(sbrk)
-AC_CHECK_FUNCS(setpgid setpgrp)
+AC_CHECK_FUNCS(setpgid setpgrp setsid)
AC_CHECK_FUNCS(sigaction sigprocmask sigsetmask)
AC_CHECK_FUNCS(socketpair)
AC_CHECK_FUNCS(syscall)
diff --git a/gdb/fork-child.c b/gdb/fork-child.c
index cbde5db..c8e7683 100644
--- a/gdb/fork-child.c
+++ b/gdb/fork-child.c
@@ -303,10 +303,16 @@ fork_inferior (char *exec_file_arg, char *allargs, char **env,
if (debug_fork)
sleep (debug_fork);
- /* Run inferior in a separate process group. */
- debug_setpgrp = gdb_setpgid ();
- if (debug_setpgrp == -1)
- perror ("setpgrp failed in child");
+ /* 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
diff --git a/gdb/inflow.c b/gdb/inflow.c
index f7bf7d1..d003a98 100644
--- a/gdb/inflow.c
+++ b/gdb/inflow.c
@@ -557,6 +557,16 @@ new_tty (void)
close (2);
dup (tty);
}
+
+#ifdef TIOCSCTTY
+ /* Make tty our new controlling terminal. */
+ if (ioctl (tty, TIOCSCTTY, 0) == -1)
+ /* Mention GDB in warning because it will appear in the inferior's
+ terminal instead of GDB's. */
+ warning ("GDB: Failed to set controlling terminal: %s",
+ safe_strerror (errno));
+#endif
+
if (tty > 2)
close (tty);
#endif /* !go32 && !win32 */
@@ -683,6 +693,33 @@ clear_sigio_trap (void)
#endif /* No SIGIO. */
+/* Create a new session if the inferior will run in a different tty.
+ A session is UNIX's way of grouping processes that share a controlling
+ terminal, so a new one is needed if the inferior terminal will be
+ different from GDB's.
+
+ Returns the session id of the new session, 0 if no session was created
+ or -1 if an error occurred. */
+pid_t
+create_tty_session (void)
+{
+#ifdef HAVE_SETSID
+ pid_t ret;
+
+ if (!job_control || inferior_thisrun_terminal == 0)
+ return 0;
+
+ ret = setsid ();
+ if (ret == -1)
+ warning ("Failed to create new terminal session: setsid: %s",
+ safe_strerror (errno));
+
+ return ret;
+#else
+ return 0;
+#endif /* HAVE_SETSID */
+}
+
/* This is here because this is where we figure out whether we (probably)
have job control. Just using job_control only does part of it because
setpgid or setpgrp might not exist on a system without job control.
diff --git a/gdb/terminal.h b/gdb/terminal.h
index 911a23a..743be6c 100644
--- a/gdb/terminal.h
+++ b/gdb/terminal.h
@@ -82,6 +82,8 @@ extern void new_tty (void);
a given run of GDB. In inflow.c. */
extern int job_control;
+extern int create_tty_session (void);
+
/* Set the process group of the caller to its own pid, or do nothing if
we lack job control. */
extern int gdb_setpgid (void);