diff options
| author | ruki <[email protected]> | 2019-12-17 23:51:20 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2019-12-17 17:08:04 +0800 |
| commit | 656f546055712e694754211bbd99ff18d144d856 (patch) | |
| tree | ee4631b0a90b1ce4f95089f015d5b874b8e484d2 /xmake/core/base/socket.lua | |
| parent | 8b62b7ced03aa39d79980958cf1d92cef88883f5 (diff) | |
fix socket recv for iocp
Diffstat (limited to 'xmake/core/base/socket.lua')
| -rw-r--r-- | xmake/core/base/socket.lua | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/xmake/core/base/socket.lua b/xmake/core/base/socket.lua index ffae67082..a01dde5dd 100644 --- a/xmake/core/base/socket.lua +++ b/xmake/core/base/socket.lua @@ -322,14 +322,15 @@ function _instance:recv(size, opt) local real = 0 local wait = false local data_or_errors = nil + local data = bytes(8192) if opt.block then local results = {} while recv < size do - real, data_or_errors = io.socket_recv(self:csock(), size - recv) + real, data_or_errors = io.socket_recv(self:csock(), data:caddr(), math.min(8192, size - recv)) if real > 0 then recv = recv + real wait = false - table.insert(results, bytes(data_or_errors)) + table.insert(results, bytes(data, 1, real)) elseif real == 0 and not wait then local events, waiterrs = self:wait(socket.EV_RECV, opt.timeout or -1) if events == socket.EV_RECV then @@ -348,9 +349,9 @@ function _instance:recv(size, opt) recv = -1 end else - recv, data_or_errors = io.socket_recv(self:csock(), size) + recv, data_or_errors = io.socket_recv(self:csock(), data:caddr(), math.min(8192, size)) if recv > 0 then - data_or_errors = bytes(data_or_errors) + data_or_errors = bytes(data, 1, recv) end end if recv < 0 and data_or_errors then |