From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH 05/12] Remove cleanup from linux-nat.c
Date: Wed, 09 Jan 2019 03:34:00 -0000 [thread overview]
Message-ID: <20190109033426.16062-6-tom@tromey.com> (raw)
In-Reply-To: <20190109033426.16062-1-tom@tromey.com>
This removes a cleanup from linux-nat.c, replacing it with a
cleanup_function.
gdb/ChangeLog
2019-01-08 Tom Tromey <tom@tromey.com>
* linux-nat.c (cleanup_target_stop): Remove.
(linux_nat_target::static_tracepoint_markers_by_strid): Use
cleanup_function.
---
gdb/ChangeLog | 6 ++++++
gdb/linux-nat.c | 23 ++++++++---------------
2 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index 73d4fd193a..d1c4707b4b 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -66,6 +66,7 @@
#include "objfiles.h"
#include "nat/linux-namespaces.h"
#include "fileio.h"
+#include "common/cleanup-function.h"
#ifndef SPUFS_MAGIC
#define SPUFS_MAGIC 0x23c9b64e
@@ -4223,22 +4224,10 @@ linux_nat_xfer_osdata (enum target_object object,
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];
- struct cleanup *old_chain;
int pid = inferior_ptid.pid ();
std::vector<static_tracepoint_marker> markers;
const char *p = s;
@@ -4253,7 +4242,13 @@ linux_nat_target::static_tracepoint_markers_by_strid (const char *strid)
agent_run_command (pid, s, strlen (s) + 1);
- old_chain = make_cleanup (cleanup_target_stop, &ptid);
+ auto continue_func
+ = [=] ()
+ {
+ /* Unpause all */
+ target_continue_no_signal (ptid);
+ };
+ cleanup_function continue_at_end (continue_func);
while (*p++ == 'm')
{
@@ -4272,8 +4267,6 @@ linux_nat_target::static_tracepoint_markers_by_strid (const char *strid)
p = s;
}
- do_cleanups (old_chain);
-
return markers;
}
--
2.17.2
next prev parent reply other threads:[~2019-01-09 3:34 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-12 11:50 [PATCH 00/12] remove some cleanups using a cleanup function Andrew Burgess
2019-01-09 3:34 ` Tom Tromey
2019-01-09 3:34 ` [PATCH 06/12] Remove clear_symtab_users_cleanup Tom Tromey
2019-01-09 3:34 ` [PATCH 12/12] Use cleanup_function in regcache.c Tom Tromey
2019-01-09 3:34 ` [PATCH 09/12] Remove remaining cleanup from fetch_inferior_event Tom Tromey
2019-01-09 3:34 ` [PATCH 08/12] Remove cleanup from stop_all_threads Tom Tromey
2019-01-09 3:34 ` [PATCH 10/12] Update an obsolete cleanup comment Tom Tromey
2019-01-09 3:34 ` [PATCH 03/12] Remove make_bpstat_clear_actions_cleanup Tom Tromey
2019-01-09 3:34 ` [PATCH 07/12] Remove delete_just_stopped_threads_infrun_breakpoints_cleanup Tom Tromey
2019-01-09 3:34 ` Tom Tromey [this message]
2019-01-09 3:34 ` [PATCH 04/12] Remove cleanup_delete_std_terminate_breakpoint Tom Tromey
2019-01-09 3:34 ` [PATCH 11/12] Update cleanup comment in ui-out.h Tom Tromey
2019-01-09 3:34 ` [PATCH 01/12] Remove delete_longjmp_breakpoint_cleanup Tom Tromey
2019-01-09 3:36 ` [PATCH 02/12] Remove remaining cleanup from breakpoint.c Tom Tromey
2019-01-11 6:56 ` [PATCH 00/12] remove some cleanups using a cleanup function Joel Brobecker
2019-01-12 11:50 ` [PATCH 4/4] gdb/testsuite: Don't allow paths to appear in test name Andrew Burgess
2019-01-12 11:50 ` [PATCH 2/4] gdb: Remove remaining cleanup from breakpoint.c Andrew Burgess
2019-01-12 11:50 ` [PATCH 1/4] gdb: Remove delete_longjmp_breakpoint_cleanup Andrew Burgess
2019-01-12 11:50 ` [PATCH 3/4] gdb: Remove make_bpstat_clear_actions_cleanup Andrew Burgess
2019-01-12 15:54 ` [PATCH 00/12] remove some cleanups using a cleanup function Tom Tromey
2019-01-12 22:41 ` Tom Tromey
2019-01-14 11:06 ` Andrew Burgess
2019-01-14 15:39 ` Pedro Alves
2019-01-14 20:37 ` Pedro Alves
2019-01-15 9:42 ` Andrew Burgess
[not found] ` <87ef9dttfl.fsf@tromey.com>
2019-01-15 23:43 ` Pedro Alves
2019-01-16 11:19 ` Andrew Burgess
2019-01-16 23:10 ` Pedro Alves
2019-01-17 21:39 ` Tom Tromey
2019-01-21 20:12 ` Pedro Alves
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190109033426.16062-6-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox