AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-16 18:55:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #211 from infinikiller64/master

Browse Source 
allow system to catch too long without yielding
This commit is contained in:
Florian Nücke 2014-04-17 16:42:21 +02:00
commit 1bb2c76bd5
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/resources/assets/opencomputers/lua/kernel.lua
View File

@ -1,8 +1,13 @@
local hookInterval = 100 local hookInterval = 100
local deadline = math.huge local deadline = math.huge
local hitDeadline = false
local function checkDeadline() local function checkDeadline()
if computer.realTime() > deadline then if computer.realTime() > deadline then
debug.sethook(coroutine.running(), checkDeadline, "", 1) debug.sethook(coroutine.running(), checkDeadline, "", 1)
if not hitDeadline then
deadline = deadline + 0.5
end
hitDeadline = true
error("too long without yielding", 0) error("too long without yielding", 0)
end end
end end
@ -570,6 +575,7 @@ local function main()
while true do while true do
deadline = computer.realTime() + timeout -- timeout global is set by host deadline = computer.realTime() + timeout -- timeout global is set by host
hitDeadline = false
debug.sethook(co, checkDeadline, "", hookInterval) debug.sethook(co, checkDeadline, "", hookInterval)
local result = table.pack(coroutine.resume(co, table.unpack(args, 1, args.n))) local result = table.pack(coroutine.resume(co, table.unpack(args, 1, args.n)))
if not result[1] then if not result[1] then
@ -584,4 +590,4 @@ end
-- JNLua converts the coroutine to a string immediately, so we can't get the -- JNLua converts the coroutine to a string immediately, so we can't get the
-- traceback later. Because of that we have to do the error handling here. -- traceback later. Because of that we have to do the error handling here.
return pcall(main) return pcall(main)