add more info when service init blocked

service/launcher.lua

@@ -6,6 +6,7 @@ local string = string
 local services = {}
 local command = {}
 local instance = {} -- for confirm (function command.LAUNCH / command.ERROR / command.LAUNCHOK)
+local launch_session = {} -- for command.QUERY, service_address -> session
 
 local function handle_to_address(handle)
 	return tonumber("0x" .. string.sub(handle , 2))
@@ -68,6 +69,7 @@ function command.REMOVE(_, handle, kill)
 		-- instance is dead
 		response(not kill)	-- return nil to caller of newservice, when kill == false
 		instance[handle] = nil
+		launch_session[handle] = nil
 	end
 
 	-- don't return (skynet.ret) because the handle may exit
@@ -77,10 +79,12 @@ end
 local function launch_service(service, ...)
 	local param = table.concat({...}, " ")
 	local inst = skynet.launch(service, param)
+	local session = skynet.context()
 	local response = skynet.response()
 	if inst then
 		services[inst] = service .. " " .. param
 		instance[inst] = response
+		launch_session[inst] = session
 	else
 		response(false)
 		return
@@ -107,6 +111,7 @@ function command.ERROR(address)
 	local response = instance[address]
 	if response then
 		response(false)
+		launch_session[address] = nil
 		instance[address] = nil
 	end
 	services[address] = nil
@@ -119,11 +124,20 @@ function command.LAUNCHOK(address)
 	if response then
 		response(true, address)
 		instance[address] = nil
+		launch_session[address] = nil
 	end
 
 	return NORET
 end
 
+function command.QUERY(_, request_session)
+	for address, session in pairs(launch_session) do
+		if session == request_session then
+			return address
+		end
+	end
+end
+
 -- for historical reasons, launcher support text command (for C service)
 
 skynet.register_protocol {

service/service_mgr.lua

@@ -42,12 +42,17 @@ local function waitfor(name , func, ...)
 
 	assert(type(s) == "table")
 
-	if not s.launch and func then
-		s.launch = true
+	local session, source = skynet.context()
+
+	if s.launch == nil and func then
+		s.launch = {
+			session = session,
+			source = source,
+			co = co,
+		}
 		return request(name, func, ...)
 	end
 
-	local session, source = skynet.context()
 	table.insert(s, {
 		co = co,
 		session = session,
@@ -96,9 +101,20 @@ local function list_service()
 		if type(v) == "string" then
 			v = "Error: " .. v
 		elseif type(v) == "table" then
-			local querying = { "Querying:" }
-			for _, detail in ipairs(v) do
-				table.insert(querying, skynet.address(detail.source) .. " " .. tostring(skynet.call(detail.source, "debug", "TASK", detail.session)))
+			local querying = {}
+			if v.launch then
+				local session = skynet.task(v.launch.co)
+				local launching_address = skynet.call(".launcher", "lua", "QUERY", session)
+				table.insert(querying, "Init as " .. skynet.address(launching_address))
+				table.insert(querying,  tostring(skynet.call(launching_address, "debug", "TASK", "init")))
+				table.insert(querying, "Launching from " .. skynet.address(v.launch.source))
+				table.insert(querying, tostring(skynet.call(v.launch.source, "debug", "TASK", v.launch.session)))
+			end
+			if #v > 0 then
+				table.insert(querying , "Querying:" )
+				for _, detail in ipairs(v) do
+					table.insert(querying, skynet.address(detail.source) .. " " .. tostring(skynet.call(detail.source, "debug", "TASK", detail.session)))
+				end
 			end
 			v = table.concat(querying, "\n")
 		else