database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +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

4
utils/loggingcpp/idberrorinfo.cpp
View File

@ -47,11 +47,11 @@ using namespace config;
namespace logging
{
IDBErrorInfo* IDBErrorInfo::fInstance = 0;
std::mutex mx;
boost::mutex mx;
IDBErrorInfo* IDBErrorInfo::instance()
{
std::unique_lock lk(mx);
boost::mutex::scoped_lock lk(mx);
if (!fInstance)
fInstance = new IDBErrorInfo();

4
utils/loggingcpp/logger.cpp
View File

@ -49,7 +49,7 @@ const string Logger::logMessage(LOG_TYPE logLevel, Message::MessageID mid, const
return logMessage(logLevel, msg, logInfo);
/*
std::unique_lock lk(fLogLock);
boost::mutex::scoped_lock lk(fLogLock);
fMl1.logData(logInfo);
switch (logLevel)
@ -77,7 +77,7 @@ const string Logger::logMessage(LOG_TYPE logLevel, Message::MessageID mid, const
const std::string Logger::logMessage(LOG_TYPE logLevel, const Message& msg, const LoggingID& logInfo)
{
std::unique_lock lk(fLogLock);
boost::mutex::scoped_lock lk(fLogLock);
fMl1.logData(logInfo);
switch (logLevel)

2
utils/loggingcpp/logger.h
View File

@ -83,7 +83,7 @@ class Logger
MsgMap fMsgMap;
MessageLog fMl1;
std::mutex fLogLock;
boost::mutex fLogLock;
};
typedef boost::shared_ptr<Logger> SPL;

4
utils/loggingcpp/message.cpp
View File

@ -44,7 +44,7 @@ using namespace config;
#include "format.h"
namespace
{
std::mutex mx;
boost::mutex mx;
bool catalogLoaded = false;
typedef map<int, string> CatMap;
@ -152,7 +152,7 @@ const string Message::lookupMessage(const MessageID& msgid)
{
if (!catalogLoaded)
{
std::unique_lock lock(mx);
boost::mutex::scoped_lock lock(mx);
if (!catalogLoaded)
{