Skip to content

feat: debugger hot restart #318

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

Merged
actboy168 merged 5 commits into from
Apr 24, 2025
Merged

feat: debugger hot restart #318

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
92516fb
debugger hot restart
jpeletier Apr 7, 2025
b1cae0c
revert unnecessary changes
jpeletier Apr 8, 2025
9160402
dbg:attach default
jpeletier Apr 8, 2025
3d58a21
fix last cr-lf
jpeletier Apr 8, 2025
69b7919
close worker channel in the right place
jpeletier Apr 18, 2025
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
1 change: 1 addition & 0 deletions extension/script/backend/bootstrap.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ local function initMaster(rootpath, address)
ExitGuard = setmetatable({}, {__gc=function()
chan:push(nil, "EXIT")
thread.wait(mt)
channel.destroy("DbgMaster")
end})
end

Expand Down
2 changes: 2 additions & 0 deletions extension/script/backend/master/mgr.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,8 @@ function mgr.exitWorker(w)
for WorkerIdent, threadId in pairs(threadCatalog) do
if threadId == w then
threadCatalog[WorkerIdent] = nil
local workerChannel = ('DbgWorker(%s)'):format(WorkerIdent)
channel.destroy(workerChannel)
Comment thread
jpeletier marked this conversation as resolved.
Outdated
end
end
threadStatus[w] = nil
Expand Down
6 changes: 5 additions & 1 deletion extension/script/debugger.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ function dbg:start(cfg)
end

function dbg:attach(cfg)
initDebugger(self, cfg)
initDebugger(self, cfg or {})

self.rdebug.start(([[
local rootpath = %q
Expand All @@ -199,6 +199,10 @@ function dbg:attach(cfg)
return self
end

function dbg:stop()
self.rdebug.clear()
end

function dbg:event(...)
self.rdebug.event(...)
return self
Expand Down
6 changes: 6 additions & 0 deletions src/luadebug/rdebug_hookmgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,6 +568,10 @@ struct hookmgr {
}
luadebug::eventfree::destroy(hL, eventfree);
lua_sethook(hL, 0, 0, 0);
#if defined(LUADEBUG_DISABLE_THUNK)
// clear hook manager pointer stored in thunk:
thunk_set(hL, &THUNK_MGR, intptr_t(nullptr));
#endif
#if defined(LUA_HOOKEXCEPTION)
exception_open(hL, 0);
#endif
Expand All @@ -594,11 +598,13 @@ struct hookmgr {
#else
static int full_hook_callback(lua_State* hL, lua_Debug* ar) {
hookmgr* mgr = (hookmgr*)thunk_get(hL, &THUNK_MGR);
if (!mgr) return 0;
mgr->full_hook(hL, ar);
return 0;
}
static int idle_hook_callback(lua_State* hL, lua_Debug* ar) {
hookmgr* mgr = (hookmgr*)thunk_get(hL, &THUNK_MGR);
if (!mgr) return 0;
mgr->idle_hook(hL, ar);
return 0;
}
Expand Down
Loading