talezero/integration
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Worker thread is now operational

Browse Source
This commit is contained in:
teppy999
2023-06-23 12:45:23 -04:00
parent 9a85092afb
commit 42f3e02ec2
2 changed files with 109 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

145
Source/Integration/IntegrationGameModeBase.cpp
View File

@@ -3,7 +3,6 @@
#include "IntegrationGameModeBase.h"
#include "drvutil.hpp"
#include "engineutil.hpp"
#include "WorkerRunnable.hpp"
#include <string>
#include <string_view>
@@ -26,19 +25,24 @@ AIntegrationGameModeBase::AIntegrationGameModeBase()
{
Thread = nullptr;
ThreadStopRequested = false;
EngineSeconds = 0.0;
NextThreadTrigger = 1.0;
//PrimaryActorTick.bCanEverTick = true; // Probably wrong
//PrimaryActorTick.bTickEvenWhenPaused = true; // Probably wrong
//PrimaryActorTick.TickGroup = TG_PrePhysics; // Probably wrong
SetActorTickEnabled(true);
SetActorTickInterval(1.0f);
SetActorTickInterval(0.05f);
ThreadEvent = FPlatformProcess::GetSynchEventFromPool(false);
}
AIntegrationGameModeBase::~AIntegrationGameModeBase()
{
WaitForThread();
FPlatformProcess::ReturnSynchEventToPool(ThreadEvent);
ThreadEvent = nullptr;
}
void AIntegrationGameModeBase::HandleConsoleOutput()
void AIntegrationGameModeBase::HandleLuprexConsoleOutput()
{
uint32_t ndata; const char* data;
Luprex.get_outgoing(&Luprex, 0, &ndata, &data);
@@ -51,43 +55,35 @@ void AIntegrationGameModeBase::HandleConsoleOutput()
ConsoleOutput.Append(fs);
}
void AIntegrationGameModeBase::LaunchThread()
{
if (Thread == nullptr) {
ThreadStopRequested = false;
Thread = FRunnableThread::Create(this, TEXT("Worker Thread"));
}
}
// Init routine called by the worker thread.
bool AIntegrationGameModeBase::Init()
{
engineutil::DPrint("WorkerRunnable::Init");
return true;
}
// Run routine called by the worker thread.
uint32 AIntegrationGameModeBase::Run()
{
while (!ThreadStopRequested)
while (true)
{
engineutil::DPrint("WorkerRunnable::Run");
FPlatformProcess::Sleep(1.0);
bool triggered = ThreadEvent->Wait(3000);
if (ThreadStopRequested) {
engineutil::DPrint("Thread stopping as requested");
break;
}
if (!triggered) {
engineutil::DPrint("Thread waiting a long time...");
continue;
}
engineutil::DPrint("Thread triggered.");
{
FScopeLock lk(&LuprexMutex);
Luprex.play_invoke_event_update(&Luprex, EngineSeconds);
}
}
engineutil::DPrint("WorkerRunnable Done");
return 0;
}
void AIntegrationGameModeBase::Stop()
{
ThreadStopRequested = true;
}
#pragma optimize( "", off )
void AIntegrationGameModeBase::WaitForThread()
{
if (Thread == nullptr) return;
Stop(); // Notifies the thread to clean up and exit.
ThreadStopRequested = true;
ThreadEvent->Trigger();
delete Thread; // This waits for the thread to complete.
Thread = nullptr;
}
@@ -95,29 +91,35 @@ void AIntegrationGameModeBase::WaitForThread()
void AIntegrationGameModeBase::Tick(float DeltaSeconds)
{
Super::Tick(DeltaSeconds);
if (!luprex_initialized()) {
return;
}
HandleConsoleOutput();
if (Luprex.engine) {
{
FScopeLock lk(&LuprexMutex);
EngineSeconds += DeltaSeconds;
Luprex.play_invoke_event_update(&Luprex, EngineSeconds);
HandleLuprexConsoleOutput();
}
TArray<FString> prints = engineutil::DPrintGetStored();
for (const FString& fs : prints) {
ConsoleOutput.AppendLine(fs);
}
if (ConsoleOutput.IsDirty()) {
if (ConsoleOutput.IsDirty())
{
ConsoleSetOutput(ConsoleOutput.Get());
ConsoleOutput.ClearDirty();
}
if ((Thread != nullptr) && (EngineSeconds >= NextThreadTrigger))
{
ThreadEvent->Trigger();
NextThreadTrigger += 1.0;
}
}
void AIntegrationGameModeBase::ConsoleSendInput(const FString& fs)
{
if (Luprex.engine) {
if (Luprex.engine != nullptr)
{
FScopeLock lk(&LuprexMutex);
const TCHAR* fstchar = *fs;
if (sizeof(TCHAR) == 2) {
if (sizeof(TCHAR) == 2)
{
ConsoleOutput.AppendLine(FString("> ") + fs);
std::u16string_view fsview((const char16_t*)fstchar, fs.Len());
std::string utf8 = drvutil::utf16_to_utf8(fsview);
@@ -129,39 +131,62 @@ void AIntegrationGameModeBase::ConsoleSendInput(const FString& fs)
void AIntegrationGameModeBase::BeginPlay()
{
engineutil::DPrint("In BeginPlay");
Super::BeginPlay();
if (!luprex_initialized()) {
// There should be no thread at this point.
checkf(Thread == nullptr, TEXT("There should be no thread here."));
// Reinitialize simple state.
EngineSeconds = 0;
NextThreadTrigger = 1.0;
ThreadStopRequested = false;
ThreadEvent->Wait(0); // Clear the event if set.
// Try to initialize the wrapper.
if (Luprex.play_initialize == nullptr)
{
engineutil::init_wrapper(&Luprex);
if (!luprex_initialized()) {
if (Luprex.play_initialize == nullptr)
{
engineutil::DPrint("Luprex wrapper initialization failed");
return;
}
}
Luprex.release(&Luprex);
Luprex.hook_dprint(engineutil::DPrintHook);
drvutil::ostringstream srcpak;
std::string srcpakerr = drvutil::package_lua_source("c:\\Luprex", &srcpak);
if (!srcpakerr.empty()) {
engineutil::DPrint(srcpakerr.c_str());
// If wrapper is initialized, try to initialize the luprex engine.
if (Luprex.play_initialize != nullptr)
{
Luprex.release(&Luprex);
Luprex.hook_dprint(engineutil::DPrintHook);
drvutil::ostringstream srcpak;
std::string srcpakerr = drvutil::package_lua_source("c:\\Luprex", &srcpak);
if (!srcpakerr.empty())
{
engineutil::DPrint(srcpakerr.c_str());
}
std::string_view srcpakv = srcpak.view();
char* argv[1];
argv[0] = const_cast<char*>("lpxserver");
Luprex.play_initialize(&Luprex, 1, argv, srcpakv.size(), srcpakv.data(), "");
if (Luprex.error[0])
{
engineutil::DPrint(Luprex.error);
}
else
{
engineutil::DPrint("Luprex initialize success");
}
}
std::string_view srcpakv = srcpak.view();
char* argv[1];
argv[0] = const_cast<char*>("lpxserver");
Luprex.play_initialize(&Luprex, 1, argv, srcpakv.size(), srcpakv.data(), "");
if (Luprex.error[0]) {
ConsoleOutput.AppendLine(FString(Luprex.error));
} else {
ConsoleOutput.AppendLine(FString("Initialize Luprex Success"));
// If we successfully created a Luprex engine, create a worker thread.
if (Luprex.engine != nullptr)
{
Thread = FRunnableThread::Create(this, TEXT("Worker Thread"));
}
EngineSeconds = 0;
LaunchThread();
}
void AIntegrationGameModeBase::EndPlay(const EEndPlayReason::Type EndPlayReason) {
engineutil::DPrint("In EndPlay");
void AIntegrationGameModeBase::EndPlay(const EEndPlayReason::Type EndPlayReason)
{
WaitForThread();
}