database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +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/messageqcpp/bytestreampool.cpp
View File

@ -49,7 +49,7 @@ ByteStreamPool::~ByteStreamPool()
ByteStream* ByteStreamPool::getByteStream()
{
std::unique_lock s(mutex);
boost::mutex::scoped_lock s(mutex);
ByteStream* ret;
if (!freeByteStreams.empty())
@ -69,7 +69,7 @@ void ByteStreamPool::returnByteStream(ByteStream* bs)
delete bs;
else
{
std::unique_lock s(mutex);
boost::mutex::scoped_lock s(mutex);
if (freeByteStreams.size() > maxFreeBuffers)
delete bs;
else

5
utils/messageqcpp/bytestreampool.h
View File

@ -24,8 +24,7 @@ Initially, 'large' is defined as 1MB.
*/
#include <deque>
#include <map>
#include <mutex>
#include <boost/thread/mutex.hpp>
#include "bytestream.h"
namespace messageqcpp
@ -44,7 +43,7 @@ class ByteStreamPool
private:
std::deque<ByteStream*> freeByteStreams;
std::mutex mutex;
boost::mutex mutex;
uint maxBufferSize;
uint maxFreeBuffers;
};

8
utils/messageqcpp/messagequeuepool.cpp
View File

@ -71,7 +71,7 @@ static uint64_t TimeSpecToSeconds(struct timespec* ts)
MessageQueueClient* MessageQueueClientPool::getInstance(const std::string& dnOrIp, uint64_t port)
{
auto lock = std::unique_lock(lockedMap.queueMutex);
auto lock = std::scoped_lock(lockedMap.queueMutex);
std::ostringstream oss;
oss << dnOrIp << "_" << port;
@ -100,7 +100,7 @@ MessageQueueClient* MessageQueueClientPool::getInstance(const std::string& dnOrI
MessageQueueClient* MessageQueueClientPool::getInstance(const std::string& module)
{
auto lock = std::unique_lock(lockedMap.queueMutex);
auto lock = std::scoped_lock(lockedMap.queueMutex);
MessageQueueClient* returnClient = MessageQueueClientPool::findInPool(module);
@ -194,7 +194,7 @@ void MessageQueueClientPool::releaseInstance(MessageQueueClient* client)
if (client == NULL)
return;
auto lock = std::unique_lock(lockedMap.queueMutex);
auto lock = std::scoped_lock(lockedMap.queueMutex);
auto it = lockedMap.clientMap.begin();
while (it != lockedMap.clientMap.end())
@ -223,7 +223,7 @@ void MessageQueueClientPool::deleteInstance(MessageQueueClient* client)
return;
auto lock = std::unique_lock(lockedMap.queueMutex);
auto lock = std::scoped_lock(lockedMap.queueMutex);
auto it = lockedMap.clientMap.begin();
while (it != lockedMap.clientMap.end())