yield timeout

dzurikmiroslav · Nov 12, 2024 · 3fdcaa3 · 3fdcaa3
1 parent ed14a14
commit 3fdcaa3
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 36 deletions.
diff --git a/components/protocols/src/http_json.c b/components/protocols/src/http_json.c
@@ -344,10 +344,11 @@ cJSON* http_json_get_script_components(void)
 
 cJSON* http_json_get_script_component_config(const char* id)
 {
-    cJSON* json = cJSON_CreateObject();
+    cJSON* json;
 
     script_component_param_list_t* param_list = script_get_component_params(id);
     if (param_list) {
+        json = cJSON_CreateObject();
         cJSON* params_json = cJSON_CreateArray();
         script_component_param_entry_t* param;
         SLIST_FOREACH (param, param_list, entries) {
@@ -373,6 +374,8 @@ cJSON* http_json_get_script_component_config(const char* id)
         cJSON_AddItemToObject(json, "params", params_json);
 
         script_component_params_free(param_list);
+    } else {
+        json = cJSON_CreateNull();
     }
 
     return json;

diff --git a/components/script/src/l_component.c b/components/script/src/l_component.c
@@ -1,6 +1,8 @@
 #include "l_component.h"
 
 #include <esp_log.h>
+#include <freertos/FreeRTOS.h>
+#include <freertos/task.h>
 #include <string.h>
 #include <sys/queue.h>
 
@@ -19,6 +21,7 @@ typedef struct component_entry_s {
     int params_ref;
     int start_ref;
     int coroutine_ref;
+    TickType_t resume_after;
 
     SLIST_ENTRY(component_entry_s) entries;
 } component_entry_t;
@@ -133,13 +136,13 @@ static void component_restart_coroutine(lua_State* L, component_entry_t* compone
     if (lua_isthread(L, -1)) {
         lua_State* co = lua_tothread(L, -1);
         if (lua_status(co) == LUA_YIELD) {
-            int nresults;
+            int nresults = 0;
             lua_pushboolean(co, false);
             int status = lua_resume(co, L, 1, &nresults);
             lua_pop(co, nresults);
 
             if (status == LUA_YIELD) {
-                ESP_LOGI(TAG, "Coroutine not stop itsef");
+                ESP_LOGI(TAG, "Coroutine not stop itself");
                 lua_closethread(L, co);
             }
         }
@@ -148,6 +151,7 @@ static void component_restart_coroutine(lua_State* L, component_entry_t* compone
 
     luaL_unref(L, LUA_REGISTRYINDEX, component_entry->coroutine_ref);
     component_entry->coroutine_ref = LUA_NOREF;
+    component_entry->resume_after = 0;
 
     // start new coroutine
     lua_rawgeti(L, LUA_REGISTRYINDEX, component_entry->start_ref);
@@ -258,23 +262,34 @@ void l_component_register(lua_State* L)
     components_ref = luaL_ref(L, LUA_REGISTRYINDEX);
 }
 
-void l_component_resume(lua_State* L, bool not_terminate)
+void l_component_resume(lua_State* L, bool finalize)
 {
     component_list_t* component_list = get_component_list(L);
     component_entry_t* component;
     SLIST_FOREACH (component, component_list, entries) {
-        lua_rawgeti(L, LUA_REGISTRYINDEX, component->coroutine_ref);
-        if (lua_isthread(L, -1)) {
-            lua_State* co = lua_tothread(L, -1);
-            int status = lua_status(co);
-            if (status == LUA_YIELD || status == LUA_OK) {
-                int nresults;
-                lua_pushboolean(co, not_terminate);
-                lua_resume(co, L, 1, &nresults);
-                lua_pop(co, nresults);
+        if (finalize || component->resume_after == 0 || component->resume_after < xTaskGetTickCount()) {
+            lua_rawgeti(L, LUA_REGISTRYINDEX, component->coroutine_ref);
+            if (lua_isthread(L, -1)) {
+                lua_State* co = lua_tothread(L, -1);
+                int status = lua_status(co);
+                if (status == LUA_YIELD || status == LUA_OK) {
+                    int nresults = 0;
+                    lua_pushboolean(co, !finalize);
+                    status = lua_resume(co, L, 1, &nresults);
+                    if (status == LUA_YIELD || status == LUA_OK) {
+                        if (nresults > 0 && lua_isinteger(co, -nresults)) {
+                            component->resume_after = xTaskGetTickCount() + pdMS_TO_TICKS(lua_tointeger(co, -nresults));
+                        }
+                    } else {
+                        const char* err = lua_tostring(co, -1);
+                        lua_writestring(err, strlen(err));
+                        lua_writeline();
+                    }
+                    lua_pop(co, nresults);
+                }
             }
+            lua_pop(L, 1);
         }
-        lua_pop(L, 1);
     }
 }
 

diff --git a/components/script/src/l_component.h b/components/script/src/l_component.h
@@ -8,7 +8,7 @@
 
 void l_component_register(lua_State* L);
 
-void l_component_resume(lua_State* L, bool not_terminate);
+void l_component_resume(lua_State* L, bool finalize);
 
 script_component_list_t* l_component_get_components(lua_State* L);
 

diff --git a/components/script/src/l_evse_lib.c b/components/script/src/l_evse_lib.c
@@ -1,8 +1,6 @@
 #include "l_evse_lib.h"
 
 #include <esp_log.h>
-#include <freertos/FreeRTOS.h>
-#include <freertos/task.h>
 #include <math.h>
 #include <string.h>
 

diff --git a/components/script/src/script.c b/components/script/src/script.c
@@ -108,7 +108,7 @@ static void script_task_func(void* param)
         }
         xSemaphoreTake(script_mutex, portMAX_DELAY);
         script_watchdog_reset();
-        l_component_resume(L, true);
+        l_component_resume(L, false);
         xSemaphoreGive(script_mutex);
 
         int top = lua_gettop(L);
@@ -119,7 +119,7 @@ static void script_task_func(void* param)
         vTaskDelay(pdMS_TO_TICKS(50));
     }
 
-    l_component_resume(L, false);
+    l_component_resume(L, true);
 
     lua_close(L);
     L = NULL;

diff --git a/test_app/main/component1.lua b/test_app/main/component1.lua
@@ -24,8 +24,10 @@ addcomponent({
         paramboolean1 = tostring(params.boolean1)
         return coroutine.create(function()
             stage = "begin"
-            while coroutine.yield() do
-                stage = "loop"
+            local counter = 1
+            while coroutine.yield(1000) do
+                stage = "loop" .. counter
+                counter = counter + 1
             end
             stage = "end"
         end)

diff --git a/test_app/main/main.c b/test_app/main/main.c
@@ -15,7 +15,7 @@
 
 static void run_all_tests(void)
 {
-    RUN_TEST_GROUP(evse);
+    // RUN_TEST_GROUP(evse);
     RUN_TEST_GROUP(script);
 }
 

diff --git a/test_app/main/test_script.c b/test_app/main/test_script.c
@@ -265,25 +265,28 @@ TEST(script, component)
     script_component_params_free(component_params);
 
     // test yield/resume
-    l_component_resume(L, true);
+    l_component_resume(L, false);
     TEST_ASSERT_EQUAL_STRING("begin", get_global_var("stage"));
 
-    l_component_resume(L, true);
-    TEST_ASSERT_EQUAL_STRING("loop", get_global_var("stage"));
+    vTaskStepTick(pdMS_TO_TICKS(1100));
+    l_component_resume(L, false);
+    TEST_ASSERT_EQUAL_STRING("loop1", get_global_var("stage"));
 
-    l_component_resume(L, true);
-    TEST_ASSERT_EQUAL_STRING("loop", get_global_var("stage"));
+    vTaskStepTick(pdMS_TO_TICKS(1100));
+    l_component_resume(L, false);
+    TEST_ASSERT_EQUAL_STRING("loop2", get_global_var("stage"));
 
     l_component_restart(L, "component1");
     TEST_ASSERT_EQUAL_STRING("start", get_global_var("stage"));
 
-    l_component_resume(L, true);
+    l_component_resume(L, false);
     TEST_ASSERT_EQUAL_STRING("begin", get_global_var("stage"));
 
-    l_component_resume(L, true);
-    TEST_ASSERT_EQUAL_STRING("loop", get_global_var("stage"));
-
+    vTaskStepTick(pdMS_TO_TICKS(1100));
     l_component_resume(L, false);
+    TEST_ASSERT_EQUAL_STRING("loop1", get_global_var("stage"));
+
+    l_component_resume(L, true);
     TEST_ASSERT_EQUAL_STRING("end", get_global_var("stage"));
 
     TEST_ASSERT_EQUAL(0, lua_gettop(L));  // after all Lua stack should be empty
@@ -449,10 +452,10 @@ TEST(script, json)
 
 TEST_GROUP_RUNNER(script)
 {
-    RUN_TEST_CASE(script, watchdog);
+    // RUN_TEST_CASE(script, watchdog);
     RUN_TEST_CASE(script, component);
-    RUN_TEST_CASE(script, component_params);
-    RUN_TEST_CASE(script, evse);
-    RUN_TEST_CASE(script, board_config)
-    RUN_TEST_CASE(script, json);
+    // RUN_TEST_CASE(script, component_params);
+    // RUN_TEST_CASE(script, evse);
+    // RUN_TEST_CASE(script, board_config)
+    // RUN_TEST_CASE(script, json);
 }