Change regcache list to be an hash map

[deliverable/binutils-gdb.git] / gdb / remote-notif.h

diff --git a/gdb/remote-notif.h b/gdb/remote-notif.h
index 7973ad7fa0aaa938d34c51ffbc6c6dd46be38d21..c735cc2918a51647c39a28dc7db7f84bb09183ac 100644 (file)
--- a/gdb/remote-notif.h
+++ b/gdb/remote-notif.h
@@ -20,17 +20,22 @@
 #ifndef REMOTE_NOTIF_H
 #define REMOTE_NOTIF_H
 
-#include "queue.h"
+#include <list>
+#include <memory>
 
 /* An event of a type of async remote notification.  */
 
 struct notif_event
 {
-  /* Destructor.  Release everything from SELF, but not SELF
-     itself.  */
-  void (*dtr) (struct notif_event *self);
+  virtual ~notif_event ()
+  {
+  }
 };
 
+/* A unique pointer holding a notif_event.  */
+
+typedef std::unique_ptr<notif_event> notif_event_up;
+
 /* ID of the notif_client.  */
 
 enum REMOTE_NOTIF_ID
@@ -43,7 +48,7 @@ struct remote_target;
 
 /* A client to a sort of async remote notification.  */
 
-typedef struct notif_client
+struct notif_client
 {
   /* The name of notification packet.  */
   const char *name;
@@ -70,24 +75,27 @@ typedef struct notif_client
                                 struct notif_client *self);
 
   /* Allocate an event.  */
-  struct notif_event *(*alloc_event) (void);
+  notif_event_up (*alloc_event) ();
 
   /* Id of this notif_client.  */
   const enum REMOTE_NOTIF_ID id;
-} *notif_client_p;
-
-DECLARE_QUEUE_P (notif_client_p);
+};
 
 /* State on remote async notification.  */
 
 struct remote_notif_state
 {
+  remote_notif_state () = default;
+  ~remote_notif_state ();
+
+  DISABLE_COPY_AND_ASSIGN (remote_notif_state);
+
   /* The remote target.  */
   remote_target *remote;
 
   /* Notification queue.  */
 
-  QUEUE(notif_client_p) *notif_queue;
+  std::list<notif_client *> notif_queue;
 
   /* Asynchronous signal handle registered as event loop source for when
      the remote sent us a notification.  The registered callback
@@ -96,14 +104,14 @@ struct remote_notif_state
 
   struct async_event_handler *get_pending_events_token;
 
-/* One pending event for each notification client.  This is where we
-   keep it until it is acknowledged.  When there is a notification
-   packet, parse it, and create an object of 'struct notif_event' to
-   assign to it.  This field is unchanged until GDB starts to ack
-   this notification (which is done by
-   remote.c:remote_notif_pending_replies).  */
+  /* One pending event for each notification client.  This is where we
+     keep it until it is acknowledged.  When there is a notification
+     packet, parse it, and create an object of 'struct notif_event' to
+     assign to it.  This field is unchanged until GDB starts to ack
+     this notification (which is done by
+     remote.c:remote_notif_pending_replies).  */
 
-  struct notif_event *pending_event[REMOTE_NOTIF_LAST];
+  struct notif_event *pending_event[REMOTE_NOTIF_LAST] {};
 };
 
 void remote_notif_ack (remote_target *remote, notif_client *nc,
@@ -112,18 +120,15 @@ struct notif_event *remote_notif_parse (remote_target *remote,
                                        notif_client *nc,
                                        const char *buf);
 
-void notif_event_xfree (struct notif_event *event);
-
 void handle_notification (struct remote_notif_state *notif_state,
                          const char *buf);
 
 void remote_notif_process (struct remote_notif_state *state,
                           struct notif_client *except);
 remote_notif_state *remote_notif_state_allocate (remote_target *remote);
-void remote_notif_state_xfree (struct remote_notif_state *state);
 
 extern struct notif_client notif_client_stop;
 
-extern int notif_debug;
+extern bool notif_debug;
 
 #endif /* REMOTE_NOTIF_H */