From 1573a8c4cde1cd9528b422b2dcc598e37ffe94a7 Mon Sep 17 00:00:00 2001 From: jacqueline Date: Thu, 2 May 2024 19:12:26 +1000 Subject: WIP merge cyclically dependent components into one big component --- src/events/include/event_queue.hpp | 103 ------------------------------------- 1 file changed, 103 deletions(-) delete mode 100644 src/events/include/event_queue.hpp (limited to 'src/events/include') diff --git a/src/events/include/event_queue.hpp b/src/events/include/event_queue.hpp deleted file mode 100644 index 78b21d53..00000000 --- a/src/events/include/event_queue.hpp +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright 2023 jacqueline - * - * SPDX-License-Identifier: GPL-3.0-only - */ - -#pragma once - -#include -#include -#include -#include - -#include "audio_fsm.hpp" -#include "freertos/FreeRTOS.h" -#include "freertos/portmacro.h" -#include "freertos/queue.h" -#include "system_fsm.hpp" -#include "tinyfsm.hpp" - -#include "ui_fsm.hpp" - -namespace events { - -class Queue { - public: - Queue() : has_events_(xSemaphoreCreateBinary()), mut_(), events_() {} - - auto Add(std::function fn) { - { - std::lock_guard lock{mut_}; - events_.push_back(fn); - } - xSemaphoreGive(has_events_); - } - - auto Service(TickType_t max_wait) -> bool { - bool res = xSemaphoreTake(has_events_, max_wait); - if (!res) { - return false; - } - - bool had_work = false; - for (;;) { - std::function fn; - { - std::lock_guard lock{mut_}; - if (events_.empty()) { - return had_work; - } - had_work = true; - fn = events_.front(); - events_.pop_front(); - } - std::invoke(fn); - } - } - - auto has_events() -> SemaphoreHandle_t { return has_events_; } - - Queue(Queue const&) = delete; - void operator=(Queue const&) = delete; - - private: - SemaphoreHandle_t has_events_; - std::mutex mut_; - std::list> events_; -}; - -template -class Dispatcher { - public: - Dispatcher(Queue* queue) : queue_(queue) {} - - template - auto Dispatch(const Event& ev) -> void { - auto dispatch_fn = [=]() { - tinyfsm::FsmList::template dispatch(ev); - }; - queue_->Add(dispatch_fn); - } - - auto RunOnTask(const std::function& fn) -> void { - queue_->Add(fn); - } - - Dispatcher(Dispatcher const&) = delete; - void operator=(Dispatcher const&) = delete; - - private: - Queue* queue_; -}; - -namespace queues { -auto SystemAndAudio() -> Queue*; -auto Ui() -> Queue*; -} // namespace queues - -auto System() -> Dispatcher&; -auto Audio() -> Dispatcher&; -auto Ui() -> Dispatcher&; - -} // namespace events -- cgit v1.2.3