Alex/Capy64
1
0
Fork 0
mirror of https://github.com/Ale32bit/Capy64.git synced 2025-01-18 18:46:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added no yield timeout error on infinite loops

Browse source
This commit is contained in:
Alessandro Proto 2023-01-22 22:41:23 +01:00
parent c0fe129729
commit 024b1f6a19
1 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
Capy64/LuaRuntime/Runtime.cs
View file

@ -6,6 +6,7 @@ using System.Collections.Concurrent;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Timers;
namespace Capy64.LuaRuntime; namespace Capy64.LuaRuntime;
@ -23,7 +24,10 @@ public class Runtime
private readonly Lua Parent; private readonly Lua Parent;
public Lua Thread { get; private set; } public Lua Thread { get; private set; }
private string[] filters = Array.Empty<string>(); private string[] filters = Array.Empty<string>();
private bool Disposing = false; private bool _disposing = false;
private static System.Timers.Timer yieldTimeoutTimer = new(TimeSpan.FromSeconds(3));
private static bool yieldTimedOut = false;
public Runtime() public Runtime()
{ {
Parent = new(false) Parent = new(false)
@ -35,6 +39,22 @@ public class Runtime
Thread = Parent.NewThread(); Thread = Parent.NewThread();
Thread.SetHook(LH_YieldTimeout, LuaHookMask.Count, 7000);
yieldTimeoutTimer.Elapsed += (sender, ev) =>
{
yieldTimedOut = true;
};
}
private static void LH_YieldTimeout(IntPtr state, IntPtr ar)
{
var L = Lua.FromIntPtr(state);
if (yieldTimedOut)
{
L.Error("no yield timeout");
Console.WriteLine("tick");
}
} }
public void Patch() public void Patch()
@ -113,12 +133,18 @@ public class Runtime
filters = Array.Empty<string>(); filters = Array.Empty<string>();
var evpars = PushEventToStack(ev); var evpars = PushEventToStack(ev);
if (Disposing) if (_disposing)
return false; return false;
yieldTimeoutTimer.Start();
yieldTimedOut = false;
var status = Thread.Resume(null, evpars, out int pars); var status = Thread.Resume(null, evpars, out int pars);
yieldTimeoutTimer.Stop();
if (status is LuaStatus.OK or LuaStatus.Yield) if (status is LuaStatus.OK or LuaStatus.Yield)
{ {
if (Disposing) if (_disposing)
return false; return false;
if (status == LuaStatus.Yield) if (status == LuaStatus.Yield)
{ {
@ -169,7 +195,7 @@ public class Runtime
public void Close() public void Close()
{ {
Disposing = true; _disposing = true;
Parent.Close(); Parent.Close();
} }
} }