BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2026-06-17 22:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

TLuaFile: Remove RegisterThread calls since it overrides thread names

Browse Source 
This is due to the horrible design of TLuaFile. Everything may be called
at any time from any thread. FIXME.
This commit is contained in:
Lion Kortlepel
2021-08-15 04:43:11 +02:00
committed by Lion
parent 8ec90d5186
commit 0143748953
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/TLuaFile.cpp
+1 -3
View File
@@ -2,6 +2,7 @@
#include "Client.h" #include "Client.h"
#include "Common.h" #include "Common.h"
#include "CustomAssert.h" #include "CustomAssert.h"
#include "Defer.h"
#include "TLuaEngine.h" #include "TLuaEngine.h"
#include "TNetwork.h" #include "TNetwork.h"
#include "TServer.h" #include "TServer.h"
@@ -44,7 +45,6 @@ void ClearStack(lua_State* L) {
} }
std::any Trigger(TLuaFile* lua, const std::string& R, std::shared_ptr<TLuaArg> arg) { std::any Trigger(TLuaFile* lua, const std::string& R, std::shared_ptr<TLuaArg> arg) {
RegisterThread(lua->GetFileName());
std::lock_guard<std::mutex> lockGuard(lua->Lock); std::lock_guard<std::mutex> lockGuard(lua->Lock);
std::packaged_task<std::any(std::shared_ptr<TLuaArg>)> task([lua, R](std::shared_ptr<TLuaArg> arg) { return CallFunction(lua, R, arg); }); std::packaged_task<std::any(std::shared_ptr<TLuaArg>)> task([lua, R](std::shared_ptr<TLuaArg> arg) { return CallFunction(lua, R, arg); });
std::future<std::any> f1 = task.get_future(); std::future<std::any> f1 = task.get_future();
@@ -198,7 +198,6 @@ void ExecuteAsync(TLuaFile* lua, const std::string& FuncName) {
} }
void CallAsync(TLuaFile* lua, const std::string& Func, int U) { void CallAsync(TLuaFile* lua, const std::string& Func, int U) {
RegisterThread(lua->GetFileName());
lua->SetStopThread(false); lua->SetStopThread(false);
int D = 1000 / U; int D = 1000 / U;
while (!lua->GetStopThread()) { while (!lua->GetStopThread()) {
@@ -671,7 +670,6 @@ std::string TLuaFile::GetOrigin() {
} }
std::any CallFunction(TLuaFile* lua, const std::string& FuncName, std::shared_ptr<TLuaArg> Arg) { std::any CallFunction(TLuaFile* lua, const std::string& FuncName, std::shared_ptr<TLuaArg> Arg) {
RegisterThread(lua->GetFileName());
lua_State* luaState = lua->GetState(); lua_State* luaState = lua->GetState();
lua_getglobal(luaState, FuncName.c_str()); lua_getglobal(luaState, FuncName.c_str());
if (lua_isfunction(luaState, -1)) { if (lua_isfunction(luaState, -1)) {