12345qiupeng
/
cartographer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Test ThreadPool more (#1136) 

These tests previously helped to reproduce Mutex issue #1124.
master
gaschler 2018-05-03 21:50:50 +02:00 committed by Wally B. Feed
parent 3ca6506bc7
commit 697d6091cd
1 changed files with 54 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
cartographer/common/thread_pool_test.cc
View File

@ -33,20 +33,15 @@ class Receiver {
} }
void WaitForNumberSequence(const std::vector<int>& expected_numbers) { void WaitForNumberSequence(const std::vector<int>& expected_numbers) {
bool have_enough_numbers = false;
while (!have_enough_numbers) {
common::MutexLocker locker(&mutex_); common::MutexLocker locker(&mutex_);
have_enough_numbers = locker.AwaitWithTimeout( locker.Await([this, &expected_numbers]() REQUIRES(mutex_) {
[this, &expected_numbers]() REQUIRES(mutex_) {
return (received_numbers_.size() >= expected_numbers.size()); return (received_numbers_.size() >= expected_numbers.size());
}, });
common::FromSeconds(0.1));
}
EXPECT_EQ(expected_numbers, received_numbers_); EXPECT_EQ(expected_numbers, received_numbers_);
} }
std::vector<int> received_numbers_;
Mutex mutex_; Mutex mutex_;
std::vector<int> received_numbers_ GUARDED_BY(mutex_);
}; };
TEST(ThreadPoolTest, RunTask) { TEST(ThreadPoolTest, RunTask) {
@ -58,6 +53,20 @@ TEST(ThreadPoolTest, RunTask) {
receiver.WaitForNumberSequence({1}); receiver.WaitForNumberSequence({1});
} }
TEST(ThreadPoolTest, ManyTasks) {
for (int a = 0; a < 5; ++a) {
ThreadPool pool(3);
Receiver receiver;
int kNumTasks = 10;
for (int i = 0; i < kNumTasks; ++i) {
auto task = common::make_unique<Task>();
task->SetWorkItem([&receiver]() { receiver.Receive(1); });
pool.Schedule(std::move(task));
}
receiver.WaitForNumberSequence(std::vector<int>(kNumTasks, 1));
}
}
TEST(ThreadPoolTest, RunWithDependency) { TEST(ThreadPoolTest, RunWithDependency) {
ThreadPool pool(2); ThreadPool pool(2);
Receiver receiver; Receiver receiver;
@ -86,6 +95,41 @@ TEST(ThreadPoolTest, RunWithOutOfScopeDependency) {
receiver.WaitForNumberSequence({1, 2}); receiver.WaitForNumberSequence({1, 2});
} }
TEST(ThreadPoolTest, ManyDependencies) {
for (int a = 0; a < 5; ++a) {
ThreadPool pool(5);
Receiver receiver;
int kNumDependencies = 10;
auto task = common::make_unique<Task>();
task->SetWorkItem([&receiver]() { receiver.Receive(1); });
for (int i = 0; i < kNumDependencies; ++i) {
auto dependency_task = common::make_unique<Task>();
dependency_task->SetWorkItem([]() {});
task->AddDependency(pool.Schedule(std::move(dependency_task)));
}
pool.Schedule(std::move(task));
receiver.WaitForNumberSequence({1});
}
}
TEST(ThreadPoolTest, ManyDependants) {
for (int a = 0; a < 5; ++a) {
ThreadPool pool(5);
Receiver receiver;
int kNumDependants = 10;
auto dependency_task = common::make_unique<Task>();
dependency_task->SetWorkItem([]() {});
auto dependency_handle = pool.Schedule(std::move(dependency_task));
for (int i = 0; i < kNumDependants; ++i) {
auto task = common::make_unique<Task>();
task->AddDependency(dependency_handle);
task->SetWorkItem([&receiver]() { receiver.Receive(1); });
pool.Schedule(std::move(task));
}
receiver.WaitForNumberSequence(std::vector<int>(kNumDependants, 1));
}
}
TEST(ThreadPoolTest, RunWithMultipleDependencies) { TEST(ThreadPoolTest, RunWithMultipleDependencies) {
ThreadPool pool(2); ThreadPool pool(2);
Receiver receiver; Receiver receiver;