SantaSpeen/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/SantaSpeen/BeamMP-Server.git synced 2026-04-24 04:36:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix lua thread never exiting

Browse Source
This commit is contained in:
Lion Kortlepel
2021-02-17 01:12:19 +01:00
committed by Anonymous275
parent aec6ad9c14
commit 8cd35d64e4
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/TLuaEngine.h
View File

@@ -34,6 +34,8 @@ private:
TTCPServer& mTCPServer; TTCPServer& mTCPServer;
TUDPServer& mUDPServer; TUDPServer& mUDPServer;
TServer& mServer; TServer& mServer;
std::string mPath;
bool mShutdown { false };
TSetOfLuaFile mLuaFiles; TSetOfLuaFile mLuaFiles;
}; };

25
src/TLuaEngine.cpp
View File

@@ -2,6 +2,7 @@
#include "TLuaFile.h" #include "TLuaFile.h"
#include <filesystem> #include <filesystem>
#include <sys/stat.h>
namespace fs = std::filesystem; namespace fs = std::filesystem;
@@ -17,12 +18,34 @@ TLuaEngine::TLuaEngine(TServer& Server, TTCPServer& TCPServer, TUDPServer& UDPSe
fs::create_directory(Path); fs::create_directory(Path);
} }
FolderList(Path, false); FolderList(Path, false);
mPath = Path;
Application::RegisterShutdownHandler([&] { mShutdown = true; });
Start(); Start();
} }
void TLuaEngine::operator()() { void TLuaEngine::operator()() {
info("Lua system online"); info("Lua system online");
// thread main while (!mShutdown) {
if (!mLuaFiles.empty()) {
for (auto& Script : mLuaFiles) {
struct stat Info { };
if (stat(Script->GetFileName().c_str(), &Info) != 0) {
Script->SetStopThread(true);
mLuaFiles.erase(Script);
info(("[HOTSWAP] Removed removed script due to delete"));
break;
}
if (Script->GetLastWrite() != fs::last_write_time(Script->GetFileName())) {
Script->SetStopThread(true);
info(("[HOTSWAP] Updated Scripts due to edit"));
Script->SetLastWrite(fs::last_write_time(Script->GetFileName()));
Script->Reload();
}
}
}
FolderList(mPath, true);
std::this_thread::sleep_for(std::chrono::seconds(2));
}
} }
std::optional<std::reference_wrapper<TLuaFile>> TLuaEngine::GetScript(lua_State* L) { std::optional<std::reference_wrapper<TLuaFile>> TLuaEngine::GetScript(lua_State* L) {