From: Andrew Burgess <aburgess@redhat.com>
To: Simon Marchi <simon.marchi@polymtl.ca>, gdb-patches@sourceware.org
Cc: Simon Marchi <simon.marchi@efficios.com>
Subject: Re: [PATCH 1/3] gdb: make remote_state's async token private
Date: Mon, 09 Oct 2023 10:11:03 +0100 [thread overview]
Message-ID: <87fs2kduu0.fsf@redhat.com> (raw)
In-Reply-To: <20231004020701.260411-2-simon.marchi@polymtl.ca>
Simon Marchi via Gdb-patches <gdb-patches@sourceware.org> writes:
> From: Simon Marchi <simon.marchi@efficios.com>
>
> Make remote_async_inferior_event_token private (rename to
> m_async_event_handler_token) and add methods for the various operations
> we do on it. This will help by:
>
> - allowing to break on those methods when debugging
> - allowing to add assertions in the methods
Looks good. Couple of minor nits.
>
> Change-Id: Ia3b8a2bc48ad4849dbbe83442c3f83920f03334d
> ---
> gdb/remote.c | 70 ++++++++++++++++++++++++++++++++--------------------
> 1 file changed, 43 insertions(+), 27 deletions(-)
>
> diff --git a/gdb/remote.c b/gdb/remote.c
> index 9bb4f1de5982..2deba06d7d47 100644
> --- a/gdb/remote.c
> +++ b/gdb/remote.c
> @@ -413,6 +413,31 @@ class remote_state
> /* Get the remote arch state for GDBARCH. */
> struct remote_arch_state *get_remote_arch_state (struct gdbarch *gdbarch);
>
> + void create_async_event_handler ()
> + {
Maybe add:
gdb_assert (m_async_event_handler_token == nullptr);
If this was ever not true then we'd leak a token, right?
> + m_async_event_handler_token
> + = ::create_async_event_handler ([] (gdb_client_data data)
> + {
Spaces before tabs here.
> + inferior_event_handler (INF_REG_EVENT);
> + },
> + nullptr, "remote");
> + }
> +
> + void mark_async_event_handler ()
> + { ::mark_async_event_handler (m_async_event_handler_token); }
> +
> + void clear_async_event_handler ()
> + { ::clear_async_event_handler (m_async_event_handler_token); }
> +
> + bool async_event_handler_marked () const
> + { return ::async_event_handler_marked (m_async_event_handler_token); }
> +
> + void delete_async_event_handler ()
> + {
> + if (m_async_event_handler_token != nullptr)
> + ::delete_async_event_handler (&m_async_event_handler_token);
> + }
> +
> public: /* data */
>
> /* A buffer to use for incoming packets, and its current size. The
> @@ -540,10 +565,6 @@ class remote_state
> immediately, so queue is not needed for them. */
> std::vector<stop_reply_up> stop_reply_queue;
>
> - /* Asynchronous signal handle registered as event loop source for
> - when we have pending events ready to be passed to the core. */
> - struct async_event_handler *remote_async_inferior_event_token = nullptr;
> -
> /* FIXME: cagney/1999-09-23: Even though getpkt was called with
> ``forever'' still use the normal timeout mechanism. This is
> currently used by the ASYNC code to guarentee that target reads
> @@ -554,6 +575,10 @@ class remote_state
> bool wait_forever_enabled_p = true;
>
> private:
> + /* Asynchronous signal handle registered as event loop source for
> + when we have pending events ready to be passed to the core. */
> + async_event_handler *m_async_event_handler_token = nullptr;
> +
Trailing white-space here.
Thanks,
Andrew
> /* Mapping of remote protocol data for each gdbarch. Usually there
> is only one entry here, though we may see more with stubs that
> support multi-process. */
> @@ -1384,8 +1409,6 @@ static void show_remote_protocol_packet_cmd (struct ui_file *file,
>
> static ptid_t read_ptid (const char *buf, const char **obuf);
>
> -static void remote_async_inferior_event_handler (gdb_client_data);
> -
> static bool remote_read_description_p (struct target_ops *target);
>
> static void remote_console_output (const char *msg);
> @@ -4389,8 +4412,7 @@ remote_target::~remote_target ()
> everything of this target. */
> discard_pending_stop_replies_in_queue ();
>
> - if (rs->remote_async_inferior_event_token)
> - delete_async_event_handler (&rs->remote_async_inferior_event_token);
> + rs->delete_async_event_handler ();
>
> delete rs->notif_state;
> }
> @@ -5989,9 +6011,8 @@ remote_target::open_1 (const char *name, int from_tty, int extended_p)
> current_inferior ()->push_target (std::move (target_holder));
>
> /* Register extra event sources in the event loop. */
> - rs->remote_async_inferior_event_token
> - = create_async_event_handler (remote_async_inferior_event_handler, nullptr,
> - "remote");
> + rs->create_async_event_handler ();
> +
> rs->notif_state = remote_notif_state_allocate (remote);
>
> /* Reset the target state; these things will be queried either by
> @@ -7086,7 +7107,7 @@ remote_target::has_pending_events ()
> {
> remote_state *rs = get_remote_state ();
>
> - if (async_event_handler_marked (rs->remote_async_inferior_event_token))
> + if (rs->async_event_handler_marked ())
> return true;
>
> /* Note that BUFCNT can be negative, indicating sticky
> @@ -7420,7 +7441,7 @@ remote_notif_stop_can_get_pending_events (remote_target *remote,
> may exit and we have no chance to process them back in
> remote_wait_ns. */
> remote_state *rs = remote->get_remote_state ();
> - mark_async_event_handler (rs->remote_async_inferior_event_token);
> + rs->mark_async_event_handler ();
> return 0;
> }
>
> @@ -7628,7 +7649,7 @@ remote_target::queued_stop_reply (ptid_t ptid)
> if (!rs->stop_reply_queue.empty () && target_can_async_p ())
> {
> /* There's still at least an event left. */
> - mark_async_event_handler (rs->remote_async_inferior_event_token);
> + rs->mark_async_event_handler ();
> }
>
> return r;
> @@ -7655,7 +7676,7 @@ remote_target::push_stop_reply (struct stop_reply *new_event)
> enabled, and there are events in this queue, we will mark the event
> token at that point, see remote_target::async. */
> if (target_is_async_p ())
> - mark_async_event_handler (rs->remote_async_inferior_event_token);
> + rs->mark_async_event_handler ();
> }
>
> /* Returns true if we have a stop reply for PTID. */
> @@ -8515,10 +8536,9 @@ remote_target::wait (ptid_t ptid, struct target_waitstatus *status,
> we'll mark it again at the end if needed. If the target is not in
> async mode then the async token should not be marked. */
> if (target_is_async_p ())
> - clear_async_event_handler (rs->remote_async_inferior_event_token);
> + rs->clear_async_event_handler ();
> else
> - gdb_assert (!async_event_handler_marked
> - (rs->remote_async_inferior_event_token));
> + gdb_assert (!rs->async_event_handler_marked ());
>
> ptid_t event_ptid;
>
> @@ -8533,7 +8553,7 @@ remote_target::wait (ptid_t ptid, struct target_waitstatus *status,
> notifications, then tell the event loop to call us again. */
> if (!rs->stop_reply_queue.empty ()
> || rs->notif_state->pending_event[notif_client_stop.id] != nullptr)
> - mark_async_event_handler (rs->remote_async_inferior_event_token);
> + rs->mark_async_event_handler ();
> }
>
> return event_ptid;
> @@ -14859,12 +14879,6 @@ remote_async_serial_handler (struct serial *scb, void *context)
> inferior_event_handler (INF_REG_EVENT);
> }
>
> -static void
> -remote_async_inferior_event_handler (gdb_client_data data)
> -{
> - inferior_event_handler (INF_REG_EVENT);
> -}
> -
> int
> remote_target::async_wait_fd ()
> {
> @@ -14884,7 +14898,8 @@ remote_target::async (bool enable)
> /* If there are pending events in the stop reply queue tell the
> event loop to process them. */
> if (!rs->stop_reply_queue.empty ())
> - mark_async_event_handler (rs->remote_async_inferior_event_token);
> + rs->mark_async_event_handler ();
> +
> /* For simplicity, below we clear the pending events token
> without remembering whether it is marked, so here we always
> mark it. If there's actually no pending notification to
> @@ -14899,7 +14914,8 @@ remote_target::async (bool enable)
> /* If the core is disabling async, it doesn't want to be
> disturbed with target events. Clear all async event sources
> too. */
> - clear_async_event_handler (rs->remote_async_inferior_event_token);
> + rs->clear_async_event_handler ();
> +
> if (target_is_non_stop_p ())
> clear_async_event_handler (rs->notif_state->get_pending_events_token);
> }
> --
> 2.42.0
next prev parent reply other threads:[~2023-10-09 9:11 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-04 2:03 [PATCH 0/3] Add assertion when marking the remote async flag Simon Marchi
2023-10-04 2:03 ` [PATCH 1/3] gdb: make remote_state's async token private Simon Marchi
2023-10-09 9:11 ` Andrew Burgess [this message]
2023-10-10 14:56 ` Simon Marchi
2023-10-04 2:04 ` [PATCH 2/3] gdb: add remote_state::{is_async_p,can_async_p} Simon Marchi
2023-10-09 9:20 ` Andrew Burgess
2023-10-10 15:01 ` Simon Marchi
2023-10-04 2:04 ` [PATCH 3/3] gdb: add assertion when marking the remote async flag Simon Marchi
2023-10-06 21:09 ` Terekhov, Mikhail
2023-10-07 1:35 ` Simon Marchi
2023-10-09 9:25 ` Andrew Burgess
2023-10-10 15:01 ` Simon Marchi
2023-10-06 21:28 ` [PATCH 0/3] Add " Terekhov, Mikhail
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=87fs2kduu0.fsf@redhat.com \
--to=aburgess@redhat.com \
--cc=gdb-patches@sourceware.org \
--cc=simon.marchi@efficios.com \
--cc=simon.marchi@polymtl.ca \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).