From fe37ad98de01d3ada0ad2b5da825379651bbb360 Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Tue, 28 Apr 2020 13:32:51 +0200 Subject: [PATCH] Avoid "pthread_rwlock_destroy on rwlock with waiters!" on OpenBSD --- pdns/test-lock_hh.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pdns/test-lock_hh.cc b/pdns/test-lock_hh.cc index 03e7554119..bdd3697504 100644 --- a/pdns/test-lock_hh.cc +++ b/pdns/test-lock_hh.cc @@ -18,7 +18,6 @@ static void lthread() std::vector rlocks; for(auto& pp : g_locks) rlocks.emplace_back(&*pp); - } BOOST_AUTO_TEST_CASE(test_pdns_lock) @@ -54,12 +53,15 @@ BOOST_AUTO_TEST_CASE(test_pdns_lock) BOOST_CHECK(!gotit); wlocks.clear(); - TryReadLock trl2(&*g_locks[0]); - BOOST_CHECK(trl2.gotIt()); - + + { + TryReadLock trl2(&*g_locks[0]); + BOOST_CHECK(trl2.gotIt()); + } + for(auto& pp : g_locks) { pthread_rwlock_destroy(pp.get()); - } + } } BOOST_AUTO_TEST_SUITE_END() -- 2.47.2