fix error introduced in MTC transport master

[ardour.git] / libs / ardour / luaproc.cc

diff --git a/libs/ardour/luaproc.cc b/libs/ardour/luaproc.cc
index 9122fb32fbdb9e5b1d71218dcd102a68a9201c8b..4e2b32c83840a87876d2415bbe43859220e1e2d0 100644 (file)
--- 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();");
@@ -131,13 +133,14 @@ void
 LuaProc::init ()
 {
 #ifdef WITH_LUAPROC_STATS
-       _stats_avg[0] = _stats_avg[1] = _stats_max[0] = _stats_max[1] = _stats_cnt = 0;
+       _stats_avg[0] = _stats_avg[1] = _stats_max[0] = _stats_max[1] = 0;
+       _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);
@@ -153,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);
@@ -744,16 +748,17 @@ 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
-       ++_stats_cnt;
-       int64_t t2 = g_get_monotonic_time ();
-       int64_t ela0 = t1 - t0;
-       int64_t ela1 = t2 - t1;
-       if (ela0 > _stats_max[0]) _stats_max[0] = ela0;
-       if (ela1 > _stats_max[1]) _stats_max[1] = ela1;
-       _stats_avg[0] += ela0;
-       _stats_avg[1] += ela1;
+       if (++_stats_cnt > 0) {
+               int64_t t2 = g_get_monotonic_time ();
+               int64_t ela0 = t1 - t0;
+               int64_t ela1 = t2 - t1;
+               if (ela0 > _stats_max[0]) _stats_max[0] = ela0;
+               if (ela1 > _stats_max[1]) _stats_max[1] = ela1;
+               _stats_avg[0] += ela0;
+               _stats_avg[1] += ela1;
+       }
 #endif
        return 0;
 }
@@ -1226,7 +1231,6 @@ LuaPluginInfo::LuaPluginInfo (LuaScriptInfoPtr lsi) {
        n_outputs.set (DataType::AUDIO, 1);
        type = Lua;
 
-       _is_instrument = category == "Instrument";
 }
 
 PluginPtr