From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 38390 invoked by alias); 8 Mar 2017 05:29:59 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 38054 invoked by uid 89); 8 Mar 2017 05:29:58 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RP_MATCHES_RCVD,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=termios, 2510 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 08 Mar 2017 05:29:55 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 685E861D33; Wed, 8 Mar 2017 05:29:43 +0000 (UTC) Received: from psique.yyz.redhat.com (unused-10-15-17-193.yyz.redhat.com [10.15.17.193]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v285Te89010590; Wed, 8 Mar 2017 00:29:42 -0500 From: Sergio Durigan Junior To: GDB Patches Cc: Pedro Alves , Luis Machado , Sergio Durigan Junior Subject: [PATCH v4 2/5] Share parts of gdb/inflow.c with gdbserver Date: Wed, 08 Mar 2017 05:29:00 -0000 Message-Id: <20170308052931.25398-3-sergiodj@redhat.com> In-Reply-To: <20170308052931.25398-1-sergiodj@redhat.com> References: <20170208032257.15443-1-sergiodj@redhat.com> <20170308052931.25398-1-sergiodj@redhat.com> X-IsSubscribed: yes X-SW-Source: 2017-03/txt/msg00086.txt.bz2 After sharing parts of gdb/terminal.h, it is also needed to share the two functions on gdb/inflow.c that are going to be needed by the fork_inferior sharing. They are 'gdb_setpgid' and the new 'have_job_control'. I've also taken the opportunity to give a more meaningful name to "inflow.c" on common/. Now it is called "job-control.c". gdb/ChangeLog: yyyy-mm-dd Sergio Durigan Junior * Makefile.in (SFILES): Add "common/job-control.c". (COMMON_OBS): Add "common/job-control.o". * common/job-control.c: New file, with contents from "gdb/inflow.c". * inflow.c (gdb_setpgid): Move to "common/common-inflow.c". (_initialize_inflow): Move setting of "job_control" to "handle_job_control". * terminal.h (job_control): Moved to "common/common-terminal.h". gdb/gdbserver/ChangeLog: yyyy-mm-dd Sergio Durigan Junior * Makefile.in: Add rule for "job-control.o". (SFILE): Add "common/job-control.c". (OBS): Add "job-control.o". --- gdb/Makefile.in | 2 + gdb/common/common-terminal.h | 10 +++++ gdb/common/job-control.c | 92 ++++++++++++++++++++++++++++++++++++++++++++ gdb/gdbserver/Makefile.in | 5 +++ gdb/inflow.c | 63 +----------------------------- gdb/terminal.h | 4 -- gdb/utils.c | 4 -- 7 files changed, 111 insertions(+), 69 deletions(-) create mode 100644 gdb/common/job-control.c diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 177c853..6ad03d7 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1210,6 +1210,7 @@ SFILES = \ common/fileio.c \ common/filestuff.c \ common/format.c \ + common/job-control.c \ common/gdb_vecs.c \ common/new-op.c \ common/print-utils.c \ @@ -1638,6 +1639,7 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \ common-agent.o \ common-debug.o \ common-exceptions.o \ + job-control.o \ common-regcache.o \ common-utils.o \ complaints.o \ diff --git a/gdb/common/common-terminal.h b/gdb/common/common-terminal.h index 87a19f0..7a1bcfe 100644 --- a/gdb/common/common-terminal.h +++ b/gdb/common/common-terminal.h @@ -77,6 +77,11 @@ #include +/* Do we have job control? Can be assumed to always be the same + within a given run of GDB. Use in gdb/inflow.c and + common/common-inflow.c. */ +extern int job_control; + extern void new_tty (void); /* NEW_TTY_PREFORK is called before forking a new child process, @@ -113,4 +118,9 @@ extern pid_t create_tty_session (void); if we lack job control. */ extern int gdb_setpgid (void); +/* Determine whether we have job control, and set variable JOB_CONTROL + accordingly. This function must be called before any use of + JOB_CONTROL. */ +extern void have_job_control (void); + #endif /* ! COMMON_TERMINAL_H */ diff --git a/gdb/common/job-control.c b/gdb/common/job-control.c new file mode 100644 index 0000000..14b719e --- /dev/null +++ b/gdb/common/job-control.c @@ -0,0 +1,92 @@ +/* Job control and terminal related functions, for GDB and gdbserver + when running under Unix. + + Copyright (C) 1986-2017 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 . */ + +#include "common-defs.h" +#include "common-terminal.h" + +/* Nonzero if we have job control. */ +int job_control; + +/* Set the process group ID of the inferior. + + Just using job_control only does part of it because setpgid or + setpgrp might not exist on a system without job control. + + For a more clean implementation, in libiberty, put a setpgid which merely + calls setpgrp and a setpgrp which does nothing (any system with job control + will have one or the other). */ + +int +gdb_setpgid (void) +{ + int retval = 0; + + if (job_control) + { +#if defined (HAVE_TERMIOS) || defined (TIOCGPGRP) +#ifdef HAVE_SETPGID + /* The call setpgid (0, 0) is supposed to work and mean the same + thing as this, but on Ultrix 4.2A it fails with EPERM (and + setpgid (getpid (), getpid ()) succeeds). */ + retval = setpgid (getpid (), getpid ()); +#else +#ifdef HAVE_SETPGRP +#ifdef SETPGRP_VOID + retval = setpgrp (); +#else + retval = setpgrp (getpid (), getpid ()); +#endif +#endif /* HAVE_SETPGRP */ +#endif /* HAVE_SETPGID */ +#endif /* defined (HAVE_TERMIOS) || defined (TIOCGPGRP) */ + } + + return retval; +} + +/* See common/common-terminal.h. */ + +void +have_job_control (void) +{ + /* OK, figure out whether we have job control. If neither termios nor + sgtty (i.e. termio or go32), leave job_control 0. */ +#if defined (HAVE_TERMIOS) + /* Do all systems with termios have the POSIX way of identifying job + control? I hope so. */ +#ifdef _POSIX_JOB_CONTROL + job_control = 1; +#else +#ifdef _SC_JOB_CONTROL + job_control = sysconf (_SC_JOB_CONTROL); +#else + job_control = 0; /* Have to assume the worst. */ +#endif /* _SC_JOB_CONTROL */ +#endif /* _POSIX_JOB_CONTROL */ +#endif /* HAVE_TERMIOS */ + +#ifdef HAVE_SGTTY +#ifdef TIOCGPGRP + job_control = 1; +#else + job_control = 0; +#endif /* TIOCGPGRP */ +#endif /* sgtty */ +} diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index 1cccbbf..adbeb16 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -204,6 +204,7 @@ SFILES = \ $(srcdir)/common/environ.c \ $(srcdir)/common/fileio.c \ $(srcdir)/common/filestuff.c \ + $(srcdir)/common/job-control.c \ $(srcdir)/common/gdb_vecs.c \ $(srcdir)/common/new-op.c \ $(srcdir)/common/print-utils.c \ @@ -234,6 +235,7 @@ OBS = \ cleanups.o \ common-debug.o \ common-exceptions.o \ + job-control.o \ common-regcache.o \ common-utils.o \ debug.o \ @@ -778,6 +780,9 @@ format.o: ../common/format.c filestuff.o: ../common/filestuff.c $(COMPILE) $< $(POSTCOMPILE) +job-control.o: ../common/job-control.c + $(COMPILE) $< + $(POSTCOMPILE) agent.o: ../common/agent.c $(COMPILE) $< $(POSTCOMPILE) diff --git a/gdb/inflow.c b/gdb/inflow.c index 7ffa83a..271278d 100644 --- a/gdb/inflow.c +++ b/gdb/inflow.c @@ -803,43 +803,6 @@ create_tty_session (void) #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. - It might be considered misplaced (on the other hand, process groups and - job control are closely related to ttys). - - For a more clean implementation, in libiberty, put a setpgid which merely - calls setpgrp and a setpgrp which does nothing (any system with job control - will have one or the other). */ -int -gdb_setpgid (void) -{ - int retval = 0; - - if (job_control) - { -#if defined (HAVE_TERMIOS) || defined (TIOCGPGRP) -#ifdef HAVE_SETPGID - /* The call setpgid (0, 0) is supposed to work and mean the same - thing as this, but on Ultrix 4.2A it fails with EPERM (and - setpgid (getpid (), getpid ()) succeeds). */ - retval = setpgid (getpid (), getpid ()); -#else -#ifdef HAVE_SETPGRP -#ifdef SETPGRP_VOID - retval = setpgrp (); -#else - retval = setpgrp (getpid (), getpid ()); -#endif -#endif /* HAVE_SETPGRP */ -#endif /* HAVE_SETPGID */ -#endif /* defined (HAVE_TERMIOS) || defined (TIOCGPGRP) */ - } - - return retval; -} - /* Get all the current tty settings (including whether we have a tty at all!). We can't do this in _initialize_inflow because serial_fdopen() won't work until the serial_ops_list is @@ -860,30 +823,8 @@ _initialize_inflow (void) terminal_is_ours = 1; - /* OK, figure out whether we have job control. If neither termios nor - sgtty (i.e. termio or go32), leave job_control 0. */ - -#if defined (HAVE_TERMIOS) - /* Do all systems with termios have the POSIX way of identifying job - control? I hope so. */ -#ifdef _POSIX_JOB_CONTROL - job_control = 1; -#else -#ifdef _SC_JOB_CONTROL - job_control = sysconf (_SC_JOB_CONTROL); -#else - job_control = 0; /* Have to assume the worst. */ -#endif /* _SC_JOB_CONTROL */ -#endif /* _POSIX_JOB_CONTROL */ -#endif /* HAVE_TERMIOS */ - -#ifdef HAVE_SGTTY -#ifdef TIOCGPGRP - job_control = 1; -#else - job_control = 0; -#endif /* TIOCGPGRP */ -#endif /* sgtty */ + /* OK, figure out whether we have job control. */ + have_job_control (); observer_attach_inferior_exit (inflow_inferior_exit); diff --git a/gdb/terminal.h b/gdb/terminal.h index 438eb40..16628cb 100644 --- a/gdb/terminal.h +++ b/gdb/terminal.h @@ -25,10 +25,6 @@ struct inferior; extern void copy_terminal_info (struct inferior *to, struct inferior *from); -/* Do we have job control? Can be assumed to always be the same within - a given run of GDB. In inflow.c. */ -extern int job_control; - /* Set up a serial structure describing standard input. In inflow.c. */ extern void initialize_stdin_serial (void); diff --git a/gdb/utils.c b/gdb/utils.c index fdb983a..ace2539 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -103,10 +103,6 @@ static std::chrono::steady_clock::duration prompt_for_continue_wait_time; static int debug_timestamp = 0; -/* Nonzero if we have job control. */ - -int job_control; - /* Nonzero means that strings with character values >0x7F should be printed as octal escapes. Zero means just print the value (e.g. it's an international character, and the terminal or window can cope.) */ -- 2.9.3