pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-14 15:41:30 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Process Management] Change all executables to use the default event loop run (#2471)

Browse Source 
* Loginserver change to event loop run.

* eqlaunch, loginserver, queryserv, world
This commit is contained in:
Alex 2022-10-10 20:55:39 -07:00 committed by GitHub
parent 832bffa811
commit 77c3841a49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 56 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
eqlaunch/eqlaunch.cpp
View File

@ -105,11 +105,17 @@ int main(int argc, char *argv[]) {
Log(Logs::Detail, Logs::Launcher, "Starting main loop...");
ProcLauncher *launch = ProcLauncher::get();
RunLoops = true;
while(RunLoops) {
auto loop_fn = [&](EQ::Timer* t) {
//Advance the timer to our current point in time
Timer::SetCurrentTime();
if (!RunLoops) {
EQ::EventLoop::Get().Shutdown();
return;
}
/*
* Let the process manager look for dead children
*/
@ -139,10 +145,12 @@ int main(int argc, char *argv[]) {
delete zone->second;
zones.erase(rem);
}
};
EQ::EventLoop::Get().Process();
Sleep(5);
}
EQ::Timer process_timer(loop_fn);
process_timer.Start(32, true);
EQ::EventLoop::Get().Run();
//try to be semi-nice about this... without waiting too long
zone = zones.begin();

16
loginserver/main.cpp
View File

@ -289,14 +289,22 @@ int main(int argc, char **argv)
LogInfo("[Config] [Security] IsPasswordLoginAllowed [{0}]", server.options.IsPasswordLoginAllowed());
LogInfo("[Config] [Security] IsUpdatingInsecurePasswords [{0}]", server.options.IsUpdatingInsecurePasswords());
while (run_server) {
auto loop_fn = [&](EQ::Timer* t) {
Timer::SetCurrentTime();
server.client_manager->Process();
EQ::EventLoop::Get().Process();
Sleep(5);
if (!run_server) {
EQ::EventLoop::Get().Shutdown();
return;
}
server.client_manager->Process();
};
EQ::Timer process_timer(loop_fn);
process_timer.Start(32, true);
EQ::EventLoop::Get().Run();
LogInfo("Server Shutdown");
LogInfo("Client Manager Shutdown");

17
queryserv/queryserv.cpp
View File

@ -104,15 +104,24 @@ int main()
/* Load Looking For Guild Manager */
lfguildmanager.LoadDatabase();
while (RunLoops) {
auto loop_fn = [&](EQ::Timer* t) {
Timer::SetCurrentTime();
if (!RunLoops) {
EQ::EventLoop::Get().Shutdown();
return;
}
if (LFGuildExpireTimer.Check()) {
lfguildmanager.ExpireEntries();
}
};
EQ::Timer process_timer(loop_fn);
process_timer.Start(32, true);
EQ::EventLoop::Get().Run();
EQ::EventLoop::Get().Process();
Sleep(5);
}
LogSys.CloseFileLogs();
}

17
world/main.cpp
View File

@ -371,8 +371,14 @@ int main(int argc, char **argv)
}
);
while (RunLoops) {
auto loop_fn = [&](EQ::Timer* t) {
Timer::SetCurrentTime();
if (!RunLoops) {
EQ::EventLoop::Get().Shutdown();
return;
}
eqs = nullptr;
//give the stream identifier a chance to do its work....
@ -447,10 +453,13 @@ int main(int argc, char **argv)
);
UpdateWindowTitle(window_title);
}
};
EQ::Timer process_timer(loop_fn);
process_timer.Start(32, true);
EQ::EventLoop::Get().Run();
EQ::EventLoop::Get().Process();
Sleep(5);
}
LogInfo("World main loop completed");
LogInfo("Shutting down zone connections (if any)");
zoneserver_list.KillAll();