debugger hot restart

Author: jpeletier

extension/script/backend/bootstrap.lua

@@ -3,20 +3,26 @@ local channel = require "bee.channel"
 
 local m = {}
 
+-- Stores the name of the master channel
+---@type string | nil
+DbgMaster = DbgMaster
+
 local function hasMaster()
-    return channel.query "DbgMaster" ~= nil
+    return DbgMaster and channel.query(DbgMaster) ~= nil
 end
 
 local function initMaster(rootpath, address)
     if hasMaster() then
         return
     end
-    local chan = channel.create "DbgMaster"
+    DbgMaster = "DbgMaster-" .. address
+    local chan = channel.create(DbgMaster)
     local mt = thread.create(([[
         local rootpath = %q
         package.path = rootpath.."/script/?.lua"
         local log = require "common.log"
         log.file = rootpath.."/master.log"
+        DbgMaster = %q
         local ok, err = xpcall(function()
             local socket = require "common.socket"(%q)
             local master = require "backend.master.mgr"
@@ -28,11 +34,15 @@ local function initMaster(rootpath, address)
         end
     ]]):format(
         rootpath,
+        DbgMaster,
         address
     ))
     ExitGuard = setmetatable({}, {__gc=function()
         chan:push(nil, "EXIT")
         thread.wait(mt)
+        local WorkerIdent = tostring(thread.id)
+        local WorkerChannel = ('DbgWorker(%s)'):format(WorkerIdent)
+        channel.destroy(WorkerChannel)
     end})
 end
 

extension/script/backend/master/mgr.lua

@@ -43,7 +43,7 @@ end
 
 function mgr.init(io)
     socket = io
-    masterThread = assert(channel.query 'DbgMaster')
+    masterThread = assert(channel.query(DbgMaster))
     socket.event_close(event_close)
     return true
 end
@@ -260,6 +260,7 @@ function mgr.update()
     local event = require 'backend.master.event'
     event.terminated()
     socket.closeall()
+    channel.destroy(DbgMaster)
 end
 
 function mgr.setClient(c)

extension/script/backend/worker.lua

@@ -36,7 +36,7 @@ local CMD = {}
 local WorkerIdent = tostring(thread.id)
 local WorkerChannel = ('DbgWorker(%s)'):format(WorkerIdent)
 
-local masterThread = assert(channel.query 'DbgMaster')
+local masterThread = assert(channel.query(DbgMaster))
 local workerThread = channel.create(WorkerChannel)
 
 local function workerThreadUpdate(timeout)

extension/script/debugger.lua

@@ -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

src/luadebug/rdebug_hookmgr.cpp

@@ -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
@@ -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;
     }