MickSlash
/
goldberg_emulator
mirror of https://gitlab.com/Mr_Goldberg/goldberg_emulator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Close background thread on steamclient shutdown.

merge-requests/28/head
Mr_Goldberg 2020-01-15 12:40:18 -05:00
parent 11cb3ce998
commit 81830efd58
No known key found for this signature in database
GPG Key ID: 8597D87419DEF278
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dll/steam_client.cpp
View File

@ -18,25 +18,25 @@
#include "steam_client.h" #include "steam_client.h"
#include "settings_parser.h" #include "settings_parser.h"
static bool kill_background_thread; #include <condition_variable>
static std::condition_variable kill_background_thread_cv;
static std::atomic_bool kill_background_thread;
static void background_thread(Steam_Client *client) static void background_thread(Steam_Client *client)
{ {
PRINT_DEBUG("background thread starting\n"); PRINT_DEBUG("background thread starting\n");
while (1) { std::mutex mtx;
std::this_thread::sleep_for(std::chrono::seconds(1)); std::unique_lock<std::mutex> lck(mtx);
global_mutex.lock();
bool net_alive = client->network->isAlive();
if (!net_alive || kill_background_thread) {
global_mutex.unlock();
if (!net_alive) {
//delete network;
}
kill_background_thread = false; while (1) {
if (kill_background_thread || kill_background_thread_cv.wait_for(lck, std::chrono::seconds(1)) != std::cv_status::timeout) {
if (kill_background_thread) {
PRINT_DEBUG("background thread exit\n"); PRINT_DEBUG("background thread exit\n");
return; return;
} }
}
global_mutex.lock();
PRINT_DEBUG("background thread run\n"); PRINT_DEBUG("background thread run\n");
client->network->Run(); client->network->Run();
client->steam_matchmaking->RunBackground(); client->steam_matchmaking->RunBackground();
@ -730,10 +730,20 @@ void Steam_Client::SetWarningMessageHook( SteamAPIWarningMessageHook_t pFunction
bool Steam_Client::BShutdownIfAllPipesClosed() bool Steam_Client::BShutdownIfAllPipesClosed()
{ {
PRINT_DEBUG("BShutdownIfAllPipesClosed\n"); PRINT_DEBUG("BShutdownIfAllPipesClosed\n");
if (!steam_pipes.size()) {
if (background_keepalive.joinable()) {
kill_background_thread = true; kill_background_thread = true;
kill_background_thread_cv.notify_one();
background_keepalive.join();
}
PRINT_DEBUG("all pipes closed\n");
return true; return true;
} }
return false;
}
// Expose HTTP interface // Expose HTTP interface
ISteamHTTP *Steam_Client::GetISteamHTTP( HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char *pchVersion ) ISteamHTTP *Steam_Client::GetISteamHTTP( HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char *pchVersion )
{ {