Remove the EventLoop class

EventQueue.cpp

@@ -20,11 +20,11 @@ void EventQueue::dispatch(int ms) {
     return equeue_dispatch(&_equeue, ms);
 }
 
-void EventQueue::break_() {
+void EventQueue::break_dispatch() {
     return equeue_break(&_equeue);
 }
 
-unsigned EventQueue::get_tick() {
+unsigned EventQueue::tick() {
     return equeue_tick();
 }
 

EventQueue.h

@@ -31,10 +31,10 @@ namespace events {
 #define EVENTS_EVENT_SIZE \
     (EQUEUE_EVENT_SIZE - 2*sizeof(void*) + sizeof(mbed::Callback<void()>))
 
-/** DEFAULT_QUEUE_SIZE
- *  default size of buffer for events
+/** EVENTS_QUEUE_SIZE
+ *  Default size of buffer for events
  */
-#define DEFAULT_QUEUE_SIZE (32*EVENTS_EVENT_SIZE)
+#define EVENTS_QUEUE_SIZE (32*EVENTS_EVENT_SIZE)
 
 
 /** EventQueue
@@ -46,11 +46,11 @@ class EventQueue {
     /** Create an event queue
      *
      *  @param queue_size       Size of buffer to use for events
-     *                          (default: DEFAULT_QUEUE_SIZE)
+     *                          (default: EVENTS_QUEUE_SIZE)
      *  @param queue_pointer    Pointer to memory region to use for events
      *                          (default: NULL)
      */
-    EventQueue(unsigned queue_size=DEFAULT_QUEUE_SIZE,
+    EventQueue(unsigned queue_size=EVENTS_QUEUE_SIZE,
                unsigned char *queue_pointer=NULL);
 
     /** Destroy an event queue
@@ -63,13 +63,21 @@ class EventQueue {
      *              value will dispatch events forever
      *              (default: -1)
      */
-    void dispatch(int ms=-1);
+    void dispatch(int ms);
+    void dispatch() { dispatch(-1); }
+
+    /** Break out of a running event loop
+     *
+     *  Forces the specified event queue's dispatch loop to terminate. Pending
+     *  events may finish executing, but no new events will be executed.
+     */
+    void break_dispatch();
 
     /*  Monotonic counter for the event queue
      *  @return     A monotonically incrementing counter in milliseconds
      *              this count intentionally overflows to 0 after 2^32-1
      */
-    unsigned get_tick();
+    unsigned tick();
 
     /** Cancel events that are in flight
      *
@@ -241,8 +249,6 @@ class EventQueue {
     }
 
 protected:
-    void break_();
-
     struct equeue _equeue;
     mbed::Callback<void(int)> _update;
 

TESTS/events/queue/main.cpp

@@ -102,40 +102,6 @@ void call_every_test() {
     queue.dispatch(N*100);
 }
 
-#ifdef MBED_CONF_RTOS_PRESENT
-void event_loop_test1() {
-    EventLoop loop;
-    osStatus status = loop.start();
-    TEST_ASSERT_EQUAL(osOK, status);
-
-    touched = false;
-    loop.call(func0);
-    Thread::yield();
-    TEST_ASSERT(touched);
-
-    status = loop.stop();
-    TEST_ASSERT_EQUAL(osOK, status);
-}
-
-template <int N>
-void event_loop_test2() {
-    EventLoop loop(osPriorityHigh);
-    osStatus status = loop.start();
-    TEST_ASSERT_EQUAL(osOK, status);
-
-    Timer tickers[N];
-
-    for (int i = 0; i < N; i++) {
-        tickers[i].start();
-        loop.call_every((i+1)*100, time_func, &tickers[i], (i+1)*100);
-        Thread::yield();
-        wait_ms(75);
-    }
-
-    wait_ms(N*100);
-}
-#endif
-
 struct big { char data[4096]; } big;
 
 void allocate_failure_test1() {
@@ -176,28 +142,6 @@ void cancel_test1() {
     queue.dispatch(0);
 }
 
-#ifdef MBED_CONF_RTOS_PRESENT
-template <int N>
-void cancel_test2() {
-    EventLoop loop;
-    osStatus status = loop.start();
-    TEST_ASSERT_EQUAL(osOK, status);
-
-    int ids[N];
-
-    for (int i = 0; i < N; i++) {
-        ids[i] = loop.call_in(1000, no);
-    }
-
-    for (int i = N-1; i >= 0; i--) {
-        loop.cancel(ids[i]);
-    }
-
-    status = loop.stop();
-    TEST_ASSERT_EQUAL(osOK, status);
-}
-#endif
-
 
 // Test setup
 utest::v1::status_t test_setup(const size_t number_of_cases) {
@@ -216,18 +160,10 @@ const Case cases[] = {
     Case("Testing call_in",    call_in_test<20>),
     Case("Testing call_every", call_every_test<20>),
 
-#ifdef MBED_CONF_RTOS_PRESENT
-    Case("Testing event loop 1", event_loop_test1),
-    Case("Testing event loop 2", event_loop_test2<20>),
-#endif
-
     Case("Testing allocate failure 1", allocate_failure_test1),
     Case("Testing allocate failure 2", allocate_failure_test2),
 
     Case("Testing event cancel 1", cancel_test1<20>),
-#ifdef MBED_CONF_RTOS_PRESENT
-    Case("Testing event cancel 2", cancel_test2<20>),
-#endif
 };
 
 Specification specification(test_setup, cases);

mbed_events.h

@@ -23,7 +23,6 @@
 #ifdef __cplusplus
 
 #include "EventQueue.h"
-#include "EventLoop.h"
 
 using namespace events;