mirror of
https://github.com/lunarmodules/luasocket.git
synced 2024-12-25 03:58:21 +01:00
fixed yieldable socket.protect in etc/dispatch.lua
This commit is contained in:
parent
6dcecd8f45
commit
7006ae120d
@ -5,6 +5,7 @@
|
||||
-----------------------------------------------------------------------------
|
||||
local base = _G
|
||||
local table = require("table")
|
||||
local string = require("string")
|
||||
local socket = require("socket")
|
||||
local coroutine = require("coroutine")
|
||||
module("dispatch")
|
||||
@ -43,25 +44,31 @@ end
|
||||
-----------------------------------------------------------------------------
|
||||
-- Mega hack. Don't try to do this at home.
|
||||
-----------------------------------------------------------------------------
|
||||
-- we can't yield across calls to protect, so we rewrite it with coxpcall
|
||||
-- we can't yield across calls to protect on Lua 5.1, so we rewrite it with
|
||||
-- coroutines
|
||||
-- make sure you don't require any module that uses socket.protect before
|
||||
-- loading our hack
|
||||
if string.sub(base._VERSION, -3) == "5.1" then
|
||||
local function _protect(co, status, ...)
|
||||
if not status then
|
||||
local msg = ...
|
||||
if base.type(msg) == 'table' then
|
||||
return nil, msg[1]
|
||||
else
|
||||
base.error(msg, 0)
|
||||
end
|
||||
end
|
||||
if coroutine.status(co) == "suspended" then
|
||||
return _protect(co, coroutine.resume(co, coroutine.yield(...)))
|
||||
else
|
||||
return ...
|
||||
end
|
||||
end
|
||||
|
||||
function socket.protect(f)
|
||||
return function(...)
|
||||
local co = coroutine.create(f)
|
||||
while true do
|
||||
local results = {coroutine.resume(co, ...)}
|
||||
local status = table.remove(results, 1)
|
||||
if not status then
|
||||
if base.type(results[1]) == 'table' then
|
||||
return nil, results[1][1]
|
||||
else base.error(results[1]) end
|
||||
end
|
||||
if coroutine.status(co) == "suspended" then
|
||||
arg = {coroutine.yield(base.unpack(results))}
|
||||
else
|
||||
return base.unpack(results)
|
||||
end
|
||||
return _protect(co, coroutine.resume(co, ...))
|
||||
end
|
||||
end
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user