修复一个崩溃问题

Author: CppCXY

emmy_debugger/include/emmy_debugger/debugger/emmy_debugger.h

@@ -129,6 +129,4 @@ class Debugger: public std::enable_shared_from_this<Debugger>
 
 	std::mutex evalMtx;
 	std::queue<std::shared_ptr<EvalContext>> evalQueue;
-
-	Arena<Variable> _variableArena;
 };

emmy_debugger/include/emmy_debugger/debugger/extension_point.h

@@ -8,12 +8,13 @@ class ExtensionPoint {
 public:
 	static std::string ExtensionTable;
 
+	static Arena<Variable> *Arena;
+
 	ExtensionPoint();
 
 	void Initialize(lua_State *L);
 	// 
 	bool QueryVariable(lua_State *L, Idx<Variable> variable, const char *typeName, int object, int depth);
 
 	lua_State *QueryParentThread(lua_State *L);
-
 };

emmy_debugger/include/emmy_debugger/proto/proto.h

@@ -152,11 +152,12 @@ class EvalContext : public JsonProtocol {
 	Idx<Variable> result;
 	bool success = false;
 	bool setValue = false;
-	std::shared_ptr<Arena<Variable>> variableArena;
 
 	nlohmann::json Serialize() override;
 
 	void Deserialize(nlohmann::json json) override;
+private:
+	Arena<Variable> _arena;
 };
 
 class EvalParams : public JsonProtocol {

emmy_debugger/include/emmy_debugger/util.h

@@ -11,5 +11,4 @@ struct CaseInsensitiveLess final {
 // 直到C++ 20才有endwith，这里自己写一个
 bool EndWith(const std::string &source, const std::string &end);
 
-std::string BaseName(const std::string &filePath);
 

emmy_debugger/src/debugger/emmy_debugger.cpp

@@ -789,7 +789,7 @@ void Debugger::SetHookState(std::shared_ptr<HookState> newState) {
 	}
 }
 
-EmmyDebuggerManager* Debugger::GetEmmyDebuggerManager() {
+EmmyDebuggerManager *Debugger::GetEmmyDebuggerManager() {
 	return manager;
 }
 
@@ -963,6 +963,18 @@ struct LogMessageReplaceExpress {
 	bool NeedEval;
 };
 
+std::string BaseName(const std::string &filePath) {
+	std::size_t sepIndex = filePath.find_last_of('/');
+	if (sepIndex == std::string::npos) {
+		sepIndex = filePath.find_last_of('\\');
+		if (sepIndex != std::string::npos) {
+			return filePath.substr(sepIndex + 1);
+		}
+		return filePath;
+	} else {
+		return filePath.substr(sepIndex + 1);
+	}
+}
 
 void Debugger::DoLogMessage(std::shared_ptr<BreakPoint> bp) {
 	std::string &logMessage = bp->logMessage;

emmy_debugger/src/debugger/extension_point.cpp

@@ -2,7 +2,7 @@
 #include "emmy_debugger/emmy_facade.h"
 
 std::string ExtensionPoint::ExtensionTable = "emmyHelper";
-
+Arena<Variable> *ExtensionPoint::Arena = nullptr;
 
 int metaQuery(lua_State *L) {
 	const int argN = lua_gettop(L);
@@ -79,20 +79,14 @@ void pushVariable(lua_State *L, Idx<Variable> variable) {
 	lua_setmetatable(L, -2);
 }
 
-void setArena(lua_State *L, Arena<Variable> *arena) {
-	lua_pushstring(L, "EMMY_ARENA");
-	lua_pushlightuserdata(L, arena);
-	lua_rawset(L, LUA_REGISTRYINDEX);
-}
-
 int createNode(lua_State *L) {
-	lua_pushstring(L, "EMMY_ARENA");
-	lua_rawget(L, LUA_REGISTRYINDEX);
-	auto arena = (Arena<Variable>*) lua_touserdata(L, -1);
-	lua_pop(L, 1);
-	auto idx = arena->Alloc();
-	pushVariable(L, idx);
-	return 1;
+	if (ExtensionPoint::Arena) {
+		auto idx = ExtensionPoint::Arena->Alloc();
+		pushVariable(L, idx);
+		return 1;
+	} else {
+		return 0;
+	}
 }
 
 ExtensionPoint::ExtensionPoint() {
@@ -137,6 +131,7 @@ bool ExtensionPoint::QueryVariable(lua_State *L, Idx<Variable> variable, const c
 	if (lua_istable(L, -1)) {
 		lua_getfield(L, -1, "queryVariable");
 		if (lua_isfunction(L, -1)) {
+			ExtensionPoint::Arena = variable.GetArena();
 			pushVariable(L, variable);
 			lua_pushvalue(L, object);
 			lua_pushstring(L, typeName);

emmy_debugger/src/proto/proto.cpp

@@ -174,9 +174,8 @@ void Stack::Deserialize(nlohmann::json json) {
 	JsonProtocol::Deserialize(json);
 }
 
-EvalContext::EvalContext()
-	: variableArena(std::make_shared<Arena<Variable>>()) {
-	result = variableArena->Alloc();
+EvalContext::EvalContext() {
+	result = _arena.Alloc();
 }
 
 nlohmann::json EvalContext::Serialize() {

emmy_debugger/src/util.cpp

@@ -49,16 +49,4 @@ bool EndWith(const std::string &source, const std::string &end) {
 	return strncmp(end.data(), source.data() + (sourceSize - endSize), endSize) == 0;
 }
 
-std::string BaseName(const std::string &filePath) {
-	std::size_t sepIndex = filePath.find_last_of('/');
-	if (sepIndex == std::string::npos) {
-		sepIndex = filePath.find_last_of('\\');
-		if (sepIndex != std::string::npos) {
-			return filePath.substr(sepIndex + 1);
-		}
-		return filePath;
-	} else {
-		return filePath.substr(sepIndex + 1);
-	}
-}