Changeset 1433 for trunk

Timestamp:

11/27/11 01:16:15 (18 months ago)

Author:

reyalp

Message:

add script control of lua scheduling. Adds one new function:
old_max_count,old_max_ms=set_yield(max_count,max_ms)
max_count is the maximum number of yield_hook calls (100x vm instructions) to run before yielding, default 25
max_ms is the maximum number milliseconds to run, checked every 100 vm instructions, precision 10ms, default 10
passing nil for either value resets to default. Values are treated as unsigned.

default number of vm instructions per kbd_task iteration is changed from 1000 to 2500, but total execution time is now limited to 10ms (previously unlimited), and lua->c->lua yield_hook are counted so a yield will occure more quickly after the c call ends.

Location:

trunk/core

Files:

• luascript.c (modified) (6 diffs)
• luascript.h (modified) (1 diff)
• script.c (modified) (4 diffs)

trunk/core/luascript.c

@@ -18 +18 @@
 #include "core.h"
 #include "gui_fselect.h"
+#include "lang.h"
 #include "gui_lang.h"
 
@@ -26 +27 @@
 
 static int lua_script_is_ptp;
-
+static int run_first_resume; // 1 first 'resume', 0 = resuming from yield
+static int run_start_tick; // tick count at start of this kbd_task iteration
+static int run_hook_count; // number of calls to the count hook this kbd_task iteration
+#define YIELD_CHECK_COUNT 100 // check for yield every N vm instructions
+#define YIELD_MAX_COUNT_DEFAULT 25 // 25 checks = 2500 vm instructions
+#define YIELD_MAX_MS_DEFAULT 10
+static unsigned yield_max_count;
+static unsigned yield_max_ms;
 static int yield_hook_enabled;
 
@@ -124 +132 @@
 static void lua_count_hook(lua_State *L, lua_Debug *ar)
 {
-  if( L->nCcalls <= L->baseCcalls && yield_hook_enabled )
+  run_hook_count++;
+  if( L->nCcalls > L->baseCcalls || !yield_hook_enabled )
+    return;
+  if(run_hook_count >= yield_max_count || get_tick_count() - run_start_tick >= yield_max_ms)
     lua_yield( L, 0 );
 }
@@ -191 +202 @@
     return 0;
   }
-  lua_sethook(Lt, lua_count_hook, LUA_MASKCOUNT, 1000 );
+  lua_sethook(Lt, lua_count_hook, LUA_MASKCOUNT, YIELD_CHECK_COUNT );
   lua_script_enable_yield_hook();
-  return 1;
+  run_first_resume = 1;
+  yield_max_count = YIELD_MAX_COUNT_DEFAULT;
+  yield_max_ms = YIELD_MAX_MS_DEFAULT;
+  return 1;
+}
+
+// run a timeslice of lua script
+void lua_script_run(void)
+{
+    int Lres;
+    int top;
+    if (run_first_resume) {
+        run_first_resume = 0;
+        top = 0;
+    } else {
+        top = lua_gettop(Lt);
+    }
+    run_start_tick = get_tick_count();
+    run_hook_count = 0;
+    Lres = lua_resume( Lt, top );
+
+    if (Lres == LUA_YIELD) {
+        // yielded
+        return;
+    } else if(Lres != 0) {
+        lua_script_error(Lt,1);
+        return;
+    } else {
+        // finished normally, add ptp result
+        lua_script_finish(Lt);
+        script_console_add_line(lang_str(LANG_CONSOLE_TEXT_FINISHED));
+        action_pop();
+        script_end();
+    }
 }
 
@@ -1962 +2006 @@
 }
 
+/*
+set scheduling parameters
+old_max_count,old_max_ms=set_yield(max_count,max_ms)
+*/
+static int luaCB_set_yield( lua_State* L )
+{
+  lua_pushnumber(L,yield_max_count);
+  lua_pushnumber(L,yield_max_ms);
+  yield_max_count = luaL_optnumber(L,1,YIELD_MAX_COUNT_DEFAULT);
+  yield_max_ms = luaL_optnumber(L,2,YIELD_MAX_MS_DEFAULT);
+  return 2;
+}
+
+
 static void register_func( lua_State* L, const char *name, void *func) {
   lua_pushcfunction( L, func );
@@ -2130 +2188 @@
    FUNC(file_browser)
 
+   FUNC(set_yield)
+
   {NULL, NULL},
 };

trunk/core/luascript.h

@@ -5 +5 @@
 
 void lua_script_reset();
-int lua_script_start( char const* script,int is_ptp );
+int lua_script_start( char const* script,int is_ptp ); // initialize and load script
+void lua_script_run( void ); // run script timeslice
 void lua_script_error( lua_State* L,int runtime );
 void lua_script_finish( lua_State* L );

trunk/core/script.c

@@ -82 +82 @@
 static int script_loaded_params[SCRIPT_NUM_PARAMS];
 static long running_script_stack_name = -1;
-
-#ifdef OPT_LUA
-static int state_lua_kbd_first_call_to_resume;  // AUJ
-#endif
 
 //-------------------------------------------------------------------
@@ -476 +472 @@
 static void process_script()
 {   // Note: This function is called from an action stack for AS_SCRIPT_RUN.
-    
-    long t;
-    int Lres;
 
     if (state_kbd_script_run != 3) {
 #ifdef OPT_LUA
         if( L ) {
-            int top;
-            if (state_lua_kbd_first_call_to_resume) {
-                state_lua_kbd_first_call_to_resume = 0;
-                top = 0;
-            } else {
-                top = lua_gettop(Lt);
-            }
-            Lres = lua_resume( Lt, top );
-
-            if (Lres != LUA_YIELD && Lres != 0) {
-                lua_script_error(Lt,1);
-                return;
-            }
-
-            if (Lres != LUA_YIELD) {
-                // add ptp result
-                lua_script_finish(Lt);
-                script_console_add_line(lang_str(LANG_CONSOLE_TEXT_FINISHED));
-                action_pop();
-                script_end();
-            }    
+            lua_script_run();
         } else
 #endif
@@ -682 +655 @@
             }
         }
-        state_lua_kbd_first_call_to_resume = 1;
 #else
         char msg[64];
@@ -716 +688 @@
 {
   if (!lua_script_start(script,1)) return -1;
-  state_lua_kbd_first_call_to_resume = 1;
   state_kbd_script_run = 1;
   kbd_set_block(1);