Skip to content

Fix. Partial recv in debug loop #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
moteus wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix. Partial recv in debug loop #69

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/mobdebug.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,16 @@ local function is_pending(peer)
return buf
end

local function buffer_append(data)
if data and data ~= '' then
if buf then
buf = buf .. data
else
buf = data
end
end
end

local function readnext(peer, num)
peer:settimeout(0) -- non-blocking
local res, err, partial = peer:receive(num)
Expand All @@ -516,7 +526,7 @@ local function handle_breakpoint(peer)

local res, _, partial = peer:receive("*l") -- get the rest of the line; blocking
if not res then
if partial then buf = buf .. partial end
buffer_append(partial)
return
end

Expand Down Expand Up @@ -771,8 +781,10 @@ local function debugger_loop(sev, svars, sfile, sline)
local line, err
if mobdebug.yield and server.settimeout then server:settimeout(mobdebug.yieldtimeout) end
while true do
line, err = server:receive("*l")
local partial
line, err, partial = server:receive("*l")
if not line then
buffer_append(partial)
if err == "timeout" then
if mobdebug.yield then mobdebug.yield() end
elseif err == "closed" then
Expand All @@ -786,6 +798,7 @@ local function debugger_loop(sev, svars, sfile, sline)
break
end
end

if server.settimeout then server:settimeout() end -- back to blocking
command = string.sub(line, string.find(line, "^[A-Z]+"))
if command == "SETB" then
Expand Down