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

This patch resolves UB with non-existing mutex usage in MQC on runtime shutdown

Browse Source
This commit is contained in:
Leonid Fedorov
2023-03-07 19:15:32 +00:00
committed by Roman Nozdrin
parent 6f0d66b574
commit a0cb59f5bc
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
utils/messageqcpp/messagequeuepool.cpp
View File

@ -17,14 +17,19 @@
#include <sstream>
#include <map>
#include <boost/thread/mutex.hpp>
#include <time.h>
#include "messagequeuepool.h"
#include "messagequeue.h"
namespace messageqcpp
{
boost::mutex queueMutex;
std::mutex& getQueueMutex()
{
static std::mutex queueMutex;
return queueMutex;
}
// Make linker happy
std::multimap<std::string, ClientObject*> MessageQueueClientPool::clientMap;
@ -38,7 +43,7 @@ static uint64_t TimeSpecToSeconds(struct timespec* ts)
MessageQueueClient* MessageQueueClientPool::getInstance(const std::string& dnOrIp, uint64_t port)
{
boost::mutex::scoped_lock lock(queueMutex);
std::scoped_lock lock(getQueueMutex());
std::ostringstream oss;
oss << dnOrIp << "_" << port;
@ -67,7 +72,7 @@ MessageQueueClient* MessageQueueClientPool::getInstance(const std::string& dnOrI
MessageQueueClient* MessageQueueClientPool::getInstance(const std::string& module)
{
boost::mutex::scoped_lock lock(queueMutex);
std::scoped_lock lock(getQueueMutex());
MessageQueueClient* returnClient = MessageQueueClientPool::findInPool(module);
@ -160,7 +165,7 @@ void MessageQueueClientPool::releaseInstance(MessageQueueClient* client)
if (client == NULL)
return;
boost::mutex::scoped_lock lock(queueMutex);
std::scoped_lock lock(getQueueMutex());
std::multimap<std::string, ClientObject*>::iterator it = clientMap.begin();
while (it != clientMap.end())
@ -188,7 +193,7 @@ void MessageQueueClientPool::deleteInstance(MessageQueueClient* client)
if (client == NULL)
return;
boost::mutex::scoped_lock lock(queueMutex);
std::scoped_lock lock(getQueueMutex());
std::multimap<std::string, ClientObject*>::iterator it = clientMap.begin();
while (it != clientMap.end())