mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

net.cqueues: Fix resuming after timeouts

Browse source 
net.cqueues previously relied on timers instead of fd events sometimes.

Under net.server_select, it would have called cq:loop() on every
iteration of the main loop, which was probably not optimal.
This commit is contained in:
Kim Alvefur 2020-07-08 22:01:19 +02:00
parent 14cdec45c5
commit f2ae89296c
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
net/cqueues.lua
View file

@ -9,6 +9,7 @@
local server = require "net.server";
local cqueues = require "cqueues";
local timer = require "util.timer";
assert(cqueues.VERSION >= 20150113, "cqueues newer than 20150113 required")
-- Create a single top level cqueue
@ -18,8 +19,21 @@ if server.cq then -- server provides cqueues object
cq = server.cq;
elseif server.watchfd then
cq = cqueues.new();
local timeout = timer.add_task(cq:timeout() or 0, function ()
-- FIXME It should be enough to reschedule this timeout instead of replacing it, but this does not work. See https://issues.prosody.im/1572
assert(cq:loop(0));
return cq:timeout();
end);
server.watchfd(cq:pollfd(), function ()
assert(cq:loop(0));
local t = cq:timeout();
if t then
timer.stop(timeout);
timeout = timer.add_task(cq:timeout(), function ()
assert(cq:loop(0));
return cq:timeout();
end);
end
end);
else
error "NYI"