1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00

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

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

View File

@ -37,9 +37,8 @@
#include <stack>
#include <stdint.h>
#include <boost/thread/thread.hpp>
#include <map>
#include <mutex>
#include <condition_variable>
#include <boost/thread/mutex.hpp>
#include <boost/thread/condition_variable.hpp>
#include <boost/thread/locks.hpp>
#include <boost/bind.hpp>
#include <boost/shared_ptr.hpp>
@ -346,9 +345,9 @@ class ThreadPool
Container_T::iterator fNextFunctor;
uint32_t fIssued;
std::mutex fMutex;
std::condition_variable fThreadAvailable; // triggered when a thread is available
std::condition_variable fNeedThread; // triggered when a thread is needed
boost::mutex fMutex;
boost::condition_variable fThreadAvailable; // triggered when a thread is available
boost::condition_variable fNeedThread; // triggered when a thread is needed
ThreadPoolGroup fThreads;
bool fStop;
@ -359,9 +358,9 @@ class ThreadPool
std::string fName; // Optional to add a name to the pool for debugging.
bool fDebug;
std::mutex fInitMutex;
std::mutex fPruneMutex;
std::condition_variable fPruneThreadEnd;
boost::mutex fInitMutex;
boost::mutex fPruneMutex;
boost::condition_variable fPruneThreadEnd;
boost::thread* fPruneThread;
std::stack<boost::thread::id> fPruneThreads; // A list of stale thread IDs to be joined
};