/* Event loop machinery for the remote server for GDB.
- Copyright (C) 1999, 2000, 2001, 2002, 2005, 2006, 2007, 2008, 2010
- Free Software Foundation, Inc.
+ Copyright (C) 1999-2019 Free Software Foundation, Inc.
This file is part of GDB.
#include "server.h"
#include <sys/types.h>
-#include <string.h>
-#include <sys/time.h>
+#include "gdbsupport/gdb_sys_time.h"
#ifdef USE_WIN32API
#include <windows.h>
#include <io.h>
#endif
-#ifdef HAVE_ERRNO_H
-#include <errno.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
#include <unistd.h>
-#endif
+#include <queue>
-typedef struct gdb_event gdb_event;
-typedef int (event_handler_func) (int);
+typedef int (event_handler_func) (gdb_fildes_t);
/* Tell create_file_handler what events we are interested in. */
#define GDB_WRITABLE (1<<2)
#define GDB_EXCEPTION (1<<3)
-/* Events are queued by calling async_queue_event and serviced later
+/* Events are queued by on the event_queue and serviced later
on by do_one_event. An event can be, for instance, a file
descriptor becoming ready to be read. Servicing an event simply
means that the procedure PROC will be called. We have 2 queues,
event_handler_func *proc;
/* File descriptor that is ready. */
- int fd;
-
- /* Next in list of events or NULL. */
- struct gdb_event *next_event;
+ gdb_fildes_t fd;
};
/* Information about each file descriptor we register with the event
typedef struct file_handler
{
/* File descriptor. */
- int fd;
+ gdb_fildes_t fd;
/* Events we want to monitor. */
int mask;
}
file_handler;
-/* Event queue:
+typedef gdb::unique_xmalloc_ptr<gdb_event> gdb_event_up;
- Events can be inserted at the front of the queue or at the end of
- the queue. Events will be extracted from the queue for processing
- starting from the head. Therefore, events inserted at the head of
- the queue will be processed in a last in first out fashion, while
- those inserted at the tail of the queue will be processed in a
- first in first out manner. All the fields are NULL if the queue is
- empty. */
-
-static struct
- {
- /* The first pending event. */
- gdb_event *first_event;
-
- /* The last pending event. */
- gdb_event *last_event;
- }
-event_queue;
+static std::queue<gdb_event_up, std::list<gdb_event_up>> event_queue;
/* Gdb_notifier is just a list of file descriptors gdb is interested
in. These are the input file descriptor, and the target file
{
int id;
callback_handler_func *proc;
- gdb_client_data *data;
+ gdb_client_data data;
struct callback_event *next;
};
}
callback_list;
-/* Insert an event object into the gdb event queue.
-
- EVENT_PTR points to the event to be inserted into the queue. The
- caller must allocate memory for the event. It is freed after the
- event has ben handled. Events in the queue will be processed head
- to tail, therefore, events will be processed first in first
- out. */
-
-static void
-async_queue_event (gdb_event *event_ptr)
+void
+initialize_event_loop (void)
{
- /* The event will become the new last_event. */
-
- event_ptr->next_event = NULL;
- if (event_queue.first_event == NULL)
- event_queue.first_event = event_ptr;
- else
- event_queue.last_event->next_event = event_ptr;
- event_queue.last_event = event_ptr;
}
/* Process one event. If an event was processed, 1 is returned
static int
process_event (void)
{
- gdb_event *event_ptr, *prev_ptr;
- event_handler_func *proc;
- int fd;
-
- /* Look in the event queue to find an event that is ready
- to be processed. */
-
- for (event_ptr = event_queue.first_event;
- event_ptr != NULL;
- event_ptr = event_ptr->next_event)
+ /* Let's get rid of the event from the event queue. We need to
+ do this now because while processing the event, since the
+ proc function could end up jumping out to the caller of this
+ function. In that case, we would have on the event queue an
+ event which has been processed, but not deleted. */
+ if (!event_queue.empty ())
{
- /* Call the handler for the event. */
-
- proc = event_ptr->proc;
- fd = event_ptr->fd;
-
- /* Let's get rid of the event from the event queue. We need to
- do this now because while processing the event, since the
- proc function could end up jumping out to the caller of this
- function. In that case, we would have on the event queue an
- event which has been processed, but not deleted. */
-
- if (event_queue.first_event == event_ptr)
- {
- event_queue.first_event = event_ptr->next_event;
- if (event_ptr->next_event == NULL)
- event_queue.last_event = NULL;
- }
- else
- {
- prev_ptr = event_queue.first_event;
- while (prev_ptr->next_event != event_ptr)
- prev_ptr = prev_ptr->next_event;
+ gdb_event_up event_ptr = std::move (event_queue.front ());
+ event_queue.pop ();
- prev_ptr->next_event = event_ptr->next_event;
- if (event_ptr->next_event == NULL)
- event_queue.last_event = prev_ptr;
- }
- free (event_ptr);
+ event_handler_func *proc = event_ptr->proc;
+ gdb_fildes_t fd = event_ptr->fd;
/* Now call the procedure associated with the event. */
if ((*proc) (fd))
int
append_callback_event (callback_handler_func *proc, gdb_client_data data)
{
- struct callback_event *event_ptr;
+ struct callback_event *event_ptr = XNEW (struct callback_event);
- event_ptr = xmalloc (sizeof (*event_ptr));
event_ptr->id = callback_list.num_callbacks++;
event_ptr->proc = proc;
event_ptr->data = data;
if (event_ptr != NULL)
{
callback_handler_func *proc = event_ptr->proc;
- gdb_client_data *data = event_ptr->data;
+ gdb_client_data data = event_ptr->data;
/* Remove the event before calling PROC,
more events may get added by PROC. */
occurs for FD. CLIENT_DATA is the argument to pass to PROC. */
static void
-create_file_handler (int fd, int mask, handler_func *proc,
+create_file_handler (gdb_fildes_t fd, int mask, handler_func *proc,
gdb_client_data client_data)
{
file_handler *file_ptr;
just change the data associated with it. */
if (file_ptr == NULL)
{
- file_ptr = xmalloc (sizeof (*file_ptr));
+ file_ptr = XNEW (struct file_handler);
file_ptr->fd = fd;
file_ptr->ready_mask = 0;
file_ptr->next_file = gdb_notifier.first_file_handler;
/* Wrapper function for create_file_handler. */
void
-add_file_handler (int fd, handler_func *proc, gdb_client_data client_data)
+add_file_handler (gdb_fildes_t fd,
+ handler_func *proc, gdb_client_data client_data)
{
create_file_handler (fd, GDB_READABLE | GDB_EXCEPTION, proc, client_data);
}
i.e. we don't care anymore about events on the FD. */
void
-delete_file_handler (int fd)
+delete_file_handler (gdb_fildes_t fd)
{
file_handler *file_ptr, *prev_ptr = NULL;
int i;
event in the front of the event queue. */
static int
-handle_file_event (int event_file_desc)
+handle_file_event (gdb_fildes_t event_file_desc)
{
file_handler *file_ptr;
int mask;
if (file_ptr->ready_mask & GDB_EXCEPTION)
{
- fprintf (stderr, "Exception condition detected on fd %d\n",
- file_ptr->fd);
+ warning ("Exception condition detected on fd %s",
+ pfildes (file_ptr->fd));
file_ptr->error = 1;
}
else
associated to FD when it was registered with the event loop. */
static gdb_event *
-create_file_event (int fd)
+create_file_event (gdb_fildes_t fd)
{
gdb_event *file_event_ptr;
- file_event_ptr = xmalloc (sizeof (gdb_event));
+ file_event_ptr = XNEW (gdb_event);
file_event_ptr->proc = handle_file_event;
file_event_ptr->fd = fd;
+
return file_event_ptr;
}
wait_for_event (void)
{
file_handler *file_ptr;
- gdb_event *file_event_ptr;
int num_found = 0;
/* Make sure all output is done before getting another event. */
if (file_ptr->ready_mask == 0)
{
- file_event_ptr = create_file_event (file_ptr->fd);
- async_queue_event (file_event_ptr);
+ gdb_event *file_event_ptr = create_file_event (file_ptr->fd);
+
+ event_queue.emplace (file_event_ptr);
}
file_ptr->ready_mask = mask;
}
projects / deliverable / binutils-gdb.git / blobdiff