From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH v2 05/22] Remove last cleanup from gdbserver
Date: Wed, 27 Feb 2019 20:18:00 -0000 [thread overview]
Message-ID: <20190227201849.32210-6-tom@tromey.com> (raw)
In-Reply-To: <20190227201849.32210-1-tom@tromey.com>
This removes the last cleanup from gdbserver, replacing it with
SCOPE_EXIT. This could perhaps be done in a different way, but this
approach was direct and obviously correct.
gdb/gdbserver/ChangeLog
2019-02-27 Tom Tromey <tom@tromey.com>
* server.c (detach_or_kill_for_exit_cleanup): Remove parameter.
(captured_main): Use SCOPE_EXIT.
---
gdb/gdbserver/ChangeLog | 5 +++++
gdb/gdbserver/server.c | 11 ++++++-----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index e960c10d402..25c62aad830 100644
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -43,6 +43,7 @@
#include "common/pathstuff.h"
#include "common/selftest.h"
+#include "common/scope-exit.h"
#define require_running_or_return(BUF) \
if (!target_running ()) \
@@ -3545,17 +3546,16 @@ detach_or_kill_for_exit (void)
/* Value that will be passed to exit(3) when gdbserver exits. */
static int exit_code;
-/* Cleanup version of detach_or_kill_for_exit. */
+/* Wrapper for detach_or_kill_for_exit that catches and prints
+ errors. */
static void
-detach_or_kill_for_exit_cleanup (void *ignore)
+detach_or_kill_for_exit_cleanup ()
{
-
TRY
{
detach_or_kill_for_exit ();
}
-
CATCH (exception, RETURN_MASK_ALL)
{
fflush (stdout);
@@ -3832,7 +3832,8 @@ captured_main (int argc, char *argv[])
cs.last_status.value.integer = 0;
cs.last_ptid = minus_one_ptid;
}
- make_cleanup (detach_or_kill_for_exit_cleanup, NULL);
+
+ SCOPE_EXIT { detach_or_kill_for_exit_cleanup (); };
/* Don't report shared library events on the initial connection,
even if some libraries are preloaded. Avoids the "stopped by
--
2.17.2
next prev parent reply other threads:[~2019-02-27 20:18 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-27 20:18 [PATCH v2 00/22] Remove cleanups Tom Tromey
2019-02-27 20:18 ` Tom Tromey [this message]
2019-03-06 19:23 ` [PATCH v2 05/22] Remove last cleanup from gdbserver Pedro Alves
2019-02-27 20:18 ` [PATCH v2 08/22] Remove last cleanup solib-aix.c Tom Tromey
2019-03-06 19:34 ` Pedro Alves
2019-03-06 21:19 ` Tom Tromey
2019-02-27 20:19 ` [PATCH v2 06/22] Remove cleanup from solib-svr4.c Tom Tromey
2019-03-06 19:24 ` Pedro Alves
2019-02-27 20:19 ` [PATCH v2 19/22] Make exception throwing a bit more efficient Tom Tromey
2019-04-03 17:04 ` Pedro Alves
2019-02-27 20:19 ` [PATCH v2 09/22] Remove last cleanup from linux-namespaces.c Tom Tromey
2019-03-06 21:07 ` Pedro Alves
2019-02-27 20:19 ` [PATCH v2 03/22] Change displaced_step_clear_cleanup with a forward_scope_exit Tom Tromey
2019-03-06 19:23 ` Pedro Alves
2019-02-27 20:19 ` [PATCH v2 13/22] Remove free_current_contents Tom Tromey
2019-03-06 21:34 ` Pedro Alves
2019-02-27 20:19 ` [PATCH v2 20/22] Replace throw_exception with throw in some cases Tom Tromey
2019-04-03 17:05 ` Pedro Alves
2019-02-27 20:19 ` [PATCH v2 21/22] Use SCOPE_EXIT in write_gcore_file Tom Tromey
2019-03-06 22:01 ` Pedro Alves
2019-03-06 22:31 ` Tom Tromey
2019-03-06 22:54 ` Pedro Alves
2019-03-06 22:56 ` Tom Tromey
2019-03-06 23:08 ` Tom Tromey
2019-02-27 20:19 ` [PATCH v2 07/22] Remove last cleanups from solib-svr4.c Tom Tromey
2019-03-06 19:32 ` Pedro Alves
2019-03-06 19:39 ` John Baldwin
2019-03-06 21:18 ` Tom Tromey
2019-02-27 20:19 ` [PATCH v2 14/22] Simplify exception handling Tom Tromey
2019-04-02 22:07 ` Pedro Alves
2019-02-27 20:19 ` [PATCH v2 04/22] C++ify remote notification code Tom Tromey
2019-03-06 19:23 ` Pedro Alves
2019-03-06 21:12 ` Tom Tromey
2019-02-27 20:19 ` [PATCH v2 10/22] Remove last cleanups from stabsread.c Tom Tromey
2019-03-06 21:14 ` Pedro Alves
2019-02-27 20:19 ` [PATCH v2 11/22] Use unique_xmalloc_ptr in remote.c Tom Tromey
2019-03-06 21:17 ` Pedro Alves
2019-02-27 20:19 ` [PATCH v2 18/22] Remove some now-dead exception code Tom Tromey
2019-04-03 17:04 ` Pedro Alves
2019-02-27 20:19 ` [PATCH v2 01/22] Remove cleanups from coffread.c Tom Tromey
2019-03-06 19:23 ` Pedro Alves
2019-02-27 20:19 ` [PATCH v2 17/22] Rename gdb exception types Tom Tromey
2019-02-27 20:19 ` [PATCH v2 02/22] Update two cleanup comments Tom Tromey
2019-03-06 19:23 ` Pedro Alves
2019-02-27 20:19 ` [PATCH v2 22/22] Introduce and use bcache_up Tom Tromey
2019-03-06 22:03 ` Pedro Alves
2019-03-07 16:54 ` Tom Tromey
2019-03-07 17:09 ` Pedro Alves
2019-03-07 17:42 ` Tom Tromey
2019-02-27 20:19 ` [PATCH v2 12/22] Remove basic cleanup code Tom Tromey
2019-03-06 21:33 ` Pedro Alves
2019-02-27 20:19 ` [PATCH v2 16/22] Rewrite TRY/CATCH Tom Tromey
2019-04-03 17:03 ` Pedro Alves
2019-04-03 18:02 ` Tom Tromey
2019-02-27 20:19 ` [PATCH v2 15/22] Make exceptions use std::string and be self-managing Tom Tromey
2019-04-03 16:20 ` Pedro Alves
2019-04-03 17:58 ` Tom Tromey
2019-04-03 18:28 ` 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=20190227201849.32210-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