Skip to content

Change esp32 build over to event-based ASIO #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fgo-ableton merged 1 commit into from
Dec 1, 2025
Merged

Change esp32 build over to event-based ASIO #162

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 6 additions & 30 deletions include/ableton/platforms/esp32/Context.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include <ableton/platforms/asio/AsioTimer.hpp>
#include <ableton/platforms/asio/Socket.hpp>
#include <ableton/platforms/esp32/LockFreeCallbackDispatcher.hpp>
#include <driver/gptimer.h>
#include <freertos/FreeRTOS.h>
#include <freertos/task.h>

Expand All @@ -40,32 +39,25 @@ class Context
{
class ServiceRunner
{
// This task used to exclusively poll ASIO with `poll_one()`, with an
// interval of 100 microseconds. Since ASIO uses `select()` internally to
// implement `poll_one()`, we might as well use an event based approach and
// save some CPU cycles by using `io_service::run()` instead.
static void run(void* userParams)
{
auto runner = static_cast<ServiceRunner*>(userParams);
for (;;)
{
try
{
ulTaskNotifyTake(pdTRUE, portMAX_DELAY);
runner->mpService->poll_one();
runner->mpService->run();
}
catch (...)
{
}
}
}

static void IRAM_ATTR timerIsr(void* userParam)
{
static BaseType_t xHigherPriorityTaskWoken = pdFALSE;
vTaskNotifyGiveFromISR(*((TaskHandle_t*)userParam), &xHigherPriorityTaskWoken);
if (xHigherPriorityTaskWoken)
{
portYIELD_FROM_ISR();
}
}

public:
ServiceRunner()
: mpService(new ::asio::io_service())
Expand All @@ -78,24 +70,9 @@ class Context
2 | portPRIVILEGE_BIT,
&mTaskHandle,
LINK_ESP_TASK_CORE_ID);

const esp_timer_create_args_t timerArgs = {
.callback = &timerIsr,
.arg = (void*)&mTaskHandle,
.dispatch_method = ESP_TIMER_TASK,
.name = "link",
.skip_unhandled_events = true,
};

ESP_ERROR_CHECK(esp_timer_create(&timerArgs, &mTimer));
ESP_ERROR_CHECK(esp_timer_start_periodic(mTimer, 100));
}

~ServiceRunner()
{
esp_timer_delete(mTimer);
vTaskDelete(mTaskHandle);
}
~ServiceRunner() { vTaskDelete(mTaskHandle); }

template <typename Handler>
void async(Handler handler)
Expand All @@ -107,7 +84,6 @@ class Context

private:
TaskHandle_t mTaskHandle;
esp_timer_handle_t mTimer;
std::unique_ptr<::asio::io_service> mpService;
std::unique_ptr<::asio::io_service::work> mpWork;
};
Expand Down