diff options
| author | Robin Gareus <robin@gareus.org> | 2018-03-19 02:26:24 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2018-03-19 02:43:03 +0100 |
| commit | 2fa6314fb44f5136ce726408dc907dc5ff3b6cea (patch) | |
| tree | 1e5f16e2b17031b2106be807577afc5fff7a8e0d | |
| parent | f2ca0c144b8f74ddf1ed2845de413a8b2e42d832 (diff) | |
Lua: Lock bindings into memory for rt-scripts
Empirically this decreases gc-spike duration (worst-case) by a factor of
two and speeds up the average gc-run by a factor of over 4 (depending
on the amount of memory used by the plugin).
| -rw-r--r-- | libs/ardour/luaproc.cc | 15 | ||||
| -rw-r--r-- | libs/ardour/session.cc | 5 |
2 files changed, 12 insertions, 8 deletions
diff --git a/libs/ardour/luaproc.cc b/libs/ardour/luaproc.cc index 385965b3cf..4e2b32c838 100644 --- a/libs/ardour/luaproc.cc +++ b/libs/ardour/luaproc.cc @@ -111,14 +111,16 @@ LuaProc::LuaProc (const LuaProc &other) LuaProc::~LuaProc () { #ifdef WITH_LUAPROC_STATS if (_info && _stats_cnt > 0) { - printf ("LuaProc: '%s' run() avg: %.3f max: %.3f [ms]\n", + printf ("LuaProc: '%s' run() avg: %.3f max: %.3f [ms] p: %.1f\n", _info->name.c_str (), 0.0001f * _stats_avg[0] / (float) _stats_cnt, - 0.0001f * _stats_max[0]); - printf ("LuaProc: '%s' gc() avg: %.3f max: %.3f [ms]\n", + 0.0001f * _stats_max[0], + _stats_max[0] * (float)_stats_cnt / _stats_avg[0]); + printf ("LuaProc: '%s' gc() avg: %.3f max: %.3f [ms] p: %.1f\n", _info->name.c_str (), 0.0001f * _stats_avg[1] / (float) _stats_cnt, - 0.0001f * _stats_max[1]); + 0.0001f * _stats_max[1], + _stats_max[1] * (float)_stats_cnt / _stats_avg[1]); } #endif lua.do_command ("collectgarbage();"); @@ -135,10 +137,10 @@ LuaProc::init () _stats_cnt = -25; #endif - lua.tweak_rt_gc (); lua.Print.connect (sigc::mem_fun (*this, &LuaProc::lua_print)); // register session object lua_State* L = lua.getState (); + lua_mlock (L, 1); LuaBindings::stddef (L); LuaBindings::common (L); LuaBindings::dsp (L); @@ -154,6 +156,7 @@ LuaProc::init () .addFunction ("name", &LuaProc::name) .endClass () .endNamespace (); + lua_mlock (L, 0); // add session to global lua namespace luabridge::push <Session *> (L, &_session); @@ -745,7 +748,7 @@ LuaProc::connect_and_run (BufferSet& bufs, int64_t t1 = g_get_monotonic_time (); #endif - lua.collect_garbage_step (100 /*kB*/); + lua.collect_garbage_step (); #ifdef WITH_LUAPROC_STATS if (++_stats_cnt > 0) { int64_t t2 = g_get_monotonic_time (); diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 039288952b..6d2ca75719 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -5486,7 +5486,7 @@ Session::try_run_lua (pframes_t nframes) Glib::Threads::Mutex::Lock tm (lua_lock, Glib::Threads::TRY_LOCK); if (tm.locked ()) { try { (*_lua_run)(nframes); } catch (...) { } - lua.collect_garbage_step (100 /*kB*/); + lua.collect_garbage_step (); } } @@ -5496,7 +5496,6 @@ Session::setup_lua () #ifndef NDEBUG lua.Print.connect (&_lua_print); #endif - lua.tweak_rt_gc (); lua.sandbox (true); lua.do_command ( "function ArdourSession ()" @@ -5627,9 +5626,11 @@ Session::setup_lua () abort(); /*NOTREACHED*/ } + lua_mlock (L, 1); LuaBindings::stddef (L); LuaBindings::common (L); LuaBindings::dsp (L); + lua_mlock (L, 0); luabridge::push <Session *> (L, this); lua_setglobal (L, "Session"); } |