projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change pid_to_str to return std::string
[deliverable/binutils-gdb.git]
/
gdb
/
linux-nat.c
diff --git
a/gdb/linux-nat.c
b/gdb/linux-nat.c
index c0d5f8dc66b7bb14c3afd6136369d4aee06aeb5e..58da62a79640b5d5784779bc4344408a572d1a73 100644
(file)
--- a/
gdb/linux-nat.c
+++ b/
gdb/linux-nat.c
@@
-23,7
+23,7
@@
#include "target.h"
#include "nat/linux-nat.h"
#include "nat/linux-waitpid.h"
#include "target.h"
#include "nat/linux-nat.h"
#include "nat/linux-waitpid.h"
-#include "gdb_wait.h"
+#include "
common/
gdb_wait.h"
#include <unistd.h>
#include <sys/syscall.h>
#include "nat/gdb_ptrace.h"
#include <unistd.h>
#include <sys/syscall.h>
#include "nat/gdb_ptrace.h"
@@
-58,14
+58,15
@@
#include "nat/linux-osdata.h"
#include "linux-tdep.h"
#include "symfile.h"
#include "nat/linux-osdata.h"
#include "linux-tdep.h"
#include "symfile.h"
-#include "agent.h"
+#include "
common/
agent.h"
#include "tracepoint.h"
#include "tracepoint.h"
-#include "buffer.h"
+#include "
common/
buffer.h"
#include "target-descriptions.h"
#include "target-descriptions.h"
-#include "filestuff.h"
+#include "
common/
filestuff.h"
#include "objfiles.h"
#include "nat/linux-namespaces.h"
#include "objfiles.h"
#include "nat/linux-namespaces.h"
-#include "fileio.h"
+#include "common/fileio.h"
+#include "common/scope-exit.h"
#ifndef SPUFS_MAGIC
#define SPUFS_MAGIC 0x23c9b64e
#ifndef SPUFS_MAGIC
#define SPUFS_MAGIC 0x23c9b64e
@@
-261,8
+262,7
@@
async_file_mark (void)
static int kill_lwp (int lwpid, int signo);
static int kill_lwp (int lwpid, int signo);
-static int stop_callback (struct lwp_info *lp, void *data);
-static int resume_stopped_resumed_lwps (struct lwp_info *lp, void *data);
+static int stop_callback (struct lwp_info *lp);
static void block_child_signals (sigset_t *prev_mask);
static void restore_child_signals_mask (sigset_t *prev_mask);
static void block_child_signals (sigset_t *prev_mask);
static void restore_child_signals_mask (sigset_t *prev_mask);
@@
-788,7
+788,8
@@
static sigset_t pass_mask;
/* Update signals to pass to the inferior. */
void
/* Update signals to pass to the inferior. */
void
-linux_nat_target::pass_signals (int numsigs, const unsigned char *pass_signals)
+linux_nat_target::pass_signals
+ (gdb::array_view<const unsigned char> pass_signals)
{
int signo;
{
int signo;
@@
-797,7
+798,7
@@
linux_nat_target::pass_signals (int numsigs, const unsigned char *pass_signals)
for (signo = 1; signo < NSIG; signo++)
{
int target_signo = gdb_signal_from_host (signo);
for (signo = 1; signo < NSIG; signo++)
{
int target_signo = gdb_signal_from_host (signo);
- if (target_signo <
numsigs
&& pass_signals[target_signo])
+ if (target_signo <
pass_signals.size ()
&& pass_signals[target_signo])
sigaddset (&pass_mask, signo);
}
}
sigaddset (&pass_mask, signo);
}
}
@@
-805,8
+806,8
@@
linux_nat_target::pass_signals (int numsigs, const unsigned char *pass_signals)
\f
/* Prototypes for local functions. */
\f
/* Prototypes for local functions. */
-static int stop_wait_callback (struct lwp_info *lp
, void *data
);
-static int resume_stopped_resumed_lwps (struct lwp_info *lp,
void *data
);
+static int stop_wait_callback (struct lwp_info *lp);
+static int resume_stopped_resumed_lwps (struct lwp_info *lp,
const ptid_t wait_ptid
);
static int check_ptrace_stopped_lwp_gone (struct lwp_info *lp);
\f
static int check_ptrace_stopped_lwp_gone (struct lwp_info *lp);
\f
@@
-958,8
+959,7
@@
find_lwp_pid (ptid_t ptid)
struct lwp_info *
iterate_over_lwps (ptid_t filter,
struct lwp_info *
iterate_over_lwps (ptid_t filter,
- iterate_over_lwps_ftype callback,
- void *data)
+ gdb::function_view<iterate_over_lwps_ftype> callback)
{
struct lwp_info *lp, *lpnext;
{
struct lwp_info *lp, *lpnext;
@@
-969,7
+969,7
@@
iterate_over_lwps (ptid_t filter,
if (lp->ptid.matches (filter))
{
if (lp->ptid.matches (filter))
{
- if (
(*callback) (lp, data
) != 0)
+ if (
callback (lp
) != 0)
return lp;
}
}
return lp;
}
}
@@
-1013,7
+1013,8
@@
exit_lwp (struct lwp_info *lp)
if (th)
{
if (print_thread_events)
if (th)
{
if (print_thread_events)
- printf_unfiltered (_("[%s exited]\n"), target_pid_to_str (lp->ptid));
+ printf_unfiltered (_("[%s exited]\n"),
+ target_pid_to_str (lp->ptid).c_str ());
delete_thread (th);
}
delete_thread (th);
}
@@
-1095,7
+1096,7
@@
linux_nat_target::create_inferior (const char *exec_file,
we have to mask the async mode. */
/* Make sure we report all signals during startup. */
we have to mask the async mode. */
/* Make sure we report all signals during startup. */
- pass_signals (
0, NULL
);
+ pass_signals (
{}
);
inf_ptrace_target::create_inferior (exec_file, allargs, env, from_tty);
}
inf_ptrace_target::create_inferior (exec_file, allargs, env, from_tty);
}
@@
-1149,7
+1150,7
@@
attach_proc_task_lwp_callback (ptid_t ptid)
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"PTRACE_ATTACH %s, 0, 0 (OK)\n",
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"PTRACE_ATTACH %s, 0, 0 (OK)\n",
- target_pid_to_str (ptid));
+ target_pid_to_str (ptid)
.c_str ()
);
lp = add_lwp (ptid);
lp = add_lwp (ptid);
@@
-1185,7
+1186,7
@@
linux_nat_target::attach (const char *args, int from_tty)
ptid_t ptid;
/* Make sure we report all signals during attach. */
ptid_t ptid;
/* Make sure we report all signals during attach. */
- pass_signals (
0, NULL
);
+ pass_signals (
{}
);
TRY
{
TRY
{
@@
-1335,7
+1336,7
@@
get_detach_signal (struct lwp_info *lp)
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"GPT: lwp %s has no pending signal\n",
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"GPT: lwp %s has no pending signal\n",
- target_pid_to_str (lp->ptid));
+ target_pid_to_str (lp->ptid)
.c_str ()
);
}
else if (!signal_pass_state (signo))
{
}
else if (!signal_pass_state (signo))
{
@@
-1343,7
+1344,7
@@
get_detach_signal (struct lwp_info *lp)
fprintf_unfiltered (gdb_stdlog,
"GPT: lwp %s had signal %s, "
"but it is in no pass state\n",
fprintf_unfiltered (gdb_stdlog,
"GPT: lwp %s had signal %s, "
"but it is in no pass state\n",
- target_pid_to_str (lp->ptid),
+ target_pid_to_str (lp->ptid)
.c_str ()
,
gdb_signal_to_string (signo));
}
else
gdb_signal_to_string (signo));
}
else
@@
-1351,7
+1352,7
@@
get_detach_signal (struct lwp_info *lp)
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"GPT: lwp %s has pending signal %s\n",
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"GPT: lwp %s has pending signal %s\n",
- target_pid_to_str (lp->ptid),
+ target_pid_to_str (lp->ptid)
.c_str ()
,
gdb_signal_to_string (signo));
return gdb_signal_to_host (signo);
gdb_signal_to_string (signo));
return gdb_signal_to_host (signo);
@@
-1375,7
+1376,7
@@
detach_one_lwp (struct lwp_info *lp, int *signo_p)
if (debug_linux_nat && lp->status)
fprintf_unfiltered (gdb_stdlog, "DC: Pending %s for %s on detach.\n",
strsignal (WSTOPSIG (lp->status)),
if (debug_linux_nat && lp->status)
fprintf_unfiltered (gdb_stdlog, "DC: Pending %s for %s on detach.\n",
strsignal (WSTOPSIG (lp->status)),
- target_pid_to_str (lp->ptid));
+ target_pid_to_str (lp->ptid)
.c_str ()
);
/* If there is a pending SIGSTOP, get rid of it. */
if (lp->signalled)
/* If there is a pending SIGSTOP, get rid of it. */
if (lp->signalled)
@@
-1383,7
+1384,7
@@
detach_one_lwp (struct lwp_info *lp, int *signo_p)
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"DC: Sending SIGCONT to %s\n",
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"DC: Sending SIGCONT to %s\n",
- target_pid_to_str (lp->ptid));
+ target_pid_to_str (lp->ptid)
.c_str ()
);
kill_lwp (lwpid, SIGCONT);
lp->signalled = 0;
kill_lwp (lwpid, SIGCONT);
lp->signalled = 0;
@@
-1438,7
+1439,8
@@
detach_one_lwp (struct lwp_info *lp, int *signo_p)
}
else
{
}
else
{
- error (_("Can't detach %s: %s"), target_pid_to_str (lp->ptid),
+ error (_("Can't detach %s: %s"),
+ target_pid_to_str (lp->ptid).c_str (),
safe_strerror (save_errno));
}
}
safe_strerror (save_errno));
}
}
@@
-1446,7
+1448,7
@@
detach_one_lwp (struct lwp_info *lp, int *signo_p)
{
fprintf_unfiltered (gdb_stdlog,
"PTRACE_DETACH (%s, %s, 0) (OK)\n",
{
fprintf_unfiltered (gdb_stdlog,
"PTRACE_DETACH (%s, %s, 0) (OK)\n",
- target_pid_to_str (lp->ptid),
+ target_pid_to_str (lp->ptid)
.c_str ()
,
strsignal (signo));
}
strsignal (signo));
}
@@
-1454,7
+1456,7
@@
detach_one_lwp (struct lwp_info *lp, int *signo_p)
}
static int
}
static int
-detach_callback (struct lwp_info *lp
, void *data
)
+detach_callback (struct lwp_info *lp)
{
/* We don't actually detach from the thread group leader just yet.
If the thread group exits, we must reap the zombie clone lwps
{
/* We don't actually detach from the thread group leader just yet.
If the thread group exits, we must reap the zombie clone lwps
@@
-1475,12
+1477,12
@@
linux_nat_target::detach (inferior *inf, int from_tty)
/* Stop all threads before detaching. ptrace requires that the
thread is stopped to sucessfully detach. */
/* Stop all threads before detaching. ptrace requires that the
thread is stopped to sucessfully detach. */
- iterate_over_lwps (ptid_t (pid), stop_callback
, NULL
);
+ iterate_over_lwps (ptid_t (pid), stop_callback);
/* ... and wait until all of them have reported back that
they're no longer running. */
/* ... and wait until all of them have reported back that
they're no longer running. */
- iterate_over_lwps (ptid_t (pid), stop_wait_callback
, NULL
);
+ iterate_over_lwps (ptid_t (pid), stop_wait_callback);
- iterate_over_lwps (ptid_t (pid), detach_callback
, NULL
);
+ iterate_over_lwps (ptid_t (pid), detach_callback);
/* Only the initial process should be left right now. */
gdb_assert (num_lwps (pid) == 1);
/* Only the initial process should be left right now. */
gdb_assert (num_lwps (pid) == 1);
@@
-1608,14
+1610,14
@@
resume_lwp (struct lwp_info *lp, int step, enum gdb_signal signo)
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"RC: Not resuming %s (vfork parent)\n",
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"RC: Not resuming %s (vfork parent)\n",
- target_pid_to_str (lp->ptid));
+ target_pid_to_str (lp->ptid)
.c_str ()
);
}
else if (!lwp_status_pending_p (lp))
{
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"RC: Resuming sibling %s, %s, %s\n",
}
else if (!lwp_status_pending_p (lp))
{
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"RC: Resuming sibling %s, %s, %s\n",
- target_pid_to_str (lp->ptid),
+ target_pid_to_str (lp->ptid)
.c_str ()
,
(signo != GDB_SIGNAL_0
? strsignal (gdb_signal_to_host (signo))
: "0"),
(signo != GDB_SIGNAL_0
? strsignal (gdb_signal_to_host (signo))
: "0"),
@@
-1628,7
+1630,7
@@
resume_lwp (struct lwp_info *lp, int step, enum gdb_signal signo)
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"RC: Not resuming sibling %s (has pending)\n",
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"RC: Not resuming sibling %s (has pending)\n",
- target_pid_to_str (lp->ptid));
+ target_pid_to_str (lp->ptid)
.c_str ()
);
}
}
else
}
}
else
@@
-1636,7
+1638,7
@@
resume_lwp (struct lwp_info *lp, int step, enum gdb_signal signo)
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"RC: Not resuming sibling %s (not stopped)\n",
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"RC: Not resuming sibling %s (not stopped)\n",
- target_pid_to_str (lp->ptid));
+ target_pid_to_str (lp->ptid)
.c_str ()
);
}
}
}
}
@@
-1644,7
+1646,7
@@
resume_lwp (struct lwp_info *lp, int step, enum gdb_signal signo)
Resume LWP with the last stop signal, if it is in pass state. */
static int
Resume LWP with the last stop signal, if it is in pass state. */
static int
-linux_nat_resume_callback (struct lwp_info *lp,
void
*except)
+linux_nat_resume_callback (struct lwp_info *lp,
struct lwp_info
*except)
{
enum gdb_signal signo = GDB_SIGNAL_0;
{
enum gdb_signal signo = GDB_SIGNAL_0;
@@
-1668,7
+1670,7
@@
linux_nat_resume_callback (struct lwp_info *lp, void *except)
}
static int
}
static int
-resume_clear_callback (struct lwp_info *lp
, void *data
)
+resume_clear_callback (struct lwp_info *lp)
{
lp->resumed = 0;
lp->last_resume_kind = resume_stop;
{
lp->resumed = 0;
lp->last_resume_kind = resume_stop;
@@
-1676,7
+1678,7
@@
resume_clear_callback (struct lwp_info *lp, void *data)
}
static int
}
static int
-resume_set_callback (struct lwp_info *lp
, void *data
)
+resume_set_callback (struct lwp_info *lp)
{
lp->resumed = 1;
lp->last_resume_kind = resume_continue;
{
lp->resumed = 1;
lp->last_resume_kind = resume_continue;
@@
-1693,17
+1695,17
@@
linux_nat_target::resume (ptid_t ptid, int step, enum gdb_signal signo)
fprintf_unfiltered (gdb_stdlog,
"LLR: Preparing to %s %s, %s, inferior_ptid %s\n",
step ? "step" : "resume",
fprintf_unfiltered (gdb_stdlog,
"LLR: Preparing to %s %s, %s, inferior_ptid %s\n",
step ? "step" : "resume",
- target_pid_to_str (ptid),
+ target_pid_to_str (ptid)
.c_str ()
,
(signo != GDB_SIGNAL_0
? strsignal (gdb_signal_to_host (signo)) : "0"),
(signo != GDB_SIGNAL_0
? strsignal (gdb_signal_to_host (signo)) : "0"),
- target_pid_to_str (inferior_ptid));
+ target_pid_to_str (inferior_ptid)
.c_str ()
);
/* A specific PTID means `step only this process id'. */
resume_many = (minus_one_ptid == ptid
|| ptid.is_pid ());
/* Mark the lwps we're resuming as resumed. */
/* A specific PTID means `step only this process id'. */
resume_many = (minus_one_ptid == ptid
|| ptid.is_pid ());
/* Mark the lwps we're resuming as resumed. */
- iterate_over_lwps (ptid, resume_set_callback
, NULL
);
+ iterate_over_lwps (ptid, resume_set_callback);
/* See if it's the current inferior that should be handled
specially. */
/* See if it's the current inferior that should be handled
specially. */
@@
-1764,13
+1766,16
@@
linux_nat_target::resume (ptid_t ptid, int step, enum gdb_signal signo)
}
if (resume_many)
}
if (resume_many)
- iterate_over_lwps (ptid, linux_nat_resume_callback, lp);
+ iterate_over_lwps (ptid, [=] (struct lwp_info *info)
+ {
+ return linux_nat_resume_callback (info, lp);
+ });
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"LLR: %s %s, %s (resume event thread)\n",
step ? "PTRACE_SINGLESTEP" : "PTRACE_CONT",
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"LLR: %s %s, %s (resume event thread)\n",
step ? "PTRACE_SINGLESTEP" : "PTRACE_CONT",
- target_pid_to_str (lp->ptid),
+ target_pid_to_str (lp->ptid)
.c_str ()
,
(signo != GDB_SIGNAL_0
? strsignal (gdb_signal_to_host (signo)) : "0"));
(signo != GDB_SIGNAL_0
? strsignal (gdb_signal_to_host (signo)) : "0"));
@@
-2171,7
+2176,7
@@
wait_lwp (struct lwp_info *lp)
thread_dead = 1;
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog, "WL: %s vanished.\n",
thread_dead = 1;
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog, "WL: %s vanished.\n",
- target_pid_to_str (lp->ptid));
+ target_pid_to_str (lp->ptid)
.c_str ()
);
}
if (pid != 0)
break;
}
if (pid != 0)
break;
@@
-2197,7
+2202,7
@@
wait_lwp (struct lwp_info *lp)
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"WL: Thread group leader %s vanished.\n",
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"WL: Thread group leader %s vanished.\n",
- target_pid_to_str (lp->ptid));
+ target_pid_to_str (lp->ptid)
.c_str ()
);
break;
}
break;
}
@@
-2220,7
+2225,7
@@
wait_lwp (struct lwp_info *lp)
{
fprintf_unfiltered (gdb_stdlog,
"WL: waitpid %s received %s\n",
{
fprintf_unfiltered (gdb_stdlog,
"WL: waitpid %s received %s\n",
- target_pid_to_str (lp->ptid),
+ target_pid_to_str (lp->ptid)
.c_str ()
,
status_to_str (status));
}
status_to_str (status));
}
@@
-2245,7
+2250,7
@@
wait_lwp (struct lwp_info *lp)
thread_dead = 1;
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog, "WL: %s exited.\n",
thread_dead = 1;
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog, "WL: %s exited.\n",
- target_pid_to_str (lp->ptid));
+ target_pid_to_str (lp->ptid)
.c_str ()
);
}
}
}
}
@@
-2303,7
+2308,7
@@
wait_lwp (struct lwp_info *lp)
/* Send a SIGSTOP to LP. */
static int
/* Send a SIGSTOP to LP. */
static int
-stop_callback (struct lwp_info *lp
, void *data
)
+stop_callback (struct lwp_info *lp)
{
if (!lp->stopped && !lp->signalled)
{
{
if (!lp->stopped && !lp->signalled)
{
@@
-2313,7
+2318,7
@@
stop_callback (struct lwp_info *lp, void *data)
{
fprintf_unfiltered (gdb_stdlog,
"SC: kill %s **<SIGSTOP>**\n",
{
fprintf_unfiltered (gdb_stdlog,
"SC: kill %s **<SIGSTOP>**\n",
- target_pid_to_str (lp->ptid));
+ target_pid_to_str (lp->ptid)
.c_str ()
);
}
errno = 0;
ret = kill_lwp (lp->ptid.lwp (), SIGSTOP);
}
errno = 0;
ret = kill_lwp (lp->ptid.lwp (), SIGSTOP);
@@
-2337,7
+2342,7
@@
stop_callback (struct lwp_info *lp, void *data)
void
linux_stop_lwp (struct lwp_info *lwp)
{
void
linux_stop_lwp (struct lwp_info *lwp)
{
- stop_callback (lwp
, NULL
);
+ stop_callback (lwp);
}
/* See linux-nat.h */
}
/* See linux-nat.h */
@@
-2346,11
+2351,11
@@
void
linux_stop_and_wait_all_lwps (void)
{
/* Stop all LWP's ... */
linux_stop_and_wait_all_lwps (void)
{
/* Stop all LWP's ... */
- iterate_over_lwps (minus_one_ptid, stop_callback
, NULL
);
+ iterate_over_lwps (minus_one_ptid, stop_callback);
/* ... and wait until all of them have reported back that
they're no longer running. */
/* ... and wait until all of them have reported back that
they're no longer running. */
- iterate_over_lwps (minus_one_ptid, stop_wait_callback
, NULL
);
+ iterate_over_lwps (minus_one_ptid, stop_wait_callback);
}
/* See linux-nat.h */
}
/* See linux-nat.h */
@@
-2359,7
+2364,10
@@
void
linux_unstop_all_lwps (void)
{
iterate_over_lwps (minus_one_ptid,
linux_unstop_all_lwps (void)
{
iterate_over_lwps (minus_one_ptid,
- resume_stopped_resumed_lwps, &minus_one_ptid);
+ [] (struct lwp_info *info)
+ {
+ return resume_stopped_resumed_lwps (info, minus_one_ptid);
+ });
}
/* Return non-zero if LWP PID has a pending SIGINT. */
}
/* Return non-zero if LWP PID has a pending SIGINT. */
@@
-2381,7
+2389,7
@@
linux_nat_has_pending_sigint (int pid)
/* Set a flag in LP indicating that we should ignore its next SIGINT. */
static int
/* Set a flag in LP indicating that we should ignore its next SIGINT. */
static int
-set_ignore_sigint (struct lwp_info *lp
, void *data
)
+set_ignore_sigint (struct lwp_info *lp)
{
/* If a thread has a pending SIGINT, consume it; otherwise, set a
flag to consume the next one. */
{
/* If a thread has a pending SIGINT, consume it; otherwise, set a
flag to consume the next one. */
@@
-2411,7
+2419,7
@@
maybe_clear_ignore_sigint (struct lwp_info *lp)
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"MCIS: Clearing bogus flag for %s\n",
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"MCIS: Clearing bogus flag for %s\n",
- target_pid_to_str (lp->ptid));
+ target_pid_to_str (lp->ptid)
.c_str ()
);
lp->ignore_sigint = 0;
}
}
lp->ignore_sigint = 0;
}
}
@@
-2482,7
+2490,7
@@
linux_nat_target::low_status_is_event (int status)
/* Wait until LP is stopped. */
static int
/* Wait until LP is stopped. */
static int
-stop_wait_callback (struct lwp_info *lp
, void *data
)
+stop_wait_callback (struct lwp_info *lp)
{
struct inferior *inf = find_inferior_ptid (lp->ptid);
{
struct inferior *inf = find_inferior_ptid (lp->ptid);
@@
-2511,10
+2519,10
@@
stop_wait_callback (struct lwp_info *lp, void *data)
fprintf_unfiltered (gdb_stdlog,
"PTRACE_CONT %s, 0, 0 (%s) "
"(discarding SIGINT)\n",
fprintf_unfiltered (gdb_stdlog,
"PTRACE_CONT %s, 0, 0 (%s) "
"(discarding SIGINT)\n",
- target_pid_to_str (lp->ptid),
+ target_pid_to_str (lp->ptid)
.c_str ()
,
errno ? safe_strerror (errno) : "OK");
errno ? safe_strerror (errno) : "OK");
- return stop_wait_callback (lp
, NULL
);
+ return stop_wait_callback (lp);
}
maybe_clear_ignore_sigint (lp);
}
maybe_clear_ignore_sigint (lp);
@@
-2527,7
+2535,7
@@
stop_wait_callback (struct lwp_info *lp, void *data)
fprintf_unfiltered (gdb_stdlog,
"SWC: Pending event %s in %s\n",
status_to_str ((int) status),
fprintf_unfiltered (gdb_stdlog,
"SWC: Pending event %s in %s\n",
status_to_str ((int) status),
- target_pid_to_str (lp->ptid));
+ target_pid_to_str (lp->ptid)
.c_str ()
);
/* Save the sigtrap event. */
lp->status = status;
/* Save the sigtrap event. */
lp->status = status;
@@
-2541,7
+2549,7
@@
stop_wait_callback (struct lwp_info *lp, void *data)
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"SWC: Expected SIGSTOP caught for %s.\n",
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"SWC: Expected SIGSTOP caught for %s.\n",
- target_pid_to_str (lp->ptid));
+ target_pid_to_str (lp->ptid)
.c_str ()
);
lp->signalled = 0;
lp->signalled = 0;
@@
-2564,7
+2572,7
@@
stop_wait_callback (struct lwp_info *lp, void *data)
caused the stop became uninteresting. */
static int
caused the stop became uninteresting. */
static int
-status_callback (struct lwp_info *lp
, void *data
)
+status_callback (struct lwp_info *lp)
{
/* Only report a pending wait status if we pretend that this has
indeed been resumed. */
{
/* Only report a pending wait status if we pretend that this has
indeed been resumed. */
@@
-2588,7
+2596,7
@@
status_callback (struct lwp_info *lp, void *data)
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"SC: PC of %s changed. was=%s, now=%s\n",
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"SC: PC of %s changed. was=%s, now=%s\n",
- target_pid_to_str (lp->ptid),
+ target_pid_to_str (lp->ptid)
.c_str ()
,
paddress (target_gdbarch (), lp->stop_pc),
paddress (target_gdbarch (), pc));
discard = 1;
paddress (target_gdbarch (), lp->stop_pc),
paddress (target_gdbarch (), pc));
discard = 1;
@@
-2600,7
+2608,7
@@
status_callback (struct lwp_info *lp, void *data)
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"SC: previous breakpoint of %s, at %s gone\n",
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"SC: previous breakpoint of %s, at %s gone\n",
- target_pid_to_str (lp->ptid),
+ target_pid_to_str (lp->ptid)
.c_str ()
,
paddress (target_gdbarch (), lp->stop_pc));
discard = 1;
paddress (target_gdbarch (), lp->stop_pc));
discard = 1;
@@
-2612,7
+2620,7
@@
status_callback (struct lwp_info *lp, void *data)
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"SC: pending event of %s cancelled.\n",
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"SC: pending event of %s cancelled.\n",
- target_pid_to_str (lp->ptid));
+ target_pid_to_str (lp->ptid)
.c_str ()
);
lp->status = 0;
linux_resume_one_lwp (lp, lp->step, GDB_SIGNAL_0);
lp->status = 0;
linux_resume_one_lwp (lp, lp->step, GDB_SIGNAL_0);
@@
-2626,10
+2634,8
@@
status_callback (struct lwp_info *lp, void *data)
/* Count the LWP's that have had events. */
static int
/* Count the LWP's that have had events. */
static int
-count_events_callback (struct lwp_info *lp,
void *data
)
+count_events_callback (struct lwp_info *lp,
int *count
)
{
{
- int *count = (int *) data;
-
gdb_assert (count != NULL);
/* Select only resumed LWPs that have an event pending. */
gdb_assert (count != NULL);
/* Select only resumed LWPs that have an event pending. */
@@
-2642,7
+2648,7
@@
count_events_callback (struct lwp_info *lp, void *data)
/* Select the LWP (if any) that is currently being single-stepped. */
static int
/* Select the LWP (if any) that is currently being single-stepped. */
static int
-select_singlestep_lwp_callback (struct lwp_info *lp
, void *data
)
+select_singlestep_lwp_callback (struct lwp_info *lp)
{
if (lp->last_resume_kind == resume_step
&& lp->status != 0)
{
if (lp->last_resume_kind == resume_step
&& lp->status != 0)
@@
-2665,10
+2671,8
@@
lwp_status_pending_p (struct lwp_info *lp)
/* Select the Nth LWP that has had an event. */
static int
/* Select the Nth LWP that has had an event. */
static int
-select_event_lwp_callback (struct lwp_info *lp,
void *data
)
+select_event_lwp_callback (struct lwp_info *lp,
int *selector
)
{
{
- int *selector = (int *) data;
-
gdb_assert (selector != NULL);
/* Select only resumed LWPs that have an event pending. */
gdb_assert (selector != NULL);
/* Select only resumed LWPs that have an event pending. */
@@
-2742,7
+2746,7
@@
save_stop_reason (struct lwp_info *lp)
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"CSBB: %s stopped by trace\n",
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"CSBB: %s stopped by trace\n",
- target_pid_to_str (lp->ptid));
+ target_pid_to_str (lp->ptid)
.c_str ()
);
/* We may have single stepped an instruction that
triggered a watchpoint. In that case, on some
/* We may have single stepped an instruction that
triggered a watchpoint. In that case, on some
@@
-2775,7
+2779,7
@@
save_stop_reason (struct lwp_info *lp)
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"CSBB: %s stopped by software breakpoint\n",
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"CSBB: %s stopped by software breakpoint\n",
- target_pid_to_str (lp->ptid));
+ target_pid_to_str (lp->ptid)
.c_str ()
);
/* Back up the PC if necessary. */
if (pc != sw_bp_pc)
/* Back up the PC if necessary. */
if (pc != sw_bp_pc)
@@
-2789,14
+2793,14
@@
save_stop_reason (struct lwp_info *lp)
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"CSBB: %s stopped by hardware breakpoint\n",
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"CSBB: %s stopped by hardware breakpoint\n",
- target_pid_to_str (lp->ptid));
+ target_pid_to_str (lp->ptid)
.c_str ()
);
}
else if (lp->stop_reason == TARGET_STOPPED_BY_WATCHPOINT)
{
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"CSBB: %s stopped by hardware watchpoint\n",
}
else if (lp->stop_reason == TARGET_STOPPED_BY_WATCHPOINT)
{
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"CSBB: %s stopped by hardware watchpoint\n",
- target_pid_to_str (lp->ptid));
+ target_pid_to_str (lp->ptid)
.c_str ()
);
}
lp->stop_pc = pc;
}
lp->stop_pc = pc;
@@
-2867,14
+2871,13
@@
select_event_lwp (ptid_t filter, struct lwp_info **orig_lp, int *status)
signal. */
if (!target_is_non_stop_p ())
{
signal. */
if (!target_is_non_stop_p ())
{
- event_lp = iterate_over_lwps (filter,
- select_singlestep_lwp_callback, NULL);
+ event_lp = iterate_over_lwps (filter, select_singlestep_lwp_callback);
if (event_lp != NULL)
{
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"SEL: Select single-step %s\n",
if (event_lp != NULL)
{
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"SEL: Select single-step %s\n",
- target_pid_to_str (event_lp->ptid));
+ target_pid_to_str (event_lp->ptid)
.c_str ()
);
}
}
}
}
@@
-2883,7
+2886,11
@@
select_event_lwp (ptid_t filter, struct lwp_info **orig_lp, int *status)
/* Pick one at random, out of those which have had events. */
/* First see how many events we have. */
/* Pick one at random, out of those which have had events. */
/* First see how many events we have. */
- iterate_over_lwps (filter, count_events_callback, &num_events);
+ iterate_over_lwps (filter,
+ [&] (struct lwp_info *info)
+ {
+ return count_events_callback (info, &num_events);
+ });
gdb_assert (num_events > 0);
/* Now randomly pick a LWP out of those that have had
gdb_assert (num_events > 0);
/* Now randomly pick a LWP out of those that have had
@@
-2896,9
+2903,14
@@
select_event_lwp (ptid_t filter, struct lwp_info **orig_lp, int *status)
"SEL: Found %d events, selecting #%d\n",
num_events, random_selector);
"SEL: Found %d events, selecting #%d\n",
num_events, random_selector);
- event_lp = iterate_over_lwps (filter,
- select_event_lwp_callback,
- &random_selector);
+ event_lp
+ = (iterate_over_lwps
+ (filter,
+ [&] (struct lwp_info *info)
+ {
+ return select_event_lwp_callback (info,
+ &random_selector);
+ }));
}
if (event_lp != NULL)
}
if (event_lp != NULL)
@@
-2915,7
+2927,7
@@
select_event_lwp (ptid_t filter, struct lwp_info **orig_lp, int *status)
/* Return non-zero if LP has been resumed. */
static int
/* Return non-zero if LP has been resumed. */
static int
-resumed_callback (struct lwp_info *lp
, void *data
)
+resumed_callback (struct lwp_info *lp)
{
return lp->resumed;
}
{
return lp->resumed;
}
@@
-3028,7
+3040,7
@@
linux_nat_filter_event (int lwpid, int status)
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"LLW: %s exited.\n",
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"LLW: %s exited.\n",
- target_pid_to_str (lp->ptid));
+ target_pid_to_str (lp->ptid)
.c_str ()
);
/* If there is at least one more LWP, then the exit signal
was not the end of the debugged application and should be
/* If there is at least one more LWP, then the exit signal
was not the end of the debugged application and should be
@@
-3067,7
+3079,7
@@
linux_nat_filter_event (int lwpid, int status)
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"LLW: resume_stop SIGSTOP caught for %s.\n",
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"LLW: resume_stop SIGSTOP caught for %s.\n",
- target_pid_to_str (lp->ptid));
+ target_pid_to_str (lp->ptid)
.c_str ()
);
}
else
{
}
else
{
@@
-3078,7
+3090,7
@@
linux_nat_filter_event (int lwpid, int status)
"LLW: %s %s, 0, 0 (discard delayed SIGSTOP)\n",
lp->step ?
"PTRACE_SINGLESTEP" : "PTRACE_CONT",
"LLW: %s %s, 0, 0 (discard delayed SIGSTOP)\n",
lp->step ?
"PTRACE_SINGLESTEP" : "PTRACE_CONT",
- target_pid_to_str (lp->ptid));
+ target_pid_to_str (lp->ptid)
.c_str ()
);
linux_resume_one_lwp (lp, lp->step, GDB_SIGNAL_0);
gdb_assert (lp->resumed);
linux_resume_one_lwp (lp, lp->step, GDB_SIGNAL_0);
gdb_assert (lp->resumed);
@@
-3094,7
+3106,7
@@
linux_nat_filter_event (int lwpid, int status)
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"LLW: Delayed SIGINT caught for %s.\n",
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"LLW: Delayed SIGINT caught for %s.\n",
- target_pid_to_str (lp->ptid));
+ target_pid_to_str (lp->ptid)
.c_str ()
);
/* This is a delayed SIGINT. */
lp->ignore_sigint = 0;
/* This is a delayed SIGINT. */
lp->ignore_sigint = 0;
@@
-3105,7
+3117,7
@@
linux_nat_filter_event (int lwpid, int status)
"LLW: %s %s, 0, 0 (discard SIGINT)\n",
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));
+ target_pid_to_str (lp->ptid)
.c_str ()
);
gdb_assert (lp->resumed);
/* Discard the event. */
gdb_assert (lp->resumed);
/* Discard the event. */
@@
-3134,8
+3146,7
@@
linux_nat_filter_event (int lwpid, int status)
will receive it - unless they're using CLONE_THREAD to
share signals. Since we only want to report it once, we
mark it as ignored for all LWPs except this one. */
will receive it - unless they're using CLONE_THREAD to
share signals. Since we only want to report it once, we
mark it as ignored for all LWPs except this one. */
- iterate_over_lwps (ptid_t (lp->ptid.pid ()),
- set_ignore_sigint, NULL);
+ iterate_over_lwps (ptid_t (lp->ptid.pid ()), set_ignore_sigint);
lp->ignore_sigint = 0;
}
else
lp->ignore_sigint = 0;
}
else
@@
-3155,7
+3166,7
@@
linux_nat_filter_event (int lwpid, int status)
"LLW: %s %s, %s (preempt 'handle')\n",
lp->step ?
"PTRACE_SINGLESTEP" : "PTRACE_CONT",
"LLW: %s %s, %s (preempt 'handle')\n",
lp->step ?
"PTRACE_SINGLESTEP" : "PTRACE_CONT",
- target_pid_to_str (lp->ptid),
+ target_pid_to_str (lp->ptid)
.c_str ()
,
(signo != GDB_SIGNAL_0
? strsignal (gdb_signal_to_host (signo))
: "0"));
(signo != GDB_SIGNAL_0
? strsignal (gdb_signal_to_host (signo))
: "0"));
@@
-3277,14
+3288,14
@@
linux_nat_wait_1 (ptid_t ptid, struct target_waitstatus *ourstatus,
block_child_signals (&prev_mask);
/* First check if there is a LWP with a wait status pending. */
block_child_signals (&prev_mask);
/* First check if there is a LWP with a wait status pending. */
- lp = iterate_over_lwps (ptid, status_callback
, NULL
);
+ lp = iterate_over_lwps (ptid, status_callback);
if (lp != NULL)
{
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"LLW: Using pending wait status %s for %s.\n",
status_to_str (lp->status),
if (lp != NULL)
{
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"LLW: Using pending wait status %s for %s.\n",
status_to_str (lp->status),
- target_pid_to_str (lp->ptid));
+ target_pid_to_str (lp->ptid)
.c_str ()
);
}
/* But if we don't find a pending event, we'll have to wait. Always
}
/* But if we don't find a pending event, we'll have to wait. Always
@@
-3334,11
+3345,14
@@
linux_nat_wait_1 (ptid_t ptid, struct target_waitstatus *ourstatus,
/* Now that we've pulled all events out of the kernel, resume
LWPs that don't have an interesting event to report. */
iterate_over_lwps (minus_one_ptid,
/* Now that we've pulled all events out of the kernel, resume
LWPs that don't have an interesting event to report. */
iterate_over_lwps (minus_one_ptid,
- resume_stopped_resumed_lwps, &minus_one_ptid);
+ [] (struct lwp_info *info)
+ {
+ return resume_stopped_resumed_lwps (info, minus_one_ptid);
+ });
/* ... and find an LWP with a status to report to the core, if
any. */
/* ... and find an LWP with a status to report to the core, if
any. */
- lp = iterate_over_lwps (ptid, status_callback
, NULL
);
+ lp = iterate_over_lwps (ptid, status_callback);
if (lp != NULL)
break;
if (lp != NULL)
break;
@@
-3348,7
+3362,7
@@
linux_nat_wait_1 (ptid_t ptid, struct target_waitstatus *ourstatus,
/* If there are no resumed children left, bail. We'd be stuck
forever in the sigsuspend call below otherwise. */
/* If there are no resumed children left, bail. We'd be stuck
forever in the sigsuspend call below otherwise. */
- if (iterate_over_lwps (ptid, resumed_callback
, NULL
) == NULL)
+ if (iterate_over_lwps (ptid, resumed_callback) == NULL)
{
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog, "LLW: exit (no resumed LWP)\n");
{
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog, "LLW: exit (no resumed LWP)\n");
@@
-3386,11
+3400,11
@@
linux_nat_wait_1 (ptid_t ptid, struct target_waitstatus *ourstatus,
if (!target_is_non_stop_p ())
{
/* Now stop all other LWP's ... */
if (!target_is_non_stop_p ())
{
/* Now stop all other LWP's ... */
- iterate_over_lwps (minus_one_ptid, stop_callback
, NULL
);
+ iterate_over_lwps (minus_one_ptid, stop_callback);
/* ... and wait until all of them have reported back that
they're no longer running. */
/* ... and wait until all of them have reported back that
they're no longer running. */
- iterate_over_lwps (minus_one_ptid, stop_wait_callback
, NULL
);
+ iterate_over_lwps (minus_one_ptid, stop_wait_callback);
}
/* If we're not waiting for a specific LWP, choose an event LWP from
}
/* If we're not waiting for a specific LWP, choose an event LWP from
@@
-3429,11
+3443,11
@@
linux_nat_wait_1 (ptid_t ptid, struct target_waitstatus *ourstatus,
{
/* In all-stop, from the core's perspective, all LWPs are now
stopped until a new resume action is sent over. */
{
/* In all-stop, from the core's perspective, all LWPs are now
stopped until a new resume action is sent over. */
- iterate_over_lwps (minus_one_ptid, resume_clear_callback
, NULL
);
+ iterate_over_lwps (minus_one_ptid, resume_clear_callback);
}
else
{
}
else
{
- resume_clear_callback (lp
, NULL
);
+ resume_clear_callback (lp);
}
if (linux_target->low_status_is_event (status))
}
if (linux_target->low_status_is_event (status))
@@
-3441,7
+3455,7
@@
linux_nat_wait_1 (ptid_t ptid, struct target_waitstatus *ourstatus,
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"LLW: trap ptid is %s.\n",
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"LLW: trap ptid is %s.\n",
- target_pid_to_str (lp->ptid));
+ target_pid_to_str (lp->ptid)
.c_str ()
);
}
if (lp->waitstatus.kind != TARGET_WAITKIND_IGNORE)
}
if (lp->waitstatus.kind != TARGET_WAITKIND_IGNORE)
@@
-3483,30
+3497,28
@@
linux_nat_wait_1 (ptid_t ptid, struct target_waitstatus *ourstatus,
to report, but are resumed from the core's perspective. */
static int
to report, but are resumed from the core's perspective. */
static int
-resume_stopped_resumed_lwps (struct lwp_info *lp,
void *data
)
+resume_stopped_resumed_lwps (struct lwp_info *lp,
const ptid_t wait_ptid
)
{
{
- ptid_t *wait_ptid_p = (ptid_t *) data;
-
if (!lp->stopped)
{
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"RSRL: NOT resuming LWP %s, not stopped\n",
if (!lp->stopped)
{
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"RSRL: NOT resuming LWP %s, not stopped\n",
- target_pid_to_str (lp->ptid));
+ target_pid_to_str (lp->ptid)
.c_str ()
);
}
else if (!lp->resumed)
{
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"RSRL: NOT resuming LWP %s, not resumed\n",
}
else if (!lp->resumed)
{
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"RSRL: NOT resuming LWP %s, not resumed\n",
- target_pid_to_str (lp->ptid));
+ target_pid_to_str (lp->ptid)
.c_str ()
);
}
else if (lwp_status_pending_p (lp))
{
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"RSRL: NOT resuming LWP %s, has pending status\n",
}
else if (lwp_status_pending_p (lp))
{
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"RSRL: NOT resuming LWP %s, has pending status\n",
- target_pid_to_str (lp->ptid));
+ target_pid_to_str (lp->ptid)
.c_str ()
);
}
else
{
}
else
{
@@
-3520,7
+3532,7
@@
resume_stopped_resumed_lwps (struct lwp_info *lp, void *data)
/* Don't bother if there's a breakpoint at PC that we'd hit
immediately, and we're not waiting for this LWP. */
/* Don't bother if there's a breakpoint at PC that we'd hit
immediately, and we're not waiting for this LWP. */
- if (!lp->ptid.matches (
*wait_ptid_p
))
+ if (!lp->ptid.matches (
wait_ptid
))
{
if (breakpoint_inserted_here_p (regcache->aspace (), pc))
leave_stopped = 1;
{
if (breakpoint_inserted_here_p (regcache->aspace (), pc))
leave_stopped = 1;
@@
-3532,7
+3544,7
@@
resume_stopped_resumed_lwps (struct lwp_info *lp, void *data)
fprintf_unfiltered (gdb_stdlog,
"RSRL: resuming stopped-resumed LWP %s at "
"%s: step=%d\n",
fprintf_unfiltered (gdb_stdlog,
"RSRL: resuming stopped-resumed LWP %s at "
"%s: step=%d\n",
- target_pid_to_str (lp->ptid),
+ target_pid_to_str (lp->ptid)
.c_str ()
,
paddress (gdbarch, pc),
lp->step);
paddress (gdbarch, pc),
lp->step);
@@
-3561,7
+3573,7
@@
linux_nat_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus,
std::string options_string = target_options_to_string (target_options);
fprintf_unfiltered (gdb_stdlog,
"linux_nat_wait: [%s], [%s]\n",
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),
+ target_pid_to_str (ptid)
.c_str ()
,
options_string.c_str ());
}
options_string.c_str ());
}
@@
-3577,7
+3589,11
@@
linux_nat_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus,
meanwhile the event became uninteresting. Don't bother resuming
LWPs we're not going to wait for if they'd stop immediately. */
if (target_is_non_stop_p ())
meanwhile the event became uninteresting. Don't bother resuming
LWPs we're not going to wait for if they'd stop immediately. */
if (target_is_non_stop_p ())
- iterate_over_lwps (minus_one_ptid, resume_stopped_resumed_lwps, &ptid);
+ iterate_over_lwps (minus_one_ptid,
+ [=] (struct lwp_info *info)
+ {
+ return resume_stopped_resumed_lwps (info, ptid);
+ });
event_ptid = linux_nat_wait_1 (ptid, ourstatus, target_options);
event_ptid = linux_nat_wait_1 (ptid, ourstatus, target_options);
@@
-3660,7
+3676,7
@@
kill_wait_one_lwp (pid_t pid)
/* Callback for iterate_over_lwps. */
static int
/* Callback for iterate_over_lwps. */
static int
-kill_callback (struct lwp_info *lp
, void *data
)
+kill_callback (struct lwp_info *lp)
{
kill_one_lwp (lp->ptid.lwp ());
return 0;
{
kill_one_lwp (lp->ptid.lwp ());
return 0;
@@
-3669,7
+3685,7
@@
kill_callback (struct lwp_info *lp, void *data)
/* Callback for iterate_over_lwps. */
static int
/* Callback for iterate_over_lwps. */
static int
-kill_wait_callback (struct lwp_info *lp
, void *data
)
+kill_wait_callback (struct lwp_info *lp)
{
kill_wait_one_lwp (lp->ptid.lwp ());
return 0;
{
kill_wait_one_lwp (lp->ptid.lwp ());
return 0;
@@
-3718,16
+3734,16
@@
linux_nat_target::kill ()
/* Stop all threads before killing them, since ptrace requires
that the thread is stopped to sucessfully PTRACE_KILL. */
/* Stop all threads before killing them, since ptrace requires
that the thread is stopped to sucessfully PTRACE_KILL. */
- iterate_over_lwps (ptid, stop_callback
, NULL
);
+ iterate_over_lwps (ptid, stop_callback);
/* ... and wait until all of them have reported back that
they're no longer running. */
/* ... and wait until all of them have reported back that
they're no longer running. */
- iterate_over_lwps (ptid, stop_wait_callback
, NULL
);
+ iterate_over_lwps (ptid, stop_wait_callback);
/* Kill all LWP's ... */
/* Kill all LWP's ... */
- iterate_over_lwps (ptid, kill_callback
, NULL
);
+ iterate_over_lwps (ptid, kill_callback);
/* ... and wait until we've flushed all events. */
/* ... and wait until we've flushed all events. */
- iterate_over_lwps (ptid, kill_wait_callback
, NULL
);
+ iterate_over_lwps (ptid, kill_wait_callback);
}
target_mourn_inferior (inferior_ptid);
}
target_mourn_inferior (inferior_ptid);
@@
-3929,18
+3945,13
@@
linux_nat_target::update_thread_list ()
}
}
}
}
-const char *
+std::string
linux_nat_target::pid_to_str (ptid_t ptid)
{
linux_nat_target::pid_to_str (ptid_t ptid)
{
- static char buf[64];
-
if (ptid.lwp_p ()
&& (ptid.pid () != ptid.lwp ()
|| num_lwps (ptid.pid ()) > 1))
if (ptid.lwp_p ()
&& (ptid.pid () != ptid.lwp ()
|| num_lwps (ptid.pid ()) > 1))
- {
- snprintf (buf, sizeof (buf), "LWP %ld", ptid.lwp ());
- return buf;
- }
+ return string_printf ("LWP %ld", ptid.lwp ());
return normal_pid_to_str (ptid);
}
return normal_pid_to_str (ptid);
}
@@
-4223,22
+4234,10
@@
linux_nat_xfer_osdata (enum target_object object,
return TARGET_XFER_OK;
}
return TARGET_XFER_OK;
}
-static void
-cleanup_target_stop (void *arg)
-{
- ptid_t *ptid = (ptid_t *) arg;
-
- gdb_assert (arg != NULL);
-
- /* Unpause all */
- target_continue_no_signal (*ptid);
-}
-
std::vector<static_tracepoint_marker>
linux_nat_target::static_tracepoint_markers_by_strid (const char *strid)
{
char s[IPA_CMD_BUF_SIZE];
std::vector<static_tracepoint_marker>
linux_nat_target::static_tracepoint_markers_by_strid (const char *strid)
{
char s[IPA_CMD_BUF_SIZE];
- struct cleanup *old_chain;
int pid = inferior_ptid.pid ();
std::vector<static_tracepoint_marker> markers;
const char *p = s;
int pid = inferior_ptid.pid ();
std::vector<static_tracepoint_marker> markers;
const char *p = s;
@@
-4253,7
+4252,8
@@
linux_nat_target::static_tracepoint_markers_by_strid (const char *strid)
agent_run_command (pid, s, strlen (s) + 1);
agent_run_command (pid, s, strlen (s) + 1);
- old_chain = make_cleanup (cleanup_target_stop, &ptid);
+ /* Unpause all. */
+ SCOPE_EXIT { target_continue_no_signal (ptid); };
while (*p++ == 'm')
{
while (*p++ == 'm')
{
@@
-4272,8
+4272,6
@@
linux_nat_target::static_tracepoint_markers_by_strid (const char *strid)
p = s;
}
p = s;
}
- do_cleanups (old_chain);
-
return markers;
}
return markers;
}
@@
-4426,14
+4424,14
@@
linux_nat_target::async (int enable)
event came out. */
static int
event came out. */
static int
-linux_nat_stop_lwp (struct lwp_info *lwp
, void *data
)
+linux_nat_stop_lwp (struct lwp_info *lwp)
{
if (!lwp->stopped)
{
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"LNSL: running -> suspending %s\n",
{
if (!lwp->stopped)
{
if (debug_linux_nat)
fprintf_unfiltered (gdb_stdlog,
"LNSL: running -> suspending %s\n",
- target_pid_to_str (lwp->ptid));
+ target_pid_to_str (lwp->ptid)
.c_str ()
);
if (lwp->last_resume_kind == resume_stop)
if (lwp->last_resume_kind == resume_stop)
@@
-4446,7
+4444,7
@@
linux_nat_stop_lwp (struct lwp_info *lwp, void *data)
return 0;
}
return 0;
}
- stop_callback (lwp
, NULL
);
+ stop_callback (lwp);
lwp->last_resume_kind = resume_stop;
}
else
lwp->last_resume_kind = resume_stop;
}
else
@@
-4458,12
+4456,12
@@
linux_nat_stop_lwp (struct lwp_info *lwp, void *data)
if (find_thread_ptid (lwp->ptid)->stop_requested)
fprintf_unfiltered (gdb_stdlog,
"LNSL: already stopped/stop_requested %s\n",
if (find_thread_ptid (lwp->ptid)->stop_requested)
fprintf_unfiltered (gdb_stdlog,
"LNSL: already stopped/stop_requested %s\n",
- target_pid_to_str (lwp->ptid));
+ target_pid_to_str (lwp->ptid)
.c_str ()
);
else
fprintf_unfiltered (gdb_stdlog,
"LNSL: already stopped/no "
"stop_requested yet %s\n",
else
fprintf_unfiltered (gdb_stdlog,
"LNSL: already stopped/no "
"stop_requested yet %s\n",
- target_pid_to_str (lwp->ptid));
+ target_pid_to_str (lwp->ptid)
.c_str ()
);
}
}
return 0;
}
}
return 0;
@@
-4472,7
+4470,7
@@
linux_nat_stop_lwp (struct lwp_info *lwp, void *data)
void
linux_nat_target::stop (ptid_t ptid)
{
void
linux_nat_target::stop (ptid_t ptid)
{
- iterate_over_lwps (ptid, linux_nat_stop_lwp
, NULL
);
+ iterate_over_lwps (ptid, linux_nat_stop_lwp);
}
void
}
void
This page took
0.041198 seconds
and
4
git commands to generate.