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.server_epoll: Try harder to avoid reentrant opportunistic writes

Browse source 
Opportunistic writes sure do complicate things. This is especially
intended to avoid opportunistic_writes from within the onpredrain
callback.
This commit is contained in:
Kim Alvefur 2021-11-18 16:21:43 +01:00
parent 3c57156fb9
commit 4704104049
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
net/server_epoll.lua
View file

@ -487,6 +487,7 @@ end
-- Called when socket is writable
function interface:onwritable()
self._writing = true; -- prevent reentrant writes etc
self:onconnect();
if not self.conn then return; end -- could have been closed in onconnect
self:on("predrain");
@ -514,6 +515,7 @@ function interface:onwritable()
end
self:setwritetimeout(false);
self:ondrain(); -- Be aware of writes in ondrain
self._writing = nil;
return ok;
elseif partial then
self:debug("Sent %d out of %d buffered bytes", partial, #data);
@ -528,6 +530,7 @@ function interface:onwritable()
self:set(nil, true);
self:setwritetimeout();
end
self._writing = nil;
if err == "wantwrite" or err == "timeout" then
self:set(nil, true);
self:setwritetimeout();
@ -557,7 +560,7 @@ function interface:write(data)
elseif buffer == nil then
self.writebuffer = data;
end
if not self._write_lock then
if not self._write_lock and not self._writing then
if self._writable and cfg.opportunistic_writes and not self._opportunistic_write then
self._opportunistic_write = true;
local ret, err = self:onwritable();