lba.gitea/WLED
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wasmRun in separate task

Browse Source
This commit is contained in:
cschwinne 2021-12-22 17:28:13 +01:00
parent 214d4364f1
commit 11b0b75e26
2 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wled00/fcn_declare.h
View File

@ -252,7 +252,7 @@ void userLoop();
//wasm.cpp
void wasmInit();
void wasmRun();
void wasmRunTask();
void wasmEnd();
class WASMFX {
@ -262,7 +262,7 @@ class WASMFX {
}
void run() {
wasmRun();
wasmRunTask();
}
void end() {

56
wled00/wasm.cpp
View File

@ -249,30 +249,12 @@ void wasm_task(void*)
void wasmInit()
{
if (runtime || env) wasmEnd();
//Serial.println("\nWasm3 v" M3_VERSION " (" M3_ARCH "), build " __DATE__ " " __TIME__);
/*
#ifdef ESP32
// On ESP32, we can launch in a separate thread
xTaskCreate(&wasm_task, "wasm3", NATIVE_STACK_SIZE, NULL, 5, NULL);
#else
wasm_task(NULL);
#endif
*/
wasm_task(NULL);
}
void wasmRun() {
//re-init after wasm_buffer refresh
if (wasm_state == WASM_STATE_STALE) wasmInit();
if (wasm_state != WASM_STATE_READY) return;
if (result) {
Serial.print("WASM run error");
Serial.println(result);
wasm_state = WASM_STATE_ERROR;
return;
}
volatile bool wasmRunning = false;
void wasmRun(void * parameter) {
result = m3_CallV(fu);
if (result) {
@ -291,6 +273,40 @@ void wasmRun() {
}
wasm_state = WASM_STATE_ERROR;
}
wasmRunning = false;
#ifdef ESP32
vTaskDelete(NULL);
#endif
}
void wasmRunTask() {
//re-init after wasm_buffer refresh
if (wasm_state == WASM_STATE_STALE) wasmInit();
if (wasm_state != WASM_STATE_READY) return;
if (result) {
Serial.print("WASM run error");
Serial.println(result);
wasm_state = WASM_STATE_ERROR;
return;
}
#ifdef ESP32
// On ESP32, we can launch in a separate thread
wasmRunning = true;
unsigned long startTime = millis();
TaskHandle_t xHandle = NULL;
xTaskCreate(&wasmRun, "wasm3", 8096, NULL, 1, &xHandle);
while (wasmRunning) {
if (millis() - startTime > 250) { //bail
if (xHandle != NULL) vTaskDelete(xHandle);
wasmRunning = false;
}
}
#else
wasmRun(nullptr); //no hang protection (e.g. "while (true);")
#endif
}
void wasmEnd() {