Skip to content

Commit 1e94fc1

Browse files
committed
Revert "feat: Added a toggle enableDisplayCustomTypeInfo aimed at further enhancing performance."
This reverts commit 7ca4b51.
1 parent 8f1d78d commit 1e94fc1

File tree

7 files changed

+2
-35
lines changed

7 files changed

+2
-35
lines changed

emmy_core/src/emmy_core.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ static const luaL_Reg lib[] = {
3131
{"breakHere", breakHere},
3232
{"stop", stop},
3333
{"tcpSharedListen", tcpSharedListen},
34-
{"enableDisplayCustomTypeInfo", enableDisplayCustomTypeInfo},
3534
{"registerTypeName", registerTypeName},
3635
{nullptr, nullptr}
3736
};

emmy_debugger/include/emmy_debugger/debugger/emmy_debugger.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ class Debugger: public std::enable_shared_from_this<Debugger>
9595

9696
void ClearVariableArenaRef();
9797

98-
void enableDisplayCustomTypeInfo();
9998
bool RegisterTypeName(const std::string& typeName, std::string& err);
10099

101100
private:
@@ -144,6 +143,5 @@ class Debugger: public std::enable_shared_from_this<Debugger>
144143

145144
Arena<Variable> *arenaRef;
146145

147-
bool displayCustomTypeInfo;
148146
std::bitset<LUA_NUMTAGS> registeredTypes;
149147
};

emmy_debugger/include/emmy_debugger/debugger/emmy_debugger_lib.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ int tcpSharedListen(lua_State* L);
2828
// emmy.stop()
2929
int stop(lua_State* L);
3030

31-
// emmy.enableDisplayCustomTypeInfo(): bool
32-
int enableDisplayCustomTypeInfo(lua_State* L);
33-
3431
// emmy.registerTypeName(typeName: string): bool
3532
int registerTypeName(lua_State* L);
3633

emmy_debugger/include/emmy_debugger/emmy_facade.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ class EmmyFacade
5858
bool PipeListen(lua_State* L, const std::string& name, std::string& err);
5959
bool PipeConnect(lua_State* L, const std::string& name, std::string& err);
6060
int BreakHere(lua_State* L);
61-
bool enableDisplayCustomTypeInfo(lua_State *L, std::string &err);
6261
bool RegisterTypeName(lua_State *L, const std::string &typeName, std::string &err);
6362

6463
int OnConnect(bool suc);

emmy_debugger/src/debugger/emmy_debugger.cpp

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ Debugger::Debugger(lua_State *L, EmmyDebuggerManager *manager)
4141
running(false),
4242
skipHook(false),
4343
blocking(false),
44-
arenaRef(nullptr),
45-
displayCustomTypeInfo(false) {
44+
arenaRef(nullptr) {
4645
}
4746

4847
Debugger::~Debugger() {
@@ -372,7 +371,7 @@ void Debugger::GetVariable(lua_State *L, Idx<Variable> variable, int index, int
372371
variable->valueType = type;
373372

374373
if (queryHelper) {
375-
if (displayCustomTypeInfo && type >= 0 && type < registeredTypes.size() && registeredTypes.test(type)
374+
if (type >= 0 && type < registeredTypes.size() && registeredTypes.test(type)
376375
&& manager->extension.QueryVariableCustom(L, variable, typeName, index, depth)) {
377376
return;
378377
}
@@ -1443,10 +1442,6 @@ int Debugger::GetTypeFromName(const char* typeName) {
14431442
return -1; // 未知类型
14441443
}
14451444

1446-
void Debugger::enableDisplayCustomTypeInfo() {
1447-
displayCustomTypeInfo = true;
1448-
}
1449-
14501445
bool Debugger::RegisterTypeName(const std::string& typeName, std::string& err) {
14511446
int type = GetTypeFromName(typeName.c_str());
14521447
if (type == -1) {

emmy_debugger/src/debugger/emmy_debugger_lib.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -117,17 +117,6 @@ int stop(lua_State* L)
117117
return 0;
118118
}
119119

120-
// emmy.enableDisplayCustomTypeInfo(): bool
121-
int enableDisplayCustomTypeInfo(lua_State* L)
122-
{
123-
std::string err;
124-
const auto suc = EmmyFacade::Get().enableDisplayCustomTypeInfo(L, err);
125-
lua_pushboolean(L, suc);
126-
if (suc) return 1;
127-
lua_pushstring(L, err.c_str());
128-
return 2;
129-
}
130-
131120
// emmy.registerTypeName(typeName: string): bool
132121
int registerTypeName(lua_State* L)
133122
{

emmy_debugger/src/emmy_facade.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -397,16 +397,6 @@ void EmmyFacade::Attach(lua_State *L) {
397397
lua_sethook(L, EmmyFacade::HookLua, LUA_MASKCALL | LUA_MASKLINE | LUA_MASKRET, 0);
398398
}
399399

400-
bool EmmyFacade::enableDisplayCustomTypeInfo(lua_State *L, std::string &err) {
401-
auto debugger = GetDebugger(L);
402-
if (!debugger) {
403-
err = "Debugger does not exist";
404-
return false;
405-
}
406-
debugger->enableDisplayCustomTypeInfo();
407-
return true;
408-
}
409-
410400
bool EmmyFacade::RegisterTypeName(lua_State *L, const std::string &typeName, std::string &err) {
411401
auto debugger = GetDebugger(L);
412402
if (!debugger) {

0 commit comments

Comments
 (0)