Software / code / prosody
Changeset
11920:ff4e34c448a4
net.server_epoll: Try harder to avoid reentrant opportunistic writes
Opportunistic writes sure do complicate things. This is especially
intended to avoid opportunistic_writes from within the onpredrain
callback.
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 18 Nov 2021 16:21:43 +0100 |
| parents | 11919:fae5441fc6cf |
| children | 11921:89aef37fca54 |
| files | net/server_epoll.lua |
| diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/net/server_epoll.lua Thu Nov 18 01:57:21 2021 +0100 +++ b/net/server_epoll.lua Thu Nov 18 16:21:43 2021 +0100 @@ -487,6 +487,7 @@ -- 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 @@ 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 @@ 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 @@ 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();
