OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR libstdc++/54185 (condition_variable not properly destructed) 

2012-08-13  David Adler  <d.adler.s@gmail.com>

	PR libstdc++/54185
	* src/c++11/condition_variable.cc (condition_variable): Always
	destroy native type in destructor.
	* testsuite/30_threads/condition_variable/54185.cc: New.

From-SVN: r190356
This commit is contained in:
David Adler 2012-08-13 19:56:50 +00:00 committed by Jonathan Wakely
parent 181a5a136f
commit 2942db6337
3 changed files with 71 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,10 @@
2012-08-13 David Adler <d.adler.s@gmail.com>
PR libstdc++/54185
* src/c++11/condition_variable.cc (condition_variable): Always
destroy native type in destructor.
* testsuite/30_threads/condition_variable/54185.cc: New.
2012-08-13 François Dumont <fdumont@gcc.gnu.org>
Ollie Wild <aaw@google.com>

5
libstdc++-v3/src/c++11/condition_variable.cc
View File

@ -1,6 +1,6 @@
// condition_variable -*- C++ -*-
// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
// Copyright (C) 2008-2012 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@ -32,12 +32,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifdef __GTHREAD_COND_INIT
condition_variable::condition_variable() noexcept = default;
condition_variable::~condition_variable() noexcept = default;
#else
condition_variable::condition_variable() noexcept
{
__GTHREAD_COND_INIT_FUNCTION(&_M_cond);
}
#endif
condition_variable::~condition_variable() noexcept
{
@ -45,7 +45,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/* int __e = */ __gthread_cond_destroy(&_M_cond);
// if __e == EBUSY then blocked
}
#endif
void
condition_variable::wait(unique_lock<mutex>& __lock)

62
libstdc++-v3/testsuite/30_threads/condition_variable/54185.cc Normal file
View File

@ -0,0 +1,62 @@
// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* powerpc-ibm-aix* } }
// { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
// { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
// { dg-require-cstdint "" }
// { dg-require-gthreads "" }
// Copyright (C) 2012 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
// terms of the GNU General Public License as published by the
// Free Software Foundation; either version 3, or (at your option)
// any later version.
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
#include <vector>
#include <mutex>
#include <condition_variable>
#include <thread>
// PR libstdc++/54185
std::condition_variable* cond = nullptr;
std::mutex mx;
int started = 0;
int constexpr NUM_THREADS = 10;
void do_thread_a()
{
std::unique_lock<std::mutex> lock(mx);
if(++started >= NUM_THREADS)
{
cond->notify_all();
delete cond;
cond = nullptr;
}
else
cond->wait(lock);
}
int main(){
std::vector<std::thread> vec;
for(int j = 0; j < 1000; ++j)
{
started = 0;
cond = new std::condition_variable;
for (int i = 0; i < NUM_THREADS; ++i)
vec.emplace_back(&do_thread_a);
for (int i = 0; i < NUM_THREADS; ++i)
vec[i].join();
vec.clear();
}
}