Patchwork [v3] fix libstdc++/54185

login
register
mail settings
Submitter Jonathan Wakely
Date Aug. 13, 2012, 7:56 p.m.
Message ID <CAH6eHdQdAiTUOnDnC99o-pcfk_2Q1ETNPBCC5m4u2HpMP9TtmQ@mail.gmail.com>
Download mbox | patch
Permalink /patch/177045/
State New
Headers show

Comments

Jonathan Wakely - Aug. 13, 2012, 7:56 p.m.
This fixes an error I inadvertently introduced a few months ago.

2012-08-13  David Adler <d.adler.s at gmail dot 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.

Tested x86-64-linux, committed to 4.7 and trunk.

Thanks for the bug report and patch, David.
commit 03a66e46ee35b74372da5c46caa4e7761d10b4c8
Author: Jonathan Wakely <jwakely.gcc@gmail.com>
Date:   Mon Aug 13 19:45:30 2012 +0100

    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.

Patch

diff --git a/libstdc++-v3/src/c++11/condition_variable.cc b/libstdc++-v3/src/c++11/condition_variable.cc
index 9cd0763..001d95c 100644
--- a/libstdc++-v3/src/c++11/condition_variable.cc
+++ b/libstdc++-v3/src/c++11/condition_variable.cc
@@ -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)
diff --git a/libstdc++-v3/testsuite/30_threads/condition_variable/54185.cc b/libstdc++-v3/testsuite/30_threads/condition_variable/54185.cc
new file mode 100644
index 0000000..5769670
--- /dev/null
+++ b/libstdc++-v3/testsuite/30_threads/condition_variable/54185.cc
@@ -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();
+  }
+}