database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-06-13 16:01:32 +03:00
Code Activity

Revert "No boost condition (#2822)" (#2828)

Browse Source 
This reverts commit f916e64927.
This commit is contained in:
Roman Nozdrin
2023-04-22 13:49:50 +01:00
committed by GitHub
parent f916e64927
commit 4fe9cd64a3
245 changed files with 2007 additions and 1261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
utils/configcpp/configcpp.cpp
View File

@ -69,12 +69,12 @@ const fs::path defaultConfigFilePath(configDefaultFileName);
namespace config
{
std::mutex Config::fInstanceMapMutex;
boost::mutex Config::fInstanceMapMutex;
Config::configMap_t Config::fInstanceMap;
// duplicate to that in the Config class
std::mutex Config::fXmlLock;
boost::mutex Config::fXmlLock;
// duplicate to that in the Config class
std::mutex Config::fWriteXmlLock;
boost::mutex Config::fWriteXmlLock;
std::atomic_bool globHasConfig;
ConfigUniqPtr globConfigInstancePtr;
@ -103,7 +103,7 @@ Config* Config::makeConfig(const string& cf)
{
// To save against the moment zero race when multiple threads hits
// this scope.
std::unique_lock lk(fInstanceMapMutex);
boost::mutex::scoped_lock lk(fInstanceMapMutex);
if (globConfigInstancePtr)
{
globConfigInstancePtr->checkAndReloadConfig();
@ -118,12 +118,12 @@ Config* Config::makeConfig(const string& cf)
return globConfigInstancePtr.get();
}
std::unique_lock lk(fInstanceMapMutex);
boost::mutex::scoped_lock lk(fInstanceMapMutex);
globConfigInstancePtr->checkAndReloadConfig();
return globConfigInstancePtr.get();
}
std::unique_lock lk(fInstanceMapMutex);
boost::mutex::scoped_lock lk(fInstanceMapMutex);
if (fInstanceMap.find(cf) == fInstanceMap.end())
{
@ -439,7 +439,7 @@ void Config::writeConfig(const string& configFile) const
void Config::write(void) const
{
std::unique_lock lk(fWriteXmlLock);
boost::mutex::scoped_lock lk(fWriteXmlLock);
write(fConfigFile);
}
@ -632,7 +632,7 @@ std::string Config::getTempFileDir(Config::TempDirPurpose what)
void Config::ConfigDeleter::operator()(Config* config)
{
std::unique_lock lk(fInstanceMapMutex);
boost::mutex::scoped_lock lk(fInstanceMapMutex);
for (Config::configMap_t::iterator iter = fInstanceMap.begin(); iter != fInstanceMap.end(); ++iter)
{