96d7229d2a
gdbserver use it. gdb/ * Makefile.in (HFILES_NO_SRCDIR): Add nat/linux-nat.h and nat/linux-waitpid.h. (linux-waitpid.o): New object file rule. * common/linux-ptrace.c: Include nat/linux-waitpid.h. (current_ptrace_options): Moved from linux-nat.c. (linux_ptrace_test_ret_to_nx): Use type casts for ptrace parameters. (linux_fork_to_function): New function. (linux_grandchild_function): Likewise. (linux_child_function): Likewise. (linux_check_ptrace_features): New function, heavily based on linux-nat.c:linux_test_for_tracefork. (linux_enable_event_reporting): New function. (ptrace_supports_feature): Likewise. (linux_supports_tracefork): Likewise. (linux_supports_traceclone): Likewise. (linux_supports_tracevforkdone): Likewise. (linux_supports_tracesysgood): Likewise. * common/linux-ptrace.h (HAS_NOMMU): Moved from gdbserver/linux-low.c. (linux_enable_event_reporting): New declaration. (linux_supports_tracefork): Likewise. (linux_supports_traceclone): Likewise. (linux_supports_tracevforkdone): Likewise. (linux_supports_tracesysgood): Likewise. * config.in (PTRACE_TYPE_ARG4): Regenerate. * config/aarch64/linux.mh (NATDEPFILES): Add linux-waitpid.o. * config/alpha/alpha-linux.mh (NATDEPFILES): Likewise. * config/arm/linux.mh (NATDEPFILES): Likewise. * config/i386/linux.mh (NATDEPFILES): Likewise. * config/i386/linux64.mh (NATDEPFILES): Likewise. * config/ia64/linux.mh (NATDEPFILES): Likewise. * config/m32r/linux.mh (NATDEPFILES): Likewise. * config/m68k/linux.mh (NATDEPFILES): Likewise. * config/mips/linux.mh (NATDEPFILES): Likewise. * config/pa/linux.mh (NATDEPFILES): Likewise.. * config/powerpc/linux.mh (NATDEPFILES): Likewise.. * config/powerpc/ppc64-linux.mh (NATDEPFILES): Likewise. * config/powerpc/spu-linux.mh (NATDEPFILES): Likewise. * config/sparc/linux.mh (NATDEPFILES): Likewise. * config/sparc/linux64.mh (NATDEPFILES): Likewise. * config/tilegx/linux.mh (NATDEPFILES): Likewise. * config/xtensa/linux.mh (NATDEPFILES): Likewise. * configure.ac (AC_CACHE_CHECK): Add void * to the list of ptrace's 4th argument's types. Check the type of PTRACE_TYPE_ARG4. * configure: Regenerate. * linux-nat.c: Include nat/linux-nat.h and nat/linux-waitpid.h. (SYSCALL_SIGTRAP): Moved to nat/linux-nat.h. (linux_supports_tracefork_flag): Remove. (linux_supports_tracesysgood_flag): Likewise. (linux_supports_tracevforkdone_flag): Likewise. (current_ptrace_options): Moved to common/linux-ptrace.c. (linux_tracefork_child): Remove. (my_waitpid): Remove. (linux_test_for_tracefork): Renamed to linux_check_ptrace_features and moved to common/linux-ptrace.c. (linux_test_for_tracesysgood): Remove. (linux_supports_tracesysgood): Remove. (linux_supports_tracefork): Remove. (linux_supports_tracevforkdone): Remove. (linux_enable_tracesysgood): Remove. (linux_enable_event_reporting): Remove. (linux_init_ptrace): New function. (linux_child_post_attach): Call linux_init_ptrace. (linux_child_post_startup_inferior): Call linux_init_ptrace. (linux_child_follow_fork): Call linux_supports_tracefork and linux_supports_tracevforkdone. (linux_child_insert_fork_catchpoint): Call linux_supports_tracefork. (linux_child_insert_vfork_catchpoint): Likewise. (linux_child_set_syscall_catchpoint): Call linux_supports_tracesysgood. (lin_lwp_attach_lwp): Call linux_supports_tracefork. * nat/linux-nat.h: New file. * nat/linux-waitpid.c: New file. * nat/linux-waitpid.h: New file. gdb/gdbserver/ * Makefile.in: Explain why ../target and ../nat are not listed as include file search paths. (linux-waitpid.o): New object file rule. * configure.srv (srv_native_linux_obj): New variable. Replace all occurrences of linux native object files with $srv_native_linux_obj. * linux-low.c: Include nat/linux-nat.h and nat/linux-waitpid.h. (HAS_NOMMU): Move defining logic to common/linux-ptrace.c. (linux_enable_event_reporting): Remove declaration. (my_waitpid): Moved to common/linux-waitpid.c. (linux_wait_for_event): Pass ptid when calling linux_enable_event_reporting. (linux_supports_tracefork_flag): Remove. (linux_enable_event_reporting): Likewise. (linux_tracefork_grandchild): Remove. (STACK_SIZE): Moved to common/linux-ptrace.c. (linux_tracefork_child): Remove. (linux_test_for_tracefork): Remove. (linux_look_up_symbols): Call linux_supports_traceclone. (initialize_low): Remove call to linux_test_for_tracefork. * linux-low.h (PTRACE_TYPE_ARG3): Move to common/linux-ptrace.h. (PTRACE_TYPE_ARG4): Likewise. Include linux-ptrace.h.
121 lines
2.9 KiB
C
121 lines
2.9 KiB
C
/* Wrapper implementation for waitpid for GNU/Linux (LWP layer).
|
|
|
|
Copyright (C) 2001-2013 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/>. */
|
|
|
|
#ifdef GDBSERVER
|
|
#include "server.h"
|
|
#else
|
|
#include "defs.h"
|
|
#include "signal.h"
|
|
#endif
|
|
|
|
#include "nat/linux-nat.h"
|
|
#include "nat/linux-waitpid.h"
|
|
#include "gdb_wait.h"
|
|
|
|
/* Print debugging output based on the format string FORMAT and
|
|
its parameters. */
|
|
|
|
static inline void
|
|
linux_debug (const char *format, ...)
|
|
{
|
|
#ifdef GDBSERVER
|
|
if (debug_threads)
|
|
{
|
|
va_list args;
|
|
va_start (args, format);
|
|
vfprintf (stderr, format, args);
|
|
fprintf (stderr, "\n");
|
|
va_end (args);
|
|
}
|
|
#else
|
|
/* GDB-specific debugging output. */
|
|
#endif
|
|
}
|
|
|
|
/* Wrapper function for waitpid which handles EINTR, and emulates
|
|
__WALL for systems where that is not available. */
|
|
|
|
int
|
|
my_waitpid (int pid, int *status, int flags)
|
|
{
|
|
int ret, out_errno;
|
|
|
|
linux_debug ("my_waitpid (%d, 0x%x)\n", pid, flags);
|
|
|
|
if (flags & __WALL)
|
|
{
|
|
sigset_t block_mask, org_mask, wake_mask;
|
|
int wnohang;
|
|
|
|
wnohang = (flags & WNOHANG) != 0;
|
|
flags &= ~(__WALL | __WCLONE);
|
|
flags |= WNOHANG;
|
|
|
|
/* Block all signals while here. This avoids knowing about
|
|
LinuxThread's signals. */
|
|
sigfillset (&block_mask);
|
|
sigprocmask (SIG_BLOCK, &block_mask, &org_mask);
|
|
|
|
/* ... except during the sigsuspend below. */
|
|
sigemptyset (&wake_mask);
|
|
|
|
while (1)
|
|
{
|
|
/* Since all signals are blocked, there's no need to check
|
|
for EINTR here. */
|
|
ret = waitpid (pid, status, flags);
|
|
out_errno = errno;
|
|
|
|
if (ret == -1 && out_errno != ECHILD)
|
|
break;
|
|
else if (ret > 0)
|
|
break;
|
|
|
|
if (flags & __WCLONE)
|
|
{
|
|
/* We've tried both flavors now. If WNOHANG is set,
|
|
there's nothing else to do, just bail out. */
|
|
if (wnohang)
|
|
break;
|
|
|
|
linux_debug ("blocking\n");
|
|
|
|
/* Block waiting for signals. */
|
|
sigsuspend (&wake_mask);
|
|
}
|
|
flags ^= __WCLONE;
|
|
}
|
|
|
|
sigprocmask (SIG_SETMASK, &org_mask, NULL);
|
|
}
|
|
else
|
|
{
|
|
do
|
|
ret = waitpid (pid, status, flags);
|
|
while (ret == -1 && errno == EINTR);
|
|
out_errno = errno;
|
|
}
|
|
|
|
linux_debug ("my_waitpid (%d, 0x%x): status(%x), %d\n",
|
|
pid, flags, status ? *status : -1, ret);
|
|
|
|
errno = out_errno;
|
|
return ret;
|
|
}
|