database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-12 23:42:47 +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

10
storage-manager/src/SessionManager.cpp
View File

@@ -41,7 +41,7 @@ using namespace std;
namespace
{
storagemanager::SessionManager* sm = NULL;
std::mutex m;
boost::mutex m;
} // namespace
namespace storagemanager
@@ -61,7 +61,7 @@ SessionManager* SessionManager::get()
{
if (sm)
return sm;
std::unique_lock s(m);
boost::mutex::scoped_lock s(m);
if (sm)
return sm;
sm = new SessionManager();
@@ -438,7 +438,7 @@ int SessionManager::start()
void SessionManager::returnSocket(int socket)
{
std::unique_lock s(ctrlMutex);
boost::mutex::scoped_lock s(ctrlMutex);
int err;
uint8_t ctrlCode = ADDFD;
err = ::write(socketCtrl[1], &ctrlCode, 1);
@@ -455,7 +455,7 @@ void SessionManager::returnSocket(int socket)
void SessionManager::socketError(int socket)
{
std::unique_lock s(ctrlMutex);
boost::mutex::scoped_lock s(ctrlMutex);
SMLogging* logger = SMLogging::get();
logger->log(LOG_CRIT, " ****** socket error!");
int err;
@@ -474,7 +474,7 @@ void SessionManager::socketError(int socket)
void SessionManager::shutdownSM(int sig)
{
std::unique_lock s(ctrlMutex);
boost::mutex::scoped_lock s(ctrlMutex);
SMLogging* logger = SMLogging::get();
logger->log(LOG_DEBUG, "SessionManager Caught Signal %i", sig);
int err;