MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gdb: add linux_nat_debug_printf macro

Browse Source 
The debug prints inside linux-nat.c almost all have a prefix that
indicate in which function they are located.  This prefix is an
abbreviation of the function name.  For example, this print is in the
`linux_nat_post_attach_wait` function:

    if (debug_linux_nat)
      fprintf_unfiltered (gdb_stdlog,
                          "LNPAW: Attaching to a stopped process\n");

Over time, the code has changed, things were moved, and many of these
prefixes are not accurate anymore.  Also, unless you know the
linux-nat.c file by heart, it's a bit cryptic what LLR, LNW, RSRL, etc,
all mean.

To address both of these issues, I suggest adding this macro for
printing debug statements, which automatically includes the function
name.  It also includes the `[linux-nat]` prefix to clarify which part
of GDB printed this (I think that, ideally, all debug prints would
include such a tag).

The `__func__` magic symbol is used to get the function name.
Unfortunately, in the case of methods, it only contains the method name,
not the class name.  So we'll get "wait", where I would have liked to
get "linux_nat_target::wait".  But at least with the `[linux-nat]` tag
in the front, it's not really ambiguous.

I've made the macro automatically include the trailing newline, because
it wouldn't make sense to call it twice to print two parts of one line,
the `[linux-nat]` tag would be printed in the middle.

An advantage of this (IMO) is that it's less verbose, we don't have to
check for `if (debug_linux_nat)` everywhere.

Another advantage is that it's easier to customize the output later,
without having to touch all call sites.

Here's an example of what it looks like in the end:

    [linux-nat] linux_nat_wait_1: enter
    [linux-nat] wait: [process -1], [TARGET_WNOHANG]

gdb/ChangeLog:

	* linux-nat.c (linux_nat_debug_printf): New function.
	(linux_nat_debug_printf_1): New macro.  Use throughout the file.

Change-Id: Ifcea3255b91400d3ad093cd0b75d3fac241cb998
This commit is contained in:
Simon Marchi 2020-08-18 22:49:54 -04:00 committed by Simon Marchi
parent 6cdb985c45
commit 9327494e0e
2 changed files with 231 additions and 393 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2020-08-18 Simon Marchi <simon.marchi@efficios.com>
* linux-nat.c (linux_nat_debug_printf): New function.
(linux_nat_debug_printf_1): New macro. Use throughout the file.
2020-08-18 Aaron Merey <amerey@redhat.com> 2020-08-18 Aaron Merey <amerey@redhat.com>
* Makefile.in (DEBUGINFOD_CFLAGS, DEBUGINFOD_LIBS): New variables. * Makefile.in (DEBUGINFOD_CFLAGS, DEBUGINFOD_LIBS): New variables.

471
gdb/linux-nat.c
View File

@ -198,6 +198,27 @@ show_debug_linux_nat (struct ui_file *file, int from_tty,
value); value);
} }
/* Print a debug statement. Should be used through linux_nat_debug_printf. */
static void ATTRIBUTE_PRINTF (2, 3)
linux_nat_debug_printf_1 (const char *func_name, const char *fmt, ...)
{
debug_printf ("[linux-nat] %s: ", func_name);
va_list ap;
va_start (ap, fmt);
debug_vprintf (fmt, ap);
va_end (ap);
debug_printf ("\n");
}
#define linux_nat_debug_printf(fmt, ...) \
do { \
if (debug_linux_nat) \
linux_nat_debug_printf_1 (__func__, fmt, ##__VA_ARGS__); \
} while (0)
struct simple_pid_list struct simple_pid_list
{ {
int pid; int pid;
@ -535,9 +556,7 @@ linux_nat_target::follow_fork (bool follow_child, bool detach_fork)
if (linux_supports_tracevforkdone ()) if (linux_supports_tracevforkdone ())
{ {
if (debug_linux_nat) linux_nat_debug_printf ("waiting for VFORK_DONE on %d",
fprintf_unfiltered (gdb_stdlog,
"LCFF: waiting for VFORK_DONE on %d\n",
parent_pid); parent_pid);
parent_lp->stopped = 1; parent_lp->stopped = 1;
@ -577,10 +596,7 @@ linux_nat_target::follow_fork (bool follow_child, bool detach_fork)
is only the single-step breakpoint at vfork's return is only the single-step breakpoint at vfork's return
point. */ point. */
if (debug_linux_nat) linux_nat_debug_printf ("no VFORK_DONE support, sleeping a bit");
fprintf_unfiltered (gdb_stdlog,
"LCFF: no VFORK_DONE "
"support, sleeping a bit\n");
usleep (10000); usleep (10000);
@ -1030,9 +1046,7 @@ linux_nat_post_attach_wait (ptid_t ptid, int *signalled)
if (linux_proc_pid_is_stopped (pid)) if (linux_proc_pid_is_stopped (pid))
{ {
if (debug_linux_nat) linux_nat_debug_printf ("Attaching to a stopped process");
fprintf_unfiltered (gdb_stdlog,
"LNPAW: Attaching to a stopped process\n");
/* The process is definitely stopped. It is in a job control /* The process is definitely stopped. It is in a job control
stop, unless the kernel predates the TASK_STOPPED / stop, unless the kernel predates the TASK_STOPPED /
@ -1063,18 +1077,15 @@ linux_nat_post_attach_wait (ptid_t ptid, int *signalled)
if (!WIFSTOPPED (status)) if (!WIFSTOPPED (status))
{ {
/* The pid we tried to attach has apparently just exited. */ /* The pid we tried to attach has apparently just exited. */
if (debug_linux_nat) linux_nat_debug_printf ("Failed to stop %d: %s", pid,
fprintf_unfiltered (gdb_stdlog, "LNPAW: Failed to stop %d: %s", status_to_str (status));
pid, status_to_str (status));
return status; return status;
} }
if (WSTOPSIG (status) != SIGSTOP) if (WSTOPSIG (status) != SIGSTOP)
{ {
*signalled = 1; *signalled = 1;
if (debug_linux_nat) linux_nat_debug_printf ("Received %s after attaching",
fprintf_unfiltered (gdb_stdlog,
"LNPAW: Received %s after attaching\n",
status_to_str (status)); status_to_str (status));
} }
@ -1125,13 +1136,10 @@ attach_proc_task_lwp_callback (ptid_t ptid)
if (err == ESRCH if (err == ESRCH
|| (err == EPERM && linux_proc_pid_is_gone (lwpid))) || (err == EPERM && linux_proc_pid_is_gone (lwpid)))
{ {
if (debug_linux_nat) linux_nat_debug_printf
{ ("Cannot attach to lwp %d: thread is gone (%d: %s)",
fprintf_unfiltered (gdb_stdlog,
"Cannot attach to lwp %d: "
"thread is gone (%d: %s)\n",
lwpid, err, safe_strerror (err)); lwpid, err, safe_strerror (err));
}
} }
else else
{ {
@ -1144,9 +1152,7 @@ attach_proc_task_lwp_callback (ptid_t ptid)
} }
else else
{ {
if (debug_linux_nat) linux_nat_debug_printf ("PTRACE_ATTACH %s, 0, 0 (OK)",
fprintf_unfiltered (gdb_stdlog,
"PTRACE_ATTACH %s, 0, 0 (OK)\n",
target_pid_to_str (ptid).c_str ()); target_pid_to_str (ptid).c_str ());
lp = add_lwp (ptid); lp = add_lwp (ptid);
@ -1249,9 +1255,7 @@ linux_nat_target::attach (const char *args, int from_tty)
/* Save the wait status to report later. */ /* Save the wait status to report later. */
lp->resumed = 1; lp->resumed = 1;
if (debug_linux_nat) linux_nat_debug_printf ("waitpid %ld, saving status %s",
fprintf_unfiltered (gdb_stdlog,
"LNA: waitpid %ld, saving status %s\n",
(long) lp->ptid.pid (), status_to_str (status)); (long) lp->ptid.pid (), status_to_str (status));
lp->status = status; lp->status = status;
@ -1331,25 +1335,18 @@ get_detach_signal (struct lwp_info *lp)
if (signo == GDB_SIGNAL_0) if (signo == GDB_SIGNAL_0)
{ {
if (debug_linux_nat) linux_nat_debug_printf ("lwp %s has no pending signal",
fprintf_unfiltered (gdb_stdlog,
"GPT: lwp %s has no pending signal\n",
target_pid_to_str (lp->ptid).c_str ()); target_pid_to_str (lp->ptid).c_str ());
} }
else if (!signal_pass_state (signo)) else if (!signal_pass_state (signo))
{ {
if (debug_linux_nat) linux_nat_debug_printf
fprintf_unfiltered (gdb_stdlog, ("lwp %s had signal %s but it is in no pass state",
"GPT: lwp %s had signal %s, " target_pid_to_str (lp->ptid).c_str (), gdb_signal_to_string (signo));
"but it is in no pass state\n",
target_pid_to_str (lp->ptid).c_str (),
gdb_signal_to_string (signo));
} }
else else
{ {
if (debug_linux_nat) linux_nat_debug_printf ("lwp %s has pending signal %s",
fprintf_unfiltered (gdb_stdlog,
"GPT: lwp %s has pending signal %s\n",
target_pid_to_str (lp->ptid).c_str (), target_pid_to_str (lp->ptid).c_str (),
gdb_signal_to_string (signo)); gdb_signal_to_string (signo));
@ -1371,17 +1368,15 @@ detach_one_lwp (struct lwp_info *lp, int *signo_p)
gdb_assert (lp->status == 0 || WIFSTOPPED (lp->status)); gdb_assert (lp->status == 0 || WIFSTOPPED (lp->status));
if (debug_linux_nat && lp->status) if (lp->status != 0)
fprintf_unfiltered (gdb_stdlog, "DC: Pending %s for %s on detach.\n", linux_nat_debug_printf ("Pending %s for %s on detach.",
strsignal (WSTOPSIG (lp->status)), strsignal (WSTOPSIG (lp->status)),
target_pid_to_str (lp->ptid).c_str ()); target_pid_to_str (lp->ptid).c_str ());
/* If there is a pending SIGSTOP, get rid of it. */ /* If there is a pending SIGSTOP, get rid of it. */
if (lp->signalled) if (lp->signalled)
{ {
if (debug_linux_nat) linux_nat_debug_printf ("Sending SIGCONT to %s",
fprintf_unfiltered (gdb_stdlog,
"DC: Sending SIGCONT to %s\n",
target_pid_to_str (lp->ptid).c_str ()); target_pid_to_str (lp->ptid).c_str ());
kill_lwp (lwpid, SIGCONT); kill_lwp (lwpid, SIGCONT);
@ -1441,13 +1436,10 @@ detach_one_lwp (struct lwp_info *lp, int *signo_p)
safe_strerror (save_errno)); safe_strerror (save_errno));
} }
} }
else if (debug_linux_nat) else
{ linux_nat_debug_printf ("PTRACE_DETACH (%s, %s, 0) (OK)",
fprintf_unfiltered (gdb_stdlog,
"PTRACE_DETACH (%s, %s, 0) (OK)\n",
target_pid_to_str (lp->ptid).c_str (), target_pid_to_str (lp->ptid).c_str (),
strsignal (signo)); strsignal (signo));
}
delete_lwp (lp->ptid); delete_lwp (lp->ptid);
} }
@ -1603,16 +1595,12 @@ resume_lwp (struct lwp_info *lp, int step, enum gdb_signal signo)
if (inf->vfork_child != NULL) if (inf->vfork_child != NULL)
{ {
if (debug_linux_nat) linux_nat_debug_printf ("Not resuming %s (vfork parent)",
fprintf_unfiltered (gdb_stdlog,
"RC: Not resuming %s (vfork parent)\n",
target_pid_to_str (lp->ptid).c_str ()); target_pid_to_str (lp->ptid).c_str ());
} }
else if (!lwp_status_pending_p (lp)) else if (!lwp_status_pending_p (lp))
{ {
if (debug_linux_nat) linux_nat_debug_printf ("Resuming sibling %s, %s, %s",
fprintf_unfiltered (gdb_stdlog,
"RC: Resuming sibling %s, %s, %s\n",
target_pid_to_str (lp->ptid).c_str (), target_pid_to_str (lp->ptid).c_str (),
(signo != GDB_SIGNAL_0 (signo != GDB_SIGNAL_0
? strsignal (gdb_signal_to_host (signo)) ? strsignal (gdb_signal_to_host (signo))
@ -1623,20 +1611,14 @@ resume_lwp (struct lwp_info *lp, int step, enum gdb_signal signo)
} }
else else
{ {
if (debug_linux_nat) linux_nat_debug_printf ("Not resuming sibling %s (has pending)",
fprintf_unfiltered (gdb_stdlog,
"RC: Not resuming sibling %s (has pending)\n",
target_pid_to_str (lp->ptid).c_str ()); target_pid_to_str (lp->ptid).c_str ());
} }
} }
else else
{ linux_nat_debug_printf ("Not resuming sibling %s (not stopped)",
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"RC: Not resuming sibling %s (not stopped)\n",
target_pid_to_str (lp->ptid).c_str ()); target_pid_to_str (lp->ptid).c_str ());
} }
}
/* Callback for iterate_over_lwps. If LWP is EXCEPT, do nothing. /* Callback for iterate_over_lwps. If LWP is EXCEPT, do nothing.
Resume LWP with the last stop signal, if it is in pass state. */ Resume LWP with the last stop signal, if it is in pass state. */
@ -1687,9 +1669,7 @@ linux_nat_target::resume (ptid_t ptid, int step, enum gdb_signal signo)
struct lwp_info *lp; struct lwp_info *lp;
int resume_many; int resume_many;
if (debug_linux_nat) linux_nat_debug_printf ("Preparing to %s %s, %s, inferior_ptid %s",
fprintf_unfiltered (gdb_stdlog,
"LLR: Preparing to %s %s, %s, inferior_ptid %s\n",
step ? "step" : "resume", step ? "step" : "resume",
target_pid_to_str (ptid).c_str (), target_pid_to_str (ptid).c_str (),
(signo != GDB_SIGNAL_0 (signo != GDB_SIGNAL_0
@ -1729,10 +1709,8 @@ linux_nat_target::resume (ptid_t ptid, int step, enum gdb_signal signo)
&& WSTOPSIG (lp->status) && WSTOPSIG (lp->status)
&& sigismember (&pass_mask, WSTOPSIG (lp->status))) && sigismember (&pass_mask, WSTOPSIG (lp->status)))
{ {
if (debug_linux_nat) linux_nat_debug_printf
fprintf_unfiltered (gdb_stdlog, ("Not short circuiting for ignored status 0x%x", lp->status);
"LLR: Not short circuiting for ignored "
"status 0x%x\n", lp->status);
/* FIXME: What should we do if we are supposed to continue /* FIXME: What should we do if we are supposed to continue
this thread with a signal? */ this thread with a signal? */
@ -1748,9 +1726,7 @@ linux_nat_target::resume (ptid_t ptid, int step, enum gdb_signal signo)
this thread with a signal? */ this thread with a signal? */
gdb_assert (signo == GDB_SIGNAL_0); gdb_assert (signo == GDB_SIGNAL_0);
if (debug_linux_nat) linux_nat_debug_printf ("Short circuiting for status 0x%x",
fprintf_unfiltered (gdb_stdlog,
"LLR: Short circuiting for status 0x%x\n",
lp->status); lp->status);
if (target_can_async_p ()) if (target_can_async_p ())
@ -1768,9 +1744,7 @@ linux_nat_target::resume (ptid_t ptid, int step, enum gdb_signal signo)
return linux_nat_resume_callback (info, lp); return linux_nat_resume_callback (info, lp);
}); });
if (debug_linux_nat) linux_nat_debug_printf ("%s %s, %s (resume event thread)",
fprintf_unfiltered (gdb_stdlog,
"LLR: %s %s, %s (resume event thread)\n",
step ? "PTRACE_SINGLESTEP" : "PTRACE_CONT", step ? "PTRACE_SINGLESTEP" : "PTRACE_CONT",
target_pid_to_str (lp->ptid).c_str (), target_pid_to_str (lp->ptid).c_str (),
(signo != GDB_SIGNAL_0 (signo != GDB_SIGNAL_0
@ -1836,13 +1810,9 @@ linux_handle_syscall_trap (struct lwp_info *lp, int stopping)
actually get to execute. It seems it would be even more actually get to execute. It seems it would be even more
confusing to the user. */ confusing to the user. */
if (debug_linux_nat) linux_nat_debug_printf
fprintf_unfiltered (gdb_stdlog, ("ignoring syscall %d for LWP %ld (stopping threads), resuming with "
"LHST: ignoring syscall %d " "PTRACE_CONT for SIGSTOP", syscall_number, lp->ptid.lwp ());
"for LWP %ld (stopping threads), "
"resuming with PTRACE_CONT for SIGSTOP\n",
syscall_number,
lp->ptid.lwp ());
lp->syscall_state = TARGET_WAITKIND_IGNORE; lp->syscall_state = TARGET_WAITKIND_IGNORE;
ptrace (PTRACE_CONT, lp->ptid.lwp (), 0, 0); ptrace (PTRACE_CONT, lp->ptid.lwp (), 0, 0);
@ -1867,26 +1837,18 @@ linux_handle_syscall_trap (struct lwp_info *lp, int stopping)
ourstatus->kind = lp->syscall_state; ourstatus->kind = lp->syscall_state;
ourstatus->value.syscall_number = syscall_number; ourstatus->value.syscall_number = syscall_number;
if (debug_linux_nat) linux_nat_debug_printf
fprintf_unfiltered (gdb_stdlog, ("stopping for %s of syscall %d for LWP %ld",
"LHST: stopping for %s of syscall %d" (lp->syscall_state == TARGET_WAITKIND_SYSCALL_ENTRY
" for LWP %ld\n", ? "entry" : "return"), syscall_number, lp->ptid.lwp ());
lp->syscall_state
== TARGET_WAITKIND_SYSCALL_ENTRY
? "entry" : "return",
syscall_number,
lp->ptid.lwp ());
return 0; return 0;
} }
if (debug_linux_nat) linux_nat_debug_printf
fprintf_unfiltered (gdb_stdlog, ("ignoring %s of syscall %d for LWP %ld",
"LHST: ignoring %s of syscall %d " (lp->syscall_state == TARGET_WAITKIND_SYSCALL_ENTRY
"for LWP %ld\n", ? "entry" : "return"), syscall_number, lp->ptid.lwp ());
lp->syscall_state == TARGET_WAITKIND_SYSCALL_ENTRY
? "entry" : "return",
syscall_number,
lp->ptid.lwp ());
} }
else else
{ {
@ -1906,13 +1868,9 @@ linux_handle_syscall_trap (struct lwp_info *lp, int stopping)
The points above mean that the next resume, be it PT_STEP or The points above mean that the next resume, be it PT_STEP or
PT_CONTINUE, can not trigger a syscall trace event. */ PT_CONTINUE, can not trigger a syscall trace event. */
if (debug_linux_nat) linux_nat_debug_printf
fprintf_unfiltered (gdb_stdlog, ("caught syscall event with no syscall catchpoints. %d for LWP %ld, "
"LHST: caught syscall event " "ignoring", syscall_number, lp->ptid.lwp ());
"with no syscall catchpoints."
" %d for LWP %ld, ignoring\n",
syscall_number,
lp->ptid.lwp ());
lp->syscall_state = TARGET_WAITKIND_IGNORE; lp->syscall_state = TARGET_WAITKIND_IGNORE;
} }
@ -2017,11 +1975,8 @@ linux_handle_extended_wait (struct lwp_info *lp, int status)
ourstatus->kind = TARGET_WAITKIND_IGNORE; ourstatus->kind = TARGET_WAITKIND_IGNORE;
if (debug_linux_nat) linux_nat_debug_printf
fprintf_unfiltered (gdb_stdlog, ("Got clone event from LWP %d, new child is LWP %ld", pid, new_pid);
"LHEW: Got clone event "
"from LWP %d, new child is LWP %ld\n",
pid, new_pid);
new_lp = add_lwp (ptid_t (lp->ptid.pid (), new_pid, 0)); new_lp = add_lwp (ptid_t (lp->ptid.pid (), new_pid, 0));
new_lp->stopped = 1; new_lp->stopped = 1;
@ -2060,12 +2015,9 @@ linux_handle_extended_wait (struct lwp_info *lp, int status)
gdb_assert (new_lp->status == 0); gdb_assert (new_lp->status == 0);
/* Save the wait status to report later. */ /* Save the wait status to report later. */
if (debug_linux_nat) linux_nat_debug_printf
fprintf_unfiltered (gdb_stdlog, ("waitpid of new LWP %ld, saving status %s",
"LHEW: waitpid of new LWP %ld, " (long) new_lp->ptid.lwp (), status_to_str (status));
"saving status %s\n",
(long) new_lp->ptid.lwp (),
status_to_str (status));
new_lp->status = status; new_lp->status = status;
} }
else if (report_thread_events) else if (report_thread_events)
@ -2082,10 +2034,7 @@ linux_handle_extended_wait (struct lwp_info *lp, int status)
if (event == PTRACE_EVENT_EXEC) if (event == PTRACE_EVENT_EXEC)
{ {
if (debug_linux_nat) linux_nat_debug_printf ("Got exec event from LWP %ld", lp->ptid.lwp ());
fprintf_unfiltered (gdb_stdlog,
"LHEW: Got exec event from LWP %ld\n",
lp->ptid.lwp ());
ourstatus->kind = TARGET_WAITKIND_EXECD; ourstatus->kind = TARGET_WAITKIND_EXECD;
ourstatus->value.execd_pathname ourstatus->value.execd_pathname
@ -2102,21 +2051,17 @@ linux_handle_extended_wait (struct lwp_info *lp, int status)
{ {
if (current_inferior ()->waiting_for_vfork_done) if (current_inferior ()->waiting_for_vfork_done)
{ {
if (debug_linux_nat) linux_nat_debug_printf
fprintf_unfiltered (gdb_stdlog, ("Got expected PTRACE_EVENT_VFORK_DONE from LWP %ld: stopping",
"LHEW: Got expected PTRACE_EVENT_"
"VFORK_DONE from LWP %ld: stopping\n",
lp->ptid.lwp ()); lp->ptid.lwp ());
ourstatus->kind = TARGET_WAITKIND_VFORK_DONE; ourstatus->kind = TARGET_WAITKIND_VFORK_DONE;
return 0; return 0;
} }
if (debug_linux_nat) linux_nat_debug_printf
fprintf_unfiltered (gdb_stdlog, ("Got PTRACE_EVENT_VFORK_DONE from LWP %ld: ignoring", lp->ptid.lwp ());
"LHEW: Got PTRACE_EVENT_VFORK_DONE "
"from LWP %ld: ignoring\n",
lp->ptid.lwp ());
return 1; return 1;
} }
@ -2130,8 +2075,7 @@ linux_handle_extended_wait (struct lwp_info *lp, int status)
static void static void
wait_for_signal () wait_for_signal ()
{ {
if (debug_linux_nat) linux_nat_debug_printf ("about to sigsuspend");
fprintf_unfiltered (gdb_stdlog, "linux-nat: about to sigsuspend\n");
sigsuspend (&suspend_mask); sigsuspend (&suspend_mask);
/* If the quit flag is set, it means that the user pressed Ctrl-C /* If the quit flag is set, it means that the user pressed Ctrl-C
@ -2175,8 +2119,7 @@ wait_lwp (struct lwp_info *lp)
won't get an exit event. See comments on exec events at won't get an exit event. See comments on exec events at
the top of the file. */ the top of the file. */
thread_dead = 1; thread_dead = 1;
if (debug_linux_nat) linux_nat_debug_printf ("%s vanished.",
fprintf_unfiltered (gdb_stdlog, "WL: %s vanished.\n",
target_pid_to_str (lp->ptid).c_str ()); target_pid_to_str (lp->ptid).c_str ());
} }
if (pid != 0) if (pid != 0)
@ -2200,9 +2143,7 @@ wait_lwp (struct lwp_info *lp)
&& linux_proc_pid_is_zombie (lp->ptid.lwp ())) && linux_proc_pid_is_zombie (lp->ptid.lwp ()))
{ {
thread_dead = 1; thread_dead = 1;
if (debug_linux_nat) linux_nat_debug_printf ("Thread group leader %s vanished.",
fprintf_unfiltered (gdb_stdlog,
"WL: Thread group leader %s vanished.\n",
target_pid_to_str (lp->ptid).c_str ()); target_pid_to_str (lp->ptid).c_str ());
break; break;
} }
@ -2222,13 +2163,9 @@ wait_lwp (struct lwp_info *lp)
{ {
gdb_assert (pid == lp->ptid.lwp ()); gdb_assert (pid == lp->ptid.lwp ());
if (debug_linux_nat) linux_nat_debug_printf ("waitpid %s received %s",
{
fprintf_unfiltered (gdb_stdlog,
"WL: waitpid %s received %s\n",
target_pid_to_str (lp->ptid).c_str (), target_pid_to_str (lp->ptid).c_str (),
status_to_str (status)); status_to_str (status));
}
/* Check if the thread has exited. */ /* Check if the thread has exited. */
if (WIFEXITED (status) || WIFSIGNALED (status)) if (WIFEXITED (status) || WIFSIGNALED (status))
@ -2236,9 +2173,7 @@ wait_lwp (struct lwp_info *lp)
if (report_thread_events if (report_thread_events
|| lp->ptid.pid () == lp->ptid.lwp ()) || lp->ptid.pid () == lp->ptid.lwp ())
{ {
if (debug_linux_nat) linux_nat_debug_printf ("LWP %d exited.", lp->ptid.pid ());
fprintf_unfiltered (gdb_stdlog, "WL: LWP %d exited.\n",
lp->ptid.pid ());
/* If this is the leader exiting, it means the whole /* If this is the leader exiting, it means the whole
process is gone. Store the status to report to the process is gone. Store the status to report to the
@ -2249,8 +2184,7 @@ wait_lwp (struct lwp_info *lp)
} }
thread_dead = 1; thread_dead = 1;
if (debug_linux_nat) linux_nat_debug_printf ("%s exited.",
fprintf_unfiltered (gdb_stdlog, "WL: %s exited.\n",
target_pid_to_str (lp->ptid).c_str ()); target_pid_to_str (lp->ptid).c_str ());
} }
} }
@ -2295,10 +2229,7 @@ wait_lwp (struct lwp_info *lp)
if (WIFSTOPPED (status) && WSTOPSIG (status) == SIGTRAP if (WIFSTOPPED (status) && WSTOPSIG (status) == SIGTRAP
&& linux_is_extended_waitstatus (status)) && linux_is_extended_waitstatus (status))
{ {
if (debug_linux_nat) linux_nat_debug_printf ("Handling extended status 0x%06x", status);
fprintf_unfiltered (gdb_stdlog,
"WL: Handling extended status 0x%06x\n",
status);
linux_handle_extended_wait (lp, status); linux_handle_extended_wait (lp, status);
return 0; return 0;
} }
@ -2315,21 +2246,13 @@ stop_callback (struct lwp_info *lp)
{ {
int ret; int ret;
if (debug_linux_nat) linux_nat_debug_printf ("kill %s **<SIGSTOP>**",
{
fprintf_unfiltered (gdb_stdlog,
"SC: kill %s **<SIGSTOP>**\n",
target_pid_to_str (lp->ptid).c_str ()); target_pid_to_str (lp->ptid).c_str ());
}
errno = 0; errno = 0;
ret = kill_lwp (lp->ptid.lwp (), SIGSTOP); ret = kill_lwp (lp->ptid.lwp (), SIGSTOP);
if (debug_linux_nat) linux_nat_debug_printf ("lwp kill %d %s", ret,
{
fprintf_unfiltered (gdb_stdlog,
"SC: lwp kill %d %s\n",
ret,
errno ? safe_strerror (errno) : "ERRNO-OK"); errno ? safe_strerror (errno) : "ERRNO-OK");
}
lp->signalled = 1; lp->signalled = 1;
gdb_assert (lp->status == 0); gdb_assert (lp->status == 0);
@ -2417,9 +2340,7 @@ maybe_clear_ignore_sigint (struct lwp_info *lp)
if (!linux_nat_has_pending_sigint (lp->ptid.lwp ())) if (!linux_nat_has_pending_sigint (lp->ptid.lwp ()))
{ {
if (debug_linux_nat) linux_nat_debug_printf ("Clearing bogus flag for %s",
fprintf_unfiltered (gdb_stdlog,
"MCIS: Clearing bogus flag for %s\n",
target_pid_to_str (lp->ptid).c_str ()); target_pid_to_str (lp->ptid).c_str ());
lp->ignore_sigint = 0; lp->ignore_sigint = 0;
} }
@ -2516,10 +2437,8 @@ stop_wait_callback (struct lwp_info *lp)
errno = 0; errno = 0;
ptrace (PTRACE_CONT, lp->ptid.lwp (), 0, 0); ptrace (PTRACE_CONT, lp->ptid.lwp (), 0, 0);
lp->stopped = 0; lp->stopped = 0;
if (debug_linux_nat) linux_nat_debug_printf
fprintf_unfiltered (gdb_stdlog, ("PTRACE_CONT %s, 0, 0 (%s) (discarding SIGINT)",
"PTRACE_CONT %s, 0, 0 (%s) "
"(discarding SIGINT)\n",
target_pid_to_str (lp->ptid).c_str (), target_pid_to_str (lp->ptid).c_str (),
errno ? safe_strerror (errno) : "OK"); errno ? safe_strerror (errno) : "OK");
@ -2532,9 +2451,7 @@ stop_wait_callback (struct lwp_info *lp)
{ {
/* The thread was stopped with a signal other than SIGSTOP. */ /* The thread was stopped with a signal other than SIGSTOP. */
if (debug_linux_nat) linux_nat_debug_printf ("Pending event %s in %s",
fprintf_unfiltered (gdb_stdlog,
"SWC: Pending event %s in %s\n",
status_to_str ((int) status), status_to_str ((int) status),
target_pid_to_str (lp->ptid).c_str ()); target_pid_to_str (lp->ptid).c_str ());
@ -2547,9 +2464,7 @@ stop_wait_callback (struct lwp_info *lp)
{ {
/* We caught the SIGSTOP that we intended to catch. */ /* We caught the SIGSTOP that we intended to catch. */
if (debug_linux_nat) linux_nat_debug_printf ("Expected SIGSTOP caught for %s.",
fprintf_unfiltered (gdb_stdlog,
"SWC: Expected SIGSTOP caught for %s.\n",
target_pid_to_str (lp->ptid).c_str ()); target_pid_to_str (lp->ptid).c_str ());
lp->signalled = 0; lp->signalled = 0;
@ -2594,9 +2509,7 @@ status_callback (struct lwp_info *lp)
if (pc != lp->stop_pc) if (pc != lp->stop_pc)
{ {
if (debug_linux_nat) linux_nat_debug_printf ("PC of %s changed. was=%s, now=%s",
fprintf_unfiltered (gdb_stdlog,
"SC: PC of %s changed. was=%s, now=%s\n",
target_pid_to_str (lp->ptid).c_str (), target_pid_to_str (lp->ptid).c_str (),
paddress (target_gdbarch (), lp->stop_pc), paddress (target_gdbarch (), lp->stop_pc),
paddress (target_gdbarch (), pc)); paddress (target_gdbarch (), pc));
@ -2606,9 +2519,7 @@ status_callback (struct lwp_info *lp)
#if !USE_SIGTRAP_SIGINFO #if !USE_SIGTRAP_SIGINFO
else if (!breakpoint_inserted_here_p (regcache->aspace (), pc)) else if (!breakpoint_inserted_here_p (regcache->aspace (), pc))
{ {
if (debug_linux_nat) linux_nat_debug_printf ("previous breakpoint of %s, at %s gone",
fprintf_unfiltered (gdb_stdlog,
"SC: previous breakpoint of %s, at %s gone\n",
target_pid_to_str (lp->ptid).c_str (), target_pid_to_str (lp->ptid).c_str (),
paddress (target_gdbarch (), lp->stop_pc)); paddress (target_gdbarch (), lp->stop_pc));
@ -2618,9 +2529,7 @@ status_callback (struct lwp_info *lp)
if (discard) if (discard)
{ {
if (debug_linux_nat) linux_nat_debug_printf ("pending event of %s cancelled.",
fprintf_unfiltered (gdb_stdlog,
"SC: pending event of %s cancelled.\n",
target_pid_to_str (lp->ptid).c_str ()); target_pid_to_str (lp->ptid).c_str ());
lp->status = 0; lp->status = 0;
@ -2744,9 +2653,7 @@ save_stop_reason (struct lwp_info *lp)
} }
else if (siginfo.si_code == TRAP_TRACE) else if (siginfo.si_code == TRAP_TRACE)
{ {
if (debug_linux_nat) linux_nat_debug_printf ("%s stopped by trace",
fprintf_unfiltered (gdb_stdlog,
"CSBB: %s stopped by trace\n",
target_pid_to_str (lp->ptid).c_str ()); target_pid_to_str (lp->ptid).c_str ());
/* We may have single stepped an instruction that /* We may have single stepped an instruction that
@ -2777,9 +2684,7 @@ save_stop_reason (struct lwp_info *lp)
if (lp->stop_reason == TARGET_STOPPED_BY_SW_BREAKPOINT) if (lp->stop_reason == TARGET_STOPPED_BY_SW_BREAKPOINT)
{ {
if (debug_linux_nat) linux_nat_debug_printf ("%s stopped by software breakpoint",
fprintf_unfiltered (gdb_stdlog,
"CSBB: %s stopped by software breakpoint\n",
target_pid_to_str (lp->ptid).c_str ()); target_pid_to_str (lp->ptid).c_str ());
/* Back up the PC if necessary. */ /* Back up the PC if necessary. */
@ -2791,16 +2696,12 @@ save_stop_reason (struct lwp_info *lp)
} }
else if (lp->stop_reason == TARGET_STOPPED_BY_HW_BREAKPOINT) else if (lp->stop_reason == TARGET_STOPPED_BY_HW_BREAKPOINT)
{ {
if (debug_linux_nat) linux_nat_debug_printf ("%s stopped by hardware breakpoint",
fprintf_unfiltered (gdb_stdlog,
"CSBB: %s stopped by hardware breakpoint\n",
target_pid_to_str (lp->ptid).c_str ()); target_pid_to_str (lp->ptid).c_str ());
} }
else if (lp->stop_reason == TARGET_STOPPED_BY_WATCHPOINT) else if (lp->stop_reason == TARGET_STOPPED_BY_WATCHPOINT)
{ {
if (debug_linux_nat) linux_nat_debug_printf ("%s stopped by hardware watchpoint",
fprintf_unfiltered (gdb_stdlog,
"CSBB: %s stopped by hardware watchpoint\n",
target_pid_to_str (lp->ptid).c_str ()); target_pid_to_str (lp->ptid).c_str ());
} }
@ -2875,9 +2776,7 @@ select_event_lwp (ptid_t filter, struct lwp_info **orig_lp, int *status)
event_lp = iterate_over_lwps (filter, select_singlestep_lwp_callback); event_lp = iterate_over_lwps (filter, select_singlestep_lwp_callback);
if (event_lp != NULL) if (event_lp != NULL)
{ {
if (debug_linux_nat) linux_nat_debug_printf ("Select single-step %s",
fprintf_unfiltered (gdb_stdlog,
"SEL: Select single-step %s\n",
target_pid_to_str (event_lp->ptid).c_str ()); target_pid_to_str (event_lp->ptid).c_str ());
} }
} }
@ -2899,9 +2798,8 @@ select_event_lwp (ptid_t filter, struct lwp_info **orig_lp, int *status)
random_selector = (int) random_selector = (int)
((num_events * (double) rand ()) / (RAND_MAX + 1.0)); ((num_events * (double) rand ()) / (RAND_MAX + 1.0));
if (debug_linux_nat && num_events > 1) if (num_events > 1)
fprintf_unfiltered (gdb_stdlog, linux_nat_debug_printf ("Found %d events, selecting #%d",
"SEL: Found %d events, selecting #%d\n",
num_events, random_selector); num_events, random_selector);
event_lp event_lp
@ -2961,10 +2859,7 @@ linux_nat_filter_event (int lwpid, int status)
&& (WSTOPSIG (status) == SIGTRAP && event == PTRACE_EVENT_EXEC)) && (WSTOPSIG (status) == SIGTRAP && event == PTRACE_EVENT_EXEC))
{ {
/* A multi-thread exec after we had seen the leader exiting. */ /* A multi-thread exec after we had seen the leader exiting. */
if (debug_linux_nat) linux_nat_debug_printf ("Re-adding thread group leader LWP %d.", lwpid);
fprintf_unfiltered (gdb_stdlog,
"LLW: Re-adding thread group leader LWP %d.\n",
lwpid);
lp = add_lwp (ptid_t (lwpid, lwpid, 0)); lp = add_lwp (ptid_t (lwpid, lwpid, 0));
lp->stopped = 1; lp->stopped = 1;
@ -2974,9 +2869,7 @@ linux_nat_filter_event (int lwpid, int status)
if (WIFSTOPPED (status) && !lp) if (WIFSTOPPED (status) && !lp)
{ {
if (debug_linux_nat) linux_nat_debug_printf ("saving LWP %ld status %s in stopped_pids list",
fprintf_unfiltered (gdb_stdlog,
"LHEW: saving LWP %ld status %s in stopped_pids list\n",
(long) lwpid, status_to_str (status)); (long) lwpid, status_to_str (status));
add_to_pid_list (&stopped_pids, lwpid, status); add_to_pid_list (&stopped_pids, lwpid, status);
return NULL; return NULL;
@ -3024,10 +2917,8 @@ linux_nat_filter_event (int lwpid, int status)
if (WIFSTOPPED (status) && WSTOPSIG (status) == SIGTRAP if (WIFSTOPPED (status) && WSTOPSIG (status) == SIGTRAP
&& linux_is_extended_waitstatus (status)) && linux_is_extended_waitstatus (status))
{ {
if (debug_linux_nat) linux_nat_debug_printf ("Handling extended status 0x%06x", status);
fprintf_unfiltered (gdb_stdlog,
"LLW: Handling extended status 0x%06x\n",
status);
if (linux_handle_extended_wait (lp, status)) if (linux_handle_extended_wait (lp, status))
return NULL; return NULL;
} }
@ -3038,9 +2929,7 @@ linux_nat_filter_event (int lwpid, int status)
if (!report_thread_events if (!report_thread_events
&& num_lwps (lp->ptid.pid ()) > 1) && num_lwps (lp->ptid.pid ()) > 1)
{ {
if (debug_linux_nat) linux_nat_debug_printf ("%s exited.",
fprintf_unfiltered (gdb_stdlog,
"LLW: %s exited.\n",
target_pid_to_str (lp->ptid).c_str ()); target_pid_to_str (lp->ptid).c_str ());
/* If there is at least one more LWP, then the exit signal /* If there is at least one more LWP, then the exit signal
@ -3054,9 +2943,7 @@ linux_nat_filter_event (int lwpid, int status)
exit, if e.g., some other thread brings down the whole exit, if e.g., some other thread brings down the whole
process (calls `exit'). So don't assert that the lwp is process (calls `exit'). So don't assert that the lwp is
resumed. */ resumed. */
if (debug_linux_nat) linux_nat_debug_printf ("LWP %ld exited (resumed=%d)",
fprintf_unfiltered (gdb_stdlog,
"LWP %ld exited (resumed=%d)\n",
lp->ptid.lwp (), lp->resumed); lp->ptid.lwp (), lp->resumed);
/* Dead LWP's aren't expected to reported a pending sigstop. */ /* Dead LWP's aren't expected to reported a pending sigstop. */
@ -3077,20 +2964,16 @@ linux_nat_filter_event (int lwpid, int status)
if (lp->last_resume_kind == resume_stop) if (lp->last_resume_kind == resume_stop)
{ {
if (debug_linux_nat) linux_nat_debug_printf ("resume_stop SIGSTOP caught for %s.",
fprintf_unfiltered (gdb_stdlog,
"LLW: resume_stop SIGSTOP caught for %s.\n",
target_pid_to_str (lp->ptid).c_str ()); target_pid_to_str (lp->ptid).c_str ());
} }
else else
{ {
/* This is a delayed SIGSTOP. Filter out the event. */ /* This is a delayed SIGSTOP. Filter out the event. */
if (debug_linux_nat) linux_nat_debug_printf
fprintf_unfiltered (gdb_stdlog, ("%s %s, 0, 0 (discard delayed SIGSTOP)",
"LLW: %s %s, 0, 0 (discard delayed SIGSTOP)\n", lp->step ? "PTRACE_SINGLESTEP" : "PTRACE_CONT",
lp->step ?
"PTRACE_SINGLESTEP" : "PTRACE_CONT",
target_pid_to_str (lp->ptid).c_str ()); target_pid_to_str (lp->ptid).c_str ());
linux_resume_one_lwp (lp, lp->step, GDB_SIGNAL_0); linux_resume_one_lwp (lp, lp->step, GDB_SIGNAL_0);
@ -3104,20 +2987,15 @@ linux_nat_filter_event (int lwpid, int status)
if (lp->ignore_sigint if (lp->ignore_sigint
&& WIFSTOPPED (status) && WSTOPSIG (status) == SIGINT) && WIFSTOPPED (status) && WSTOPSIG (status) == SIGINT)
{ {
if (debug_linux_nat) linux_nat_debug_printf ("Delayed SIGINT caught for %s.",
fprintf_unfiltered (gdb_stdlog,
"LLW: Delayed SIGINT caught for %s.\n",
target_pid_to_str (lp->ptid).c_str ()); target_pid_to_str (lp->ptid).c_str ());
/* This is a delayed SIGINT. */ /* This is a delayed SIGINT. */
lp->ignore_sigint = 0; lp->ignore_sigint = 0;
linux_resume_one_lwp (lp, lp->step, GDB_SIGNAL_0); linux_resume_one_lwp (lp, lp->step, GDB_SIGNAL_0);
if (debug_linux_nat) linux_nat_debug_printf ("%s %s, 0, 0 (discard SIGINT)",
fprintf_unfiltered (gdb_stdlog, lp->step ? "PTRACE_SINGLESTEP" : "PTRACE_CONT",
"LLW: %s %s, 0, 0 (discard SIGINT)\n",
lp->step ?
"PTRACE_SINGLESTEP" : "PTRACE_CONT",
target_pid_to_str (lp->ptid).c_str ()); target_pid_to_str (lp->ptid).c_str ());
gdb_assert (lp->resumed); gdb_assert (lp->resumed);
@ -3165,15 +3043,12 @@ linux_nat_filter_event (int lwpid, int status)
&& !linux_wstatus_maybe_breakpoint (status)) && !linux_wstatus_maybe_breakpoint (status))
{ {
linux_resume_one_lwp (lp, lp->step, signo); linux_resume_one_lwp (lp, lp->step, signo);
if (debug_linux_nat) linux_nat_debug_printf
fprintf_unfiltered (gdb_stdlog, ("%s %s, %s (preempt 'handle')",
"LLW: %s %s, %s (preempt 'handle')\n", lp->step ? "PTRACE_SINGLESTEP" : "PTRACE_CONT",
lp->step ?
"PTRACE_SINGLESTEP" : "PTRACE_CONT",
target_pid_to_str (lp->ptid).c_str (), target_pid_to_str (lp->ptid).c_str (),
(signo != GDB_SIGNAL_0 (signo != GDB_SIGNAL_0
? strsignal (gdb_signal_to_host (signo)) ? strsignal (gdb_signal_to_host (signo)) : "0"));
: "0"));
return NULL; return NULL;
} }
} }
@ -3205,10 +3080,8 @@ check_zombie_leaders (void)
&& num_lwps (inf->pid) > 1 && num_lwps (inf->pid) > 1
&& linux_proc_pid_is_zombie (inf->pid)) && linux_proc_pid_is_zombie (inf->pid))
{ {
if (debug_linux_nat) linux_nat_debug_printf ("Thread group leader %d zombie "
fprintf_unfiltered (gdb_stdlog, "(it exited, or another thread execd).",
"CZL: Thread group leader %d zombie "
"(it exited, or another thread execd).\n",
inf->pid); inf->pid);
/* A leader zombie can mean one of two things: /* A leader zombie can mean one of two things:
@ -3229,10 +3102,7 @@ check_zombie_leaders (void)
previous leader did exit voluntarily before some other previous leader did exit voluntarily before some other
thread execs). */ thread execs). */
if (debug_linux_nat) linux_nat_debug_printf ("Thread group leader %d vanished.", inf->pid);
fprintf_unfiltered (gdb_stdlog,
"CZL: Thread group leader %d vanished.\n",
inf->pid);
exit_lwp (leader_lp); exit_lwp (leader_lp);
} }
} }
@ -3271,8 +3141,7 @@ linux_nat_wait_1 (ptid_t ptid, struct target_waitstatus *ourstatus,
struct lwp_info *lp; struct lwp_info *lp;
int status; int status;
if (debug_linux_nat) linux_nat_debug_printf ("enter");
fprintf_unfiltered (gdb_stdlog, "LLW: enter\n");
/* The first time we get here after starting a new inferior, we may /* The first time we get here after starting a new inferior, we may
not have added it to the LWP list yet - this is the earliest not have added it to the LWP list yet - this is the earliest
@ -3295,9 +3164,7 @@ linux_nat_wait_1 (ptid_t ptid, struct target_waitstatus *ourstatus,
lp = iterate_over_lwps (ptid, status_callback); lp = iterate_over_lwps (ptid, status_callback);
if (lp != NULL) if (lp != NULL)
{ {
if (debug_linux_nat) linux_nat_debug_printf ("Using pending wait status %s for %s.",
fprintf_unfiltered (gdb_stdlog,
"LLW: Using pending wait status %s for %s.\n",
status_to_str (lp->status), status_to_str (lp->status),
target_pid_to_str (lp->ptid).c_str ()); target_pid_to_str (lp->ptid).c_str ());
} }
@ -3326,19 +3193,14 @@ linux_nat_wait_1 (ptid_t ptid, struct target_waitstatus *ourstatus,
errno = 0; errno = 0;
lwpid = my_waitpid (-1, &status, __WALL | WNOHANG); lwpid = my_waitpid (-1, &status, __WALL | WNOHANG);
if (debug_linux_nat) linux_nat_debug_printf ("waitpid(-1, ...) returned %d, %s",
fprintf_unfiltered (gdb_stdlog, lwpid,
"LNW: waitpid(-1, ...) returned %d, %s\n", errno ? safe_strerror (errno) : "ERRNO-OK");
lwpid, errno ? safe_strerror (errno) : "ERRNO-OK");
if (lwpid > 0) if (lwpid > 0)
{ {
if (debug_linux_nat) linux_nat_debug_printf ("waitpid %ld received %s",
{
fprintf_unfiltered (gdb_stdlog,
"LLW: waitpid %ld received %s\n",
(long) lwpid, status_to_str (status)); (long) lwpid, status_to_str (status));
}
linux_nat_filter_event (lwpid, status); linux_nat_filter_event (lwpid, status);
/* Retry until nothing comes out of waitpid. A single /* Retry until nothing comes out of waitpid. A single
@ -3368,8 +3230,7 @@ linux_nat_wait_1 (ptid_t ptid, struct target_waitstatus *ourstatus,
forever in the sigsuspend call below otherwise. */ forever in the sigsuspend call below otherwise. */
if (iterate_over_lwps (ptid, resumed_callback) == NULL) if (iterate_over_lwps (ptid, resumed_callback) == NULL)
{ {
if (debug_linux_nat) linux_nat_debug_printf ("exit (no resumed LWP)");
fprintf_unfiltered (gdb_stdlog, "LLW: exit (no resumed LWP)\n");
ourstatus->kind = TARGET_WAITKIND_NO_RESUMED; ourstatus->kind = TARGET_WAITKIND_NO_RESUMED;
@ -3381,8 +3242,7 @@ linux_nat_wait_1 (ptid_t ptid, struct target_waitstatus *ourstatus,
if (target_options & TARGET_WNOHANG) if (target_options & TARGET_WNOHANG)
{ {
if (debug_linux_nat) linux_nat_debug_printf ("exit (ignore)");
fprintf_unfiltered (gdb_stdlog, "LLW: exit (ignore)\n");
ourstatus->kind = TARGET_WAITKIND_IGNORE; ourstatus->kind = TARGET_WAITKIND_IGNORE;
restore_child_signals_mask (&prev_mask); restore_child_signals_mask (&prev_mask);
@ -3456,9 +3316,7 @@ linux_nat_wait_1 (ptid_t ptid, struct target_waitstatus *ourstatus,
if (linux_target->low_status_is_event (status)) if (linux_target->low_status_is_event (status))
{ {
if (debug_linux_nat) linux_nat_debug_printf ("trap ptid is %s.",
fprintf_unfiltered (gdb_stdlog,
"LLW: trap ptid is %s.\n",
target_pid_to_str (lp->ptid).c_str ()); target_pid_to_str (lp->ptid).c_str ());
} }
@ -3470,8 +3328,7 @@ linux_nat_wait_1 (ptid_t ptid, struct target_waitstatus *ourstatus,
else else
store_waitstatus (ourstatus, status); store_waitstatus (ourstatus, status);
if (debug_linux_nat) linux_nat_debug_printf ("exit");
fprintf_unfiltered (gdb_stdlog, "LLW: exit\n");
restore_child_signals_mask (&prev_mask); restore_child_signals_mask (&prev_mask);
@ -3505,23 +3362,17 @@ resume_stopped_resumed_lwps (struct lwp_info *lp, const ptid_t wait_ptid)
{ {
if (!lp->stopped) if (!lp->stopped)
{ {
if (debug_linux_nat) linux_nat_debug_printf ("NOT resuming LWP %s, not stopped",
fprintf_unfiltered (gdb_stdlog,
"RSRL: NOT resuming LWP %s, not stopped\n",
target_pid_to_str (lp->ptid).c_str ()); target_pid_to_str (lp->ptid).c_str ());
} }
else if (!lp->resumed) else if (!lp->resumed)
{ {
if (debug_linux_nat) linux_nat_debug_printf ("NOT resuming LWP %s, not resumed",
fprintf_unfiltered (gdb_stdlog,
"RSRL: NOT resuming LWP %s, not resumed\n",
target_pid_to_str (lp->ptid).c_str ()); target_pid_to_str (lp->ptid).c_str ());
} }
else if (lwp_status_pending_p (lp)) else if (lwp_status_pending_p (lp))
{ {
if (debug_linux_nat) linux_nat_debug_printf ("NOT resuming LWP %s, has pending status",
fprintf_unfiltered (gdb_stdlog,
"RSRL: NOT resuming LWP %s, has pending status\n",
target_pid_to_str (lp->ptid).c_str ()); target_pid_to_str (lp->ptid).c_str ());
} }
else else
@ -3544,12 +3395,9 @@ resume_stopped_resumed_lwps (struct lwp_info *lp, const ptid_t wait_ptid)
if (!leave_stopped) if (!leave_stopped)
{ {
if (debug_linux_nat) linux_nat_debug_printf
fprintf_unfiltered (gdb_stdlog, ("resuming stopped-resumed LWP %s at %s: step=%d",
"RSRL: resuming stopped-resumed LWP %s at " target_pid_to_str (lp->ptid).c_str (), paddress (gdbarch, pc),
"%s: step=%d\n",
target_pid_to_str (lp->ptid).c_str (),
paddress (gdbarch, pc),
lp->step); lp->step);
linux_resume_one_lwp_throw (lp, lp->step, GDB_SIGNAL_0); linux_resume_one_lwp_throw (lp, lp->step, GDB_SIGNAL_0);
@ -3571,14 +3419,8 @@ linux_nat_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus,
{ {
ptid_t event_ptid; ptid_t event_ptid;
if (debug_linux_nat) linux_nat_debug_printf ("[%s], [%s]", target_pid_to_str (ptid).c_str (),
{ target_options_to_string (target_options).c_str ());
std::string options_string = target_options_to_string (target_options);
fprintf_unfiltered (gdb_stdlog,
"linux_nat_wait: [%s], [%s]\n",
target_pid_to_str (ptid).c_str (),
options_string.c_str ());
}
/* Flush the async file first. */ /* Flush the async file first. */
if (target_is_async_p ()) if (target_is_async_p ())
@ -3621,13 +3463,14 @@ kill_one_lwp (pid_t pid)
errno = 0; errno = 0;
kill_lwp (pid, SIGKILL); kill_lwp (pid, SIGKILL);
if (debug_linux_nat) if (debug_linux_nat)
{ {
int save_errno = errno; int save_errno = errno;
fprintf_unfiltered (gdb_stdlog, linux_nat_debug_printf
"KC: kill (SIGKILL) %ld, 0, 0 (%s)\n", (long) pid, ("kill (SIGKILL) %ld, 0, 0 (%s)", (long) pid,
save_errno ? safe_strerror (save_errno) : "OK"); save_errno != 0 ? safe_strerror (save_errno) : "OK");
} }
/* Some kernels ignore even SIGKILL for processes under ptrace. */ /* Some kernels ignore even SIGKILL for processes under ptrace. */
@ -3638,8 +3481,8 @@ kill_one_lwp (pid_t pid)
{ {
int save_errno = errno; int save_errno = errno;
fprintf_unfiltered (gdb_stdlog, linux_nat_debug_printf
"KC: PTRACE_KILL %ld, 0, 0 (%s)\n", (long) pid, ("PTRACE_KILL %ld, 0, 0 (%s)", (long) pid,
save_errno ? safe_strerror (save_errno) : "OK"); save_errno ? safe_strerror (save_errno) : "OK");
} }
} }
@ -3660,10 +3503,8 @@ kill_wait_one_lwp (pid_t pid)
res = my_waitpid (pid, NULL, __WALL); res = my_waitpid (pid, NULL, __WALL);
if (res != (pid_t) -1) if (res != (pid_t) -1)
{ {
if (debug_linux_nat) linux_nat_debug_printf ("wait %ld received unknown.", (long) pid);
fprintf_unfiltered (gdb_stdlog,
"KWC: wait %ld received unknown.\n",
(long) pid);
/* The Linux kernel sometimes fails to kill a thread /* The Linux kernel sometimes fails to kill a thread
completely after PTRACE_KILL; that goes from the stop completely after PTRACE_KILL; that goes from the stop
point in do_fork out to the one in get_signal_to_deliver point in do_fork out to the one in get_signal_to_deliver
@ -4306,18 +4147,13 @@ linux_nat_stop_lwp (struct lwp_info *lwp)
{ {
if (!lwp->stopped) if (!lwp->stopped)
{ {
if (debug_linux_nat) linux_nat_debug_printf ("running -> suspending %s",
fprintf_unfiltered (gdb_stdlog,
"LNSL: running -> suspending %s\n",
target_pid_to_str (lwp->ptid).c_str ()); target_pid_to_str (lwp->ptid).c_str ());
if (lwp->last_resume_kind == resume_stop) if (lwp->last_resume_kind == resume_stop)
{ {
if (debug_linux_nat) linux_nat_debug_printf ("already stopping LWP %ld at GDB's request",
fprintf_unfiltered (gdb_stdlog,
"linux-nat: already stopping LWP %ld at "
"GDB's request\n",
lwp->ptid.lwp ()); lwp->ptid.lwp ());
return 0; return 0;
} }
@ -4332,13 +4168,10 @@ linux_nat_stop_lwp (struct lwp_info *lwp)
if (debug_linux_nat) if (debug_linux_nat)
{ {
if (find_thread_ptid (linux_target, lwp->ptid)->stop_requested) if (find_thread_ptid (linux_target, lwp->ptid)->stop_requested)
fprintf_unfiltered (gdb_stdlog, linux_nat_debug_printf ("already stopped/stop_requested %s",
"LNSL: already stopped/stop_requested %s\n",
target_pid_to_str (lwp->ptid).c_str ()); target_pid_to_str (lwp->ptid).c_str ());
else else
fprintf_unfiltered (gdb_stdlog, linux_nat_debug_printf ("already stopped/no stop_requested yet %s",
"LNSL: already stopped/no "
"stop_requested yet %s\n",
target_pid_to_str (lwp->ptid).c_str ()); target_pid_to_str (lwp->ptid).c_str ());
} }
} }