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 solves the ocassional issues with the FairThreadPool unit test

Browse Source
This commit is contained in:
Roman Nozdrin
2022-08-11 16:56:17 +00:00
parent 4c9d6e39ac
commit f40175dc32
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/fair_threadpool.cpp
View File

@ -51,8 +51,8 @@ class TestFunctor : public FairThreadPool::Functor
~TestFunctor(){}; ~TestFunctor(){};
int operator()() override int operator()() override
{ {
usleep(delay_);
std::lock_guard<std::mutex> gl(globMutex); std::lock_guard<std::mutex> gl(globMutex);
usleep(delay_);
results.push_back(id_); results.push_back(id_);
return 0; return 0;
} }
@ -104,27 +104,30 @@ testing::AssertionResult isThisOrThat(const ResultsType& arr, const size_t idxA,
TEST_F(FairThreadPoolTest, FairThreadPoolAdd) TEST_F(FairThreadPoolTest, FairThreadPoolAdd)
{ {
SP_UM_IOSOCK sock(new messageqcpp::IOSocket); SP_UM_IOSOCK sock(new messageqcpp::IOSocket);
auto functor1 = boost::shared_ptr<FairThreadPool::Functor>(new TestFunctor(1, 50000)); auto functor1 = boost::shared_ptr<FairThreadPool::Functor>(new TestFunctor(1, 150000));
FairThreadPool::Job job1(1, 1, 1, functor1, sock, 1); FairThreadPool::Job job1(1, 1, 1, functor1, sock, 1);
auto functor2 = boost::shared_ptr<FairThreadPool::Functor>(new TestFunctor(2, 5000)); auto functor2 = boost::shared_ptr<FairThreadPool::Functor>(new TestFunctor(2, 150000));
FairThreadPool::Job job2(2, 1, 1, functor2, sock, 1); FairThreadPool::Job job2(2, 1, 1, functor2, sock, 2);
auto functor3 = boost::shared_ptr<FairThreadPool::Functor>(new TestFunctor(3, 5000)); auto functor3 = boost::shared_ptr<FairThreadPool::Functor>(new TestFunctor(3, 5000));
FairThreadPool::Job job3(3, 1, 2, functor3, sock, 1); FairThreadPool::Job job3(3, 1, 1, functor3, sock, 1);
auto functor4 = boost::shared_ptr<FairThreadPool::Functor>(new TestFunctor(4, 5000));
FairThreadPool::Job job4(4, 1, 2, functor4, sock, 1);
threadPool->addJob(job1); threadPool->addJob(job1);
threadPool->addJob(job2); threadPool->addJob(job2);
threadPool->addJob(job3); threadPool->addJob(job3);
threadPool->addJob(job4);
while (threadPool->queueSize()) while (threadPool->queueSize())
{ {
usleep(250000); usleep(350000);
} }
EXPECT_EQ(threadPool->queueSize(), 0ULL); EXPECT_EQ(threadPool->queueSize(), 0ULL);
EXPECT_EQ(results.size(), 3ULL); EXPECT_EQ(results.size(), 4ULL);
EXPECT_EQ(results[0], 1); EXPECT_EQ(results[0], 1);
EXPECT_EQ(results[1], 3); EXPECT_EQ(results[1], 4);
EXPECT_EQ(results[2], 2); EXPECT_TRUE(isThisOrThat(results, 2, 2, 3, 3));
} }
TEST_F(FairThreadPoolTest, FairThreadPoolRemove) TEST_F(FairThreadPoolTest, FairThreadPoolRemove)