Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-13 00:31:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Protect access to options container

Browse Source
This commit is contained in:
Alexey Rybalchenko 2021-07-30 15:52:56 +02:00 committed by Dennis Klein
parent 479d6e0712
commit db0500fb2d
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fairmq/ProgOptions.cxx
View File

@ -93,6 +93,7 @@ void ProgOptions::ParseDefaults()
return str.c_str();
});
std::lock_guard<std::mutex> lock(fMtx);
po::store(po::parse_command_line(argv.size(), const_cast<char**>(argv.data()), fAllOptions), fVarMap);
}
@ -390,6 +391,8 @@ void ProgOptions::PrintOptions() const
int maxLenType = 0;
int maxLenDefault = 0;
std::lock_guard<std::mutex> lock(fMtx);
for (const auto& m : fVarMap) {
maxLenKey = max(maxLenKey, static_cast<int>(m.first.length()));
@ -427,6 +430,8 @@ void ProgOptions::PrintOptions() const
void ProgOptions::PrintOptionsRaw() const
{
std::lock_guard<std::mutex> lock(fMtx);
const vector<boost::shared_ptr<po::option_description>>& options = fAllOptions.options();
for (const auto& o : options) {

6
fairmq/ProgOptions.h
View File

@ -226,7 +226,11 @@ class ProgOptions
void PrintOptionsRaw() const;
/// @brief returns the property container
const boost::program_options::variables_map& GetVarMap() const { return fVarMap; }
const boost::program_options::variables_map& GetVarMap() const
{
std::lock_guard<std::mutex> lock(fMtx);
return fVarMap;
}
/// @brief Read config property, return default-constructed object if key doesn't exist
/// @param key