libstdc++: Fix for deadlock in std::counting_semaphore [PR100806]

libstdc++-v3/ChangeLog:
	PR libstdc++/100806
	* include/bits/semaphore_base.h (__atomic_semaphore::_M_release):
	Force _M_release() to wake all waiting threads.
	* testsuite/30_threads/semaphore/100806.cc: New test.

(cherry picked from commit e02840c1a9)
This commit is contained in:
Thomas Rodgers 2021-06-22 10:59:07 -07:00
parent d4175a5d9b
commit c24384efbb
2 changed files with 60 additions and 1 deletions

View File

@ -254,7 +254,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
if (__update > 1)
__atomic_notify_address_bare(&_M_counter, true);
else
__atomic_notify_address_bare(&_M_counter, false);
__atomic_notify_address_bare(&_M_counter, true);
// FIXME - Figure out why this does not wake a waiting thread
// __atomic_notify_address_bare(&_M_counter, false);
}
private:

View File

@ -0,0 +1,57 @@
// { dg-options "-std=gnu++2a -pthread" }
// { dg-do run { target c++2a } }
// { dg-require-effective-target pthread }
// { dg-require-gthreads "" }
// { dg-add-options libatomic }
#include <iostream>
#include <sstream>
#include <thread>
#include <semaphore>
#include <mutex>
#include <chrono>
#include <vector>
std::counting_semaphore<4> semaphore{6};
std::mutex mtx;
std::vector<std::string> results;
void thread_main(size_t x)
{
semaphore.acquire();
std::this_thread::sleep_for(std::chrono::milliseconds(100));
semaphore.release();
{
std::ostringstream stm;
stm << "Thread " << x << " finished.";
std::lock_guard g{ mtx };
results.push_back(stm.str());
}
}
int main()
{
constexpr auto nthreads = 10;
std::vector<std::thread> threads(nthreads);
size_t counter{0};
for(auto& t : threads)
{
t = std::thread(thread_main, counter++);
}
for(auto& t : threads)
{
t.join();
{
std::lock_guard g{ mtx };
for (auto&& r : results)
std::cout << r << '\n';
std::cout.flush();
results.clear();
}
}
}