2011-03-14 Benjamin Kosnik <bkoz@redhat.com>

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / src / thread.cc

diff --git a/libstdc++-v3/src/thread.cc b/libstdc++-v3/src/thread.cc
index ca934dd..7c923a2 100644 (file)
--- a/libstdc++-v3/src/thread.cc
+++ b/libstdc++-v3/src/thread.cc
@@ -1,11 +1,11 @@
 // thread -*- C++ -*-
 
-// Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2008, 2009, 2010, 2011 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 2, or (at your option)
+// 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,
@@ -13,89 +13,94 @@
 // 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 COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
 
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
 
 #include <thread>
-#include <bits/move.h> // std::move
+#include <cerrno>
 
 #if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1)
 
-namespace std
+namespace std _GLIBCXX_VISIBILITY(default)
 {
-  namespace 
+  namespace
   {
-    extern "C"
+    extern "C" void*
+    execute_native_thread_routine(void* __p)
     {
-      void* __thread_proxy(void* __p)
-      {
-       __thread_data_base* __t = static_cast<__thread_data_base*>(__p);
-       __thread_data_ptr __local_thread_data = __t->_M_this_ptr;
-       __t->_M_this_ptr.reset();
-
-       try
-         {
-           __local_thread_data->_M_run();
-         }
-       catch(...)
-         {
-           std::terminate();
-         }
-
-       return 0;
-      }
+      thread::_Impl_base* __t = static_cast<thread::_Impl_base*>(__p);
+      thread::__shared_base_type __local;
+      __local.swap(__t->_M_this_ptr);
+
+      __try
+       {
+         __t->_M_run();
+       }
+      __catch(...)
+       {
+         std::terminate();
+       }
+
+      return 0;
     }
   }
 
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
+  thread::_Impl_base::~_Impl_base() = default;
+
   void
   thread::join()
   {
-    if(joinable())
-      {
-       void* __r = 0;
-       int __e = __gthread_join(_M_thread_data->_M_thread_handle, &__r);
-       if(__e)
-         __throw_system_error(__e);
-
-       lock_guard<mutex> __lock(_M_thread_data_mutex);
-       _M_thread_data.reset();
-      }
+    int __e = EINVAL;
+
+    if (_M_id != id())
+      __e = __gthread_join(_M_id._M_thread, 0);
+
+    if (__e)
+      __throw_system_error(__e);
+
+    _M_id = id();
   }
 
   void
   thread::detach()
-  {    
-    if(joinable())
-      {
-       int __e = __gthread_detach(_M_thread_data->_M_thread_handle);
-       if(__e)
-         __throw_system_error(__e);
-
-       lock_guard<mutex> __lock(_M_thread_data_mutex);
-       _M_thread_data.reset();
-      }
+  {
+    int __e = EINVAL;
+
+    if (_M_id != id())
+      __e = __gthread_detach(_M_id._M_thread);
+
+    if (__e)
+      __throw_system_error(__e);
+
+    _M_id = id();
   }
 
-  void 
-  thread::_M_start_thread()
+  void
+  thread::_M_start_thread(__shared_base_type __b)
   {
-    _M_thread_data->_M_this_ptr = _M_thread_data;
-    int __e = __gthread_create(&_M_thread_data->_M_thread_handle, 
-                              &__thread_proxy, _M_thread_data.get());
-    if(__e)
+    if (!__gthread_active_p())
+      __throw_system_error(int(errc::operation_not_permitted));
+
+    __b->_M_this_ptr = __b;
+    int __e = __gthread_create(&_M_id._M_thread,
+                              &execute_native_thread_routine, __b.get());
+    if (__e)
+    {
+      __b->_M_this_ptr.reset();
       __throw_system_error(__e);
+    }
   }
-}
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace std
 
 #endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1