mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-04 07:55:18 +00:00
Code Issues Releases Wiki Activity

[#1535] addressed comments

Browse Source
This commit is contained in:
Razvan Becheriu
2020-11-27 18:30:34 +02:00
parent 06030846b7
commit 81f0540e49
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/lib/util/tests/readwrite_mutex_unittest.cc
View File

@@ -287,10 +287,10 @@ TEST_F(ReadWriteMutexTest, readWrite) {
// Verify the work thread is waiting for the write lock. // Verify the work thread is waiting for the write lock.
cout << "pausing for one second" << std::endl; cout << "pausing for one second" << std::endl;
auto status = syncw_.done_cv.wait_for(done_lock, chrono::seconds(1), [this](){ return syncw_.done; }); bool ret = syncw_.done_cv.wait_for(done_lock, chrono::seconds(1), [this](){ return syncw_.done; });
EXPECT_FALSE(syncw_.done); EXPECT_FALSE(syncw_.done);
EXPECT_FALSE(status); EXPECT_FALSE(ret);
// Exiting the read lock guard. // Exiting the read lock guard.
} }
@@ -338,10 +338,10 @@ TEST_F(ReadWriteMutexTest, writeWrite) {
// Verify the work thread is waiting for the write lock. // Verify the work thread is waiting for the write lock.
cout << "pausing for one second" << std::endl; cout << "pausing for one second" << std::endl;
auto status = syncw_.done_cv.wait_for(done_lock, chrono::seconds(1), [this](){ return syncw_.done; }); bool ret = syncw_.done_cv.wait_for(done_lock, chrono::seconds(1), [this](){ return syncw_.done; });
EXPECT_FALSE(syncw_.done); EXPECT_FALSE(syncw_.done);
EXPECT_FALSE(status); EXPECT_FALSE(ret);
// Exiting the write lock guard. // Exiting the write lock guard.
} }
@@ -401,10 +401,10 @@ TEST_F(ReadWriteMutexTest, readWriteRead) {
// Verify the writer thread is waiting for the write lock. // Verify the writer thread is waiting for the write lock.
cout << "pausing for one second" << std::endl; cout << "pausing for one second" << std::endl;
auto status = syncw_.done_cv.wait_for(donew_lock, chrono::seconds(1), [this](){ return syncw_.done; }); bool ret = syncw_.done_cv.wait_for(donew_lock, chrono::seconds(1), [this](){ return syncw_.done; });
EXPECT_FALSE(syncw_.done); EXPECT_FALSE(syncw_.done);
EXPECT_FALSE(status); EXPECT_FALSE(ret);
{ {
unique_lock<mutex> doner_lock(syncr_.done_mtx); unique_lock<mutex> doner_lock(syncr_.done_mtx);
@@ -418,10 +418,10 @@ TEST_F(ReadWriteMutexTest, readWriteRead) {
// Verify the reader thread is waiting for the read lock. // Verify the reader thread is waiting for the read lock.
cout << "pausing for one second" << std::endl; cout << "pausing for one second" << std::endl;
auto status = syncr_.done_cv.wait_for(doner_lock, chrono::seconds(1), [this](){ return syncr_.done; }); bool ret = syncr_.done_cv.wait_for(doner_lock, chrono::seconds(1), [this](){ return syncr_.done; });
EXPECT_FALSE(syncr_.done); EXPECT_FALSE(syncr_.done);
EXPECT_FALSE(status); EXPECT_FALSE(ret);
} }
// Exiting the read lock guard. // Exiting the read lock guard.
} }
@@ -430,10 +430,10 @@ TEST_F(ReadWriteMutexTest, readWriteRead) {
unique_lock<mutex> doner_lock(syncr_.done_mtx); unique_lock<mutex> doner_lock(syncr_.done_mtx);
// Verify the reader thread is still waiting for the read lock. // Verify the reader thread is still waiting for the read lock.
cout << "pausing for one second" << std::endl; cout << "pausing for one second" << std::endl;
auto status = syncr_.done_cv.wait_for(doner_lock, chrono::seconds(1), [this](){ return syncr_.done; }); bool ret = syncr_.done_cv.wait_for(doner_lock, chrono::seconds(1), [this](){ return syncr_.done; });
EXPECT_FALSE(syncr_.done); EXPECT_FALSE(syncr_.done);
EXPECT_FALSE(status); EXPECT_FALSE(ret);
} }
// Wait writer thread to hold the write lock. // Wait writer thread to hold the write lock.