mirror/goldberg_emulator
1
0
Fork 0
mirror of https://gitlab.com/Mr_Goldberg/goldberg_emulator.git synced 2024-11-09 22:28:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

Switch to atomic_bool for thread synchronisation.

Browse source
This commit is contained in:
Nemirtingas 2019-07-14 20:51:23 +02:00
parent 5c66c21f53
commit 573a01212b
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dll/item_db_loader.cpp
View file

@ -17,9 +17,9 @@
#include "item_db_loader.h"
#include <fstream>
#include "json.hpp"
#include "../json/json.hpp"
void read_items_db(std::string items_db, std::map<SteamItemDef_t, std::map<std::string, std::string>> *items, bool *is_loadedb)
void read_items_db(std::string items_db, std::map<SteamItemDef_t, std::map<std::string, std::string>> *items, std::atomic_bool *is_loadedb)
{
std::ifstream items_file(items_db);
// If there is a file and we opened it

3
dll/item_db_loader.h
View file

@ -18,6 +18,7 @@
#include "base.h" // For SteamItemDef_t
void read_items_db(std::string items_db, std::map<SteamItemDef_t, std::map<std::string, std::string>> *items, bool *is_loaded);
#include <atomic>
void read_items_db(std::string items_db, std::map<SteamItemDef_t, std::map<std::string, std::string>> *items, std::atomic_bool *is_loaded);
#endif//__ITEM_DB_LOADER_INCLUDED__

5
dll/steam_inventory.h
View file

@ -16,6 +16,7 @@
<http://www.gnu.org/licenses/>. */
#include "item_db_loader.h"
#include <thread>
struct Steam_Inventory_Requests {
double timeout = 0.1;
@ -57,7 +58,7 @@ class Steam_Inventory :
// Or find a server somewhere to hold the data for us then cache on local settings.
bool need_load_definitions = true;
bool items_loaded = false;
std::atomic_bool items_loaded = false;
struct Steam_Inventory_Requests* new_inventory_result(const SteamItemInstanceID_t* pInstanceIDs = NULL, uint32 unCountInstanceIDs = 0)
{
@ -90,7 +91,7 @@ public:
Steam_Inventory(class Settings *settings, class SteamCallResults *callback_results, class SteamCallBacks *callbacks)
{
std::thread items_load_thread(read_items_db, Local_Storage::get_program_path() + PATH_SEPARATOR + "steam_items.json", &items, &items_loaded);
std::thread items_load_thread(read_items_db, Local_Storage::get_game_settings_path() + PATH_SEPARATOR + "items.json", &items, &items_loaded);
items_load_thread.detach();
this->settings = settings;