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

First working console

Browse Source
This commit is contained in:
Lion Kortlepel
2021-09-16 03:40:24 +02:00
parent ba0678dade
commit 2cf368c2b0
5 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/TConsole.cpp
View File

@@ -57,8 +57,16 @@ TConsole::TConsole() {
Application::GracefullyShutdown();
} else if (cmd == "clear" || cmd == "cls") {
// TODO: clear screen
mLuaEngine.EnqueueScript(mStateId, std::make_shared<std::string>(cmd));
} else {
while (!mLuaEngine) {
std::this_thread::sleep_for(std::chrono::milliseconds(10));
}
auto Future = mLuaEngine->EnqueueScript(mStateId, std::make_shared<std::string>(cmd));
// wait for it to finish
while (!Future->Ready) {
std::this_thread::sleep_for(std::chrono::milliseconds(10));
}
mCommandline.write("Result ready.");
}
};
}
@@ -75,4 +83,5 @@ void TConsole::WriteRaw(const std::string& str) {
void TConsole::InitializeLuaConsole(TLuaEngine& Engine) {
Engine.EnsureStateExists(mStateId, "<>");
mLuaEngine = &Engine;
}

21
src/TLuaEngine.cpp
View File

@@ -41,9 +41,11 @@ void TLuaEngine::operator()() {
}
}
void TLuaEngine::EnqueueScript(TLuaStateId StateID, const std::shared_ptr<std::string>& Script) {
std::shared_ptr<TLuaResult> TLuaEngine::EnqueueScript(TLuaStateId StateID, const std::shared_ptr<std::string>& Script) {
std::unique_lock Lock(mLuaStatesMutex);
mLuaStates.at(StateID)->EnqueueScript(Script);
TLuaResult Result;
beammp_debug("enqueuing script into \"" + StateID + "\"");
return mLuaStates.at(StateID)->EnqueueScript(Script);
}
void TLuaEngine::CollectPlugins() {
@@ -102,18 +104,21 @@ void TLuaEngine::EnsureStateExists(TLuaStateId StateId, const std::string& Name)
TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, std::atomic_bool& Shutdown)
: mName(Name)
, mShutdown(Shutdown) {
mState.open_libraries(sol::lib::base);
mState = luaL_newstate();
luaL_openlibs(mState);
Start();
}
void TLuaEngine::StateThreadData::EnqueueScript(const std::shared_ptr<std::string>& Script) {
std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueScript(const std::shared_ptr<std::string>& Script) {
beammp_debug("enqueuing script into \"" + mName + "\"");
std::unique_lock Lock(mStateExecuteQueueMutex);
mStateExecuteQueue.push(Script);
auto Result = std::make_shared<TLuaResult>();
mStateExecuteQueue.push({ Script, Result });
return Result;
}
void TLuaEngine::StateThreadData::operator()() {
RegisterThreadAuto();
RegisterThread(mName);
while (!mShutdown) {
std::unique_lock Lock(mStateExecuteQueueMutex);
if (mStateExecuteQueue.empty()) {
@@ -123,7 +128,9 @@ void TLuaEngine::StateThreadData::operator()() {
auto S = mStateExecuteQueue.front();
mStateExecuteQueue.pop();
Lock.unlock();
mState.do_string(*S);
beammp_debug("Running script");
luaL_dostring(mState, S.first->data());
S.second->Ready = true;
}
}
}

2
src/main.cpp
View File

@@ -66,7 +66,7 @@ int main(int argc, char** argv) {
TNetwork Network(Server, PPSMonitor, ResourceManager);
TLuaEngine LuaEngine(Server, Network);
PPSMonitor.SetNetwork(Network);
// BROKEN Application::Console().InitializeLuaConsole(LuaEngine);
Application::Console().InitializeLuaConsole(LuaEngine);
// TODO: replace
while (!Shutdown) {