izaliamae/python-computer-craft
1
0
Fork 0
forked from mirror/python-computer-craft
Code Issues Pull requests Projects Releases Wiki Activity

Capture coroutine yield counts

Browse source
This commit is contained in:
neumond 2020-07-06 02:13:07 +03:00
parent d43fb0de29
commit f6408d57b9
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
computercraft/back.lua
View file

@ -4,6 +4,7 @@ local event_sub = {}
genv.temp = temp
local url = 'http://127.0.0.1:4343/'
local tasks = {}
local ycounts = {}
ws = http.websocket(url..'ws/')
if ws == false then
@ -39,6 +40,7 @@ while true do
action='task_result',
task_id=msg.task_id,
result={false, err},
yields=0,
})
else
setfenv(fn, genv)
@ -47,9 +49,11 @@ while true do
action='task_result',
task_id=msg.task_id,
result={fn()},
yields=0,
})
else
tasks[msg.task_id] = coroutine.create(fn)
ycounts[msg.task_id] = 0
end
end
elseif msg.action == 'sub' then
@ -80,12 +84,16 @@ while true do
action='task_result',
task_id=task_id,
result=r,
yields=ycounts[task_id],
})
del_tasks[task_id] = true
else
ycounts[msg.task_id] = ycounts[msg.task_id] + 1
end
end
for task_id in pairs(del_tasks) do
tasks[task_id] = nil
ycounts[msg.task_id] = nil
end
end

1
computercraft/server.py
View file

@ -223,6 +223,7 @@ class CCApplication(web.Application):
elif msg['action'] == 'task_result':
api._result_values[msg['task_id']] = msg['result']
api._result_locks[msg['task_id']].set()
# print(msg['task_id'], msg['yields'])
else:
await ws.send_json({
'action': 'close',