Adopted equeue_break added to events

Author: geky

EventLoop.cpp

@@ -22,9 +22,8 @@ EventLoop::~EventLoop() {
     stop();
 }
 
-MBED_NORETURN static void run(EventLoop *loop) {
+static void run(EventLoop *loop) {
     loop->dispatch();
-    MBED_UNREACHABLE;
 }
 
 osStatus EventLoop::start() {
@@ -37,33 +36,13 @@ osStatus EventLoop::start() {
     return status;
 }
 
-
-struct hcontext {
-    struct event e;
-    Semaphore halted;
-};
-
-MBED_NORETURN static void halt(void *p) {
-    Semaphore *halted = static_cast<Semaphore*>(p);
-    halted->release();
-    while (true) {
-        Thread::wait(osWaitForever);
-    }
-}
-
 osStatus EventLoop::stop() {
     if (!_running) {
         return osOK;
     }
 
-    // Freeze the thread in a safe state
-    struct hcontext context = {{0}, Semaphore(0)};
-    event_delay(&context.halted, 0);
-    event_post(&_equeue, halt, &context.halted);
-    context.halted.wait();
-
-    // Kill the thread
-    osStatus status = _thread.terminate();
+    break_();
+    osStatus status = _thread.join();
     _running = false;
     return status;
 }

EventQueue.cpp

@@ -26,6 +26,10 @@ void EventQueue::dispatch(int ms) {
     return equeue_dispatch(&_equeue, ms);
 }
 
+void EventQueue::break_() {
+    return equeue_break(&_equeue);
+}
+
 unsigned EventQueue::get_tick() {
     return events_tick();
 }

EventQueue.h

@@ -208,6 +208,8 @@ class EventQueue {
 
 
 protected:
+    void break_();
+
     struct equeue _equeue;
 
     template <typename F, typename A0, typename A1, typename A2, typename A3, typename A4>

TESTS/events/queue/main.cpp

@@ -201,7 +201,7 @@ void cancel_test2() {
 
 // Test setup
 utest::v1::status_t test_setup(const size_t number_of_cases) {
-    //GREENTEA_SETUP(5, "default_auto");
+    GREENTEA_SETUP(20, "default_auto");
     return verbose_test_setup_handler(number_of_cases);
 }
 

events-c.lib

@@ -1 +1 @@
-https://github.com/geky/events/#a9a60ed7021309876166159860966a6b9e83ae01
+https://github.com/geky/events/#7383fd6f78be620ca01d91d23423870e79ea0622