Merge pull request #41 from Jayatubi/master

show local variables of parent threads

Author: CppCXY

emmy_debugger/src/emmy_debugger.cpp

@@ -105,7 +105,7 @@ void Debugger::Hook(lua_Debug* ar, lua_State* L)
 		return;
 	}
 	// 设置当前协程
-	currentL = L;
+	SetCurrentState(L);
 
 	if (getDebugEvent(ar) == LUA_HOOKLINE)
 	{
@@ -180,15 +180,39 @@ bool Debugger::IsMainCoroutine(lua_State* L) const
 	return L == mainL;
 }
 
+lua_State* Debugger::queryParentThread(lua_State* L)
+{
+    lua_State* PL;
+    const int t = lua_gettop(L);
+    lua_getglobal(L, "emmyHelper");
+    if (lua_istable(L, -1))
+    {
+        lua_getfield(L, -1, "queryParentThread");
+        if (lua_isfunction(L, -1))
+        {
+            const auto r = lua_pcall(L, 0, 1, 0);
+            if (r == LUA_OK)
+            {
+                PL = lua_tothread(L, -1);
+            }
+        }
+    }
+    lua_settop(L, t);
+
+	return PL;
+}
+
 bool Debugger::GetStacks(std::vector<std::shared_ptr<Stack>>& stacks, StackAllocatorCB alloc)
 {
 	if (!currentL)
 	{
 		return false;
 	}
 
+	auto prevCurrentL = currentL;
 	auto L = currentL;
 
+	int totalLevel = 0;
 	while(true)
 	{
 	    int level = 0;
@@ -206,7 +230,7 @@ bool Debugger::GetStacks(std::vector<std::shared_ptr<Stack>>& stacks, StackAlloc
 		    auto stack = alloc();
 		    stack->file = GetFile(&ar);
 		    stack->functionName = getDebugName(&ar) == nullptr ? "" : getDebugName(&ar);
-		    stack->level = level;
+		    stack->level = totalLevel++;
 		    stack->line = getDebugCurrentLine(&ar);
 		    stacks.push_back(stack);
 		    // get variables
@@ -258,22 +282,7 @@ bool Debugger::GetStacks(std::vector<std::shared_ptr<Stack>>& stacks, StackAlloc
 		    level++;
 	    }
 
-		lua_State* PL = nullptr;
-		const int t = lua_gettop(L);
-		lua_getglobal(L, "emmyHelper");
-		if (lua_istable(L, -1))
-		{
-			lua_getfield(L, -1, "queryParentThread");
-			if (lua_isfunction(L, -1))
-			{
-				const auto r = lua_pcall(L, 0, 1, 0);
-				if (r == LUA_OK)
-				{
-					PL = lua_tothread(L, -1);
-				}
-			}
-		}
-		lua_settop(L, t);
+		lua_State* PL = queryParentThread(L);
 
 		if (PL != nullptr)
 		{
@@ -284,6 +293,9 @@ bool Debugger::GetStacks(std::vector<std::shared_ptr<Stack>>& stacks, StackAlloc
 			break;
 		}
 	}
+
+	SetCurrentState(prevCurrentL);
+
 	return false;
 }
 
@@ -838,15 +850,13 @@ int EnvIndexFunction(lua_State* L)
 	return 0;
 }
 
-bool Debugger::CreateEnv(int stackLevel)
+bool Debugger::CreateEnv(lua_State* L, int stackLevel)
 {
-	if (!currentL)
+	if (!L)
 	{
 		return false;
 	}
 
-	auto L = currentL;
-
 
 	//assert(L);
 	//const auto L = L;
@@ -1035,6 +1045,19 @@ bool Debugger::Eval(std::shared_ptr<EvalContext> evalContext, bool force)
 	return true;
 }
 
+int lastlevel(lua_State* L)
+{
+	int level = 0;
+
+	lua_Debug ar;
+	while(lua_getstack(L, level, &ar))
+	{
+		level++;
+	}
+
+	return level;
+}
+
 // host thread
 bool Debugger::DoEval(std::shared_ptr<EvalContext> evalContext)
 {
@@ -1045,6 +1068,27 @@ bool Debugger::DoEval(std::shared_ptr<EvalContext> evalContext)
 
 	auto L = currentL;
 
+	int innerLevel = evalContext->stackLevel;
+
+	while (L != nullptr)
+	{
+		int level = lastlevel(L);
+		if (innerLevel > level)
+		{
+			innerLevel -= level;
+			L = queryParentThread(L);
+		}
+		else
+		{
+			break;
+		}
+	}
+
+	if (L == nullptr)
+	{
+		return false;
+	}
+
 	//auto* const L = L;
 	// From "cacheId"
 	if (evalContext->cacheId > 0)
@@ -1075,7 +1119,7 @@ bool Debugger::DoEval(std::shared_ptr<EvalContext> evalContext)
 	// call
 	const int fIdx = lua_gettop(L);
 	// create env
-	if (!CreateEnv(evalContext->stackLevel))
+	if (!CreateEnv(L, innerLevel))
 		return false;
 	// setup env
 #ifndef EMMY_USE_LUA_SOURCE

include/emmy_debugger/emmy_debugger.h

@@ -63,7 +63,8 @@ class Debugger : public std::enable_shared_from_this<Debugger>
 	 * 判断当前使用的lua_state 是否是main state
 	 */
 	bool IsMainCoroutine(lua_State* L) const;
-	/*
+    lua_State* queryParentThread(lua_State* L);
+    /*
 	 * 推迟到lua线程执行
 	 */
 	void AsyncDoString(const std::string& code);
@@ -94,7 +95,7 @@ class Debugger : public std::enable_shared_from_this<Debugger>
 	std::string GetFile(lua_Debug* ar) const;
 
 	void CheckDoString();
-	bool CreateEnv(int stackLevel);
+	bool CreateEnv(lua_State* L, int stackLevel);
 	bool ProcessBreakPoint(std::shared_ptr<BreakPoint> bp);
 	bool DoEval(std::shared_ptr<EvalContext> evalContext);
 	void DoLogMessage(std::shared_ptr<BreakPoint> bp);