/* Remote notification in GDB protocol
- Copyright (C) 1988-2014 Free Software Foundation, Inc.
+ Copyright (C) 1988-2019 Free Software Foundation, Inc.
This file is part of GDB.
#include "defs.h"
#include "remote.h"
#include "remote-notif.h"
-#include "observer.h"
+#include "observable.h"
#include "event-loop.h"
#include "target.h"
#include "inferior.h"
#include "infrun.h"
#include "gdbcmd.h"
-#include <string.h>
-
int notif_debug = 0;
/* Supported clients of notifications. */
acknowledge. */
void
-remote_notif_ack (struct notif_client *nc, char *buf)
+remote_notif_ack (remote_target *remote,
+ struct notif_client *nc, char *buf)
{
struct notif_event *event = nc->alloc_event ();
struct cleanup *old_chain
fprintf_unfiltered (gdb_stdlog, "notif: ack '%s'\n",
nc->ack_command);
- nc->parse (nc, buf, event);
- nc->ack (nc, buf, event);
+ nc->parse (remote, nc, buf, event);
+ nc->ack (remote, nc, buf, event);
discard_cleanups (old_chain);
}
/* Parse the BUF for the expected notification NC. */
struct notif_event *
-remote_notif_parse (struct notif_client *nc, char *buf)
+remote_notif_parse (remote_target *remote,
+ struct notif_client *nc, char *buf)
{
struct notif_event *event = nc->alloc_event ();
struct cleanup *old_chain
if (notif_debug)
fprintf_unfiltered (gdb_stdlog, "notif: parse '%s'\n", nc->name);
- nc->parse (nc, buf, event);
+ nc->parse (remote, nc, buf, event);
discard_cleanups (old_chain);
return event;
gdb_assert (nc != except);
- if (nc->can_get_pending_events (nc))
- remote_notif_get_pending_events (nc);
+ if (nc->can_get_pending_events (state->remote, nc))
+ remote_notif_get_pending_events (state->remote, nc);
}
}
static void
remote_async_get_pending_events_handler (gdb_client_data data)
{
- gdb_assert (non_stop);
- remote_notif_process (data, NULL);
+ gdb_assert (target_is_non_stop_p ());
+ remote_notif_process ((struct remote_notif_state *) data, NULL);
}
/* Remote notification handler. Parse BUF, queue notification and
{
const char *name = notifs[i]->name;
- if (strncmp (buf, name, strlen (name)) == 0
+ if (startswith (buf, name)
&& buf[strlen (name)] == ':')
break;
}
else
{
struct notif_event *event
- = remote_notif_parse (nc, buf + strlen (nc->name) + 1);
+ = remote_notif_parse (state->remote, nc, buf + strlen (nc->name) + 1);
/* Be careful to only set it after parsing, since an error
may be thrown then. */
/* Notify the event loop there's a stop reply to acknowledge
and that there may be more events to fetch. */
QUEUE_enque (notif_client_p, state->notif_queue, nc);
- if (non_stop)
+ if (target_is_non_stop_p ())
{
/* In non-stop, We mark REMOTE_ASYNC_GET_PENDING_EVENTS_TOKEN
in order to go on what we were doing and postpone
static void
do_notif_event_xfree (void *arg)
{
- notif_event_xfree (arg);
+ notif_event_xfree ((struct notif_event *) arg);
}
/* Return an allocated remote_notif_state. */
struct remote_notif_state *
-remote_notif_state_allocate (void)
+remote_notif_state_allocate (remote_target *remote)
{
- struct remote_notif_state *notif_state = xzalloc (sizeof (*notif_state));
+ struct remote_notif_state *notif_state = XCNEW (struct remote_notif_state);
+
+ notif_state->remote = remote;
notif_state->notif_queue = QUEUE_alloc (notif_client_p, NULL);
xfree (state);
}
-/* -Wmissing-prototypes */
-extern initialize_file_ftype _initialize_notif;
-
void
_initialize_notif (void)
{