From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH 05/20] Remove last cleanup from gdbserver
Date: Wed, 13 Feb 2019 21:29:00 -0000 [thread overview]
Message-ID: <20190213212927.9474-6-tom@tromey.com> (raw)
In-Reply-To: <20190213212927.9474-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-13 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-13 21:29 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-13 21:29 [PATCH 00/20] Remove cleanups Tom Tromey
2019-02-13 21:29 ` [PATCH 12/20] Remove free_current_contents Tom Tromey
2019-02-13 21:29 ` [PATCH 03/20] Change displaced_step_clear_cleanup with a forward_scope_exit Tom Tromey
2019-02-13 21:29 ` [PATCH 17/20] Make exception throwing a bit more efficient Tom Tromey
2019-02-13 21:29 ` [PATCH 06/20] Remove cleanup from solib-svr4.c Tom Tromey
2019-02-13 21:29 ` [PATCH 01/20] Remove cleanups from coffread.c Tom Tromey
2019-02-13 21:29 ` [PATCH 11/20] Remove basic cleanup code Tom Tromey
2019-02-13 21:29 ` [PATCH 20/20] Introduce and use bcache_up Tom Tromey
2019-02-13 21:29 ` Tom Tromey [this message]
2019-02-13 21:29 ` [PATCH 07/20] Remove last cleanups from solib-svr4.c Tom Tromey
2019-02-13 21:29 ` [PATCH 14/20] Make exceptions use std::string and be self-managing Tom Tromey
2019-02-13 21:29 ` [PATCH 16/20] Remove some now-dead exception code Tom Tromey
2019-02-13 21:30 ` [PATCH 13/20] Simplify exception handling Tom Tromey
2019-02-13 21:30 ` [PATCH 15/20] Rewrite TRY/CATCH Tom Tromey
2019-02-13 21:30 ` [PATCH 18/20] Replace throw_exception with throw in some cases Tom Tromey
2019-02-13 21:30 ` [PATCH 09/20] Remove last cleanup from linux-namespaces.c Tom Tromey
2019-02-13 21:30 ` [PATCH 08/20] Remove last cleanup solib-aix.c Tom Tromey
2019-02-13 21:30 ` [PATCH 04/20] C++ify remote notification code Tom Tromey
2019-02-13 21:30 ` [PATCH 02/20] Update two cleanup comments Tom Tromey
2019-02-13 21:30 ` [PATCH 10/20] Remove last cleanups from stabsread.c Tom Tromey
2019-02-13 21:49 ` [PATCH 00/20] Remove cleanups John Baldwin
2019-02-14 14:48 ` Tom Tromey
2019-02-14 20:38 ` John Baldwin
2019-02-14 22:49 ` Tom Tromey
2019-02-14 22:55 ` John Baldwin
2019-02-14 15:34 ` Pedro Alves
2019-02-14 16:35 ` Tom Tromey
2019-02-13 21:53 ` [PATCH 19/20] Use SCOPE_EXIT in write_gcore_file Tom Tromey
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=20190213212927.9474-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