gdb/

	* event-loop.c (async_queue_event): Remove one parameter
	'position'.  Remove code handling 'position' == TAIL.
	(gdb_wait_for_event): Caller update.
	(check_async_event_handlers): Caller update.
	(poll_timers): Caller update.
	* event-loop.h (enum queue_position): Remove.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 596b5a002b709a24c9c398622da5a044519923d5..d291b4a68de962427cd56de21b6355115910fb1e 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2013-01-25  Yao Qi  <yao@codesourcery.com>
+
+       * event-loop.c (async_queue_event): Remove one parameter
+       'position'.  Remove code handling 'position' == TAIL.
+       (gdb_wait_for_event): Caller update.
+       (check_async_event_handlers): Caller update.
+       (poll_timers): Caller update.
+       * event-loop.h (enum queue_position): Remove.
+
 2013-01-25  Maxim Kuvyrkov  <maxim@kugelworks.com>
 
        * MAINTAINERS: Update my email.

diff --git a/gdb/event-loop.c b/gdb/event-loop.c
index be485c97a55ddca234ee799b3128d0825779d668..aea3b5ed5880624312c7c7da768c0986ffb0306a 100644 (file)
--- a/gdb/event-loop.c
+++ b/gdb/event-loop.c
@@ -274,9 +274,7 @@ static int gdb_wait_for_event (int);
 static void poll_timers (void);
 \f
 
-/* Insert an event object into the gdb event queue at 
-   the specified position.
-   POSITION can be head or tail, with values TAIL, HEAD.
+/* 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.
@@ -285,28 +283,16 @@ static void poll_timers (void);
    as last in first out.  Event appended at the tail of the queue
    will be processed first in first out.  */
 static void
-async_queue_event (gdb_event * event_ptr, queue_position position)
+async_queue_event (gdb_event * event_ptr)
 {
-  if (position == TAIL)
-    {
-      /* The event will become the new last_event.  */
+  /* 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;
-    }
-  else if (position == HEAD)
-    {
-      /* The event becomes the new first_event.  */
-
-      event_ptr->next_event = event_queue.first_event;
-      if (event_queue.first_event == NULL)
-       event_queue.last_event = event_ptr;
-      event_queue.first_event = event_ptr;
-    }
+  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;
 }
 
 /* Create a generic event, to be enqueued in the event queue for
@@ -936,7 +922,7 @@ gdb_wait_for_event (int block)
              if (file_ptr->ready_mask == 0)
                {
                  file_event_ptr = create_file_event (file_ptr->fd);
-                 async_queue_event (file_event_ptr, TAIL);
+                 async_queue_event (file_event_ptr);
                }
              file_ptr->ready_mask = (gdb_notifier.poll_fds + i)->revents;
            }
@@ -972,7 +958,7 @@ gdb_wait_for_event (int block)
          if (file_ptr->ready_mask == 0)
            {
              file_event_ptr = create_file_event (file_ptr->fd);
-             async_queue_event (file_event_ptr, TAIL);
+             async_queue_event (file_event_ptr);
            }
          file_ptr->ready_mask = mask;
        }
@@ -1158,7 +1144,7 @@ check_async_event_handlers (void)
          data.ptr = hdata;
 
          event_ptr = create_event (invoke_async_event_handler, data);
-         async_queue_event (event_ptr, TAIL);
+         async_queue_event (event_ptr);
        }
     }
 }
@@ -1365,7 +1351,7 @@ poll_timers (void)
          event_ptr = (gdb_event *) xmalloc (sizeof (gdb_event));
          event_ptr->proc = handle_timer_event;
          event_ptr->data.integer = timer_list.first_timer->timer_id;
-         async_queue_event (event_ptr, TAIL);
+         async_queue_event (event_ptr);
        }
 
       /* Now we need to update the timeout for select/ poll, because

diff --git a/gdb/event-loop.h b/gdb/event-loop.h
index 16c228637c2fba3ca7f5c422d8e0ff76130c5bf8..fc95cf1887856c6586d2626b73c11aeb6a8fb72b 100644 (file)
--- a/gdb/event-loop.h
+++ b/gdb/event-loop.h
@@ -75,18 +75,6 @@ typedef void (sig_handler_func) (gdb_client_data);
 typedef void (async_event_handler_func) (gdb_client_data);
 typedef void (timer_handler_func) (gdb_client_data);
 
-/* Where to add an event onto the event queue, by queue_event.  */
-typedef enum
-  {
-    /* Add at tail of queue.  It will be processed in first in first
-       out order.  */
-    TAIL,
-    /* Add at head of queue.  It will be processed in last in first
-       out order.  */
-    HEAD
-  }
-queue_position;
-
 /* Exported functions from event-loop.c */
 
 extern void start_event_loop (void);