diff options
author | Chris Fairles <chris.fairles@gmail.com> | 2008-09-13 00:32:37 +0000 |
---|---|---|
committer | Paolo Carlini <paolo@gcc.gnu.org> | 2008-09-13 00:32:37 +0000 |
commit | 46e113bf2b767b2f2d488c68b18416bd5672ae21 (patch) | |
tree | f1b80ccc46845ad9f382edf7149e9088a80f68c5 /libstdc++-v3/src | |
parent | 8270e80020ae8387c24f212c29d5306c38569984 (diff) | |
download | gcc-46e113bf2b767b2f2d488c68b18416bd5672ae21.zip gcc-46e113bf2b767b2f2d488c68b18416bd5672ae21.tar.gz gcc-46e113bf2b767b2f2d488c68b18416bd5672ae21.tar.bz2 |
thread: New.
2008-09-12 Chris Fairles <chris.fairles@gmail.com>
Benjamin Kosnik <bkoz@redhat.com>
* include/std/thread: New.
* include/Makefile.am: Update.
* include/Makefile.in: Regenerate.
* src/thread.cc: New.
* src/Makefile.am: Update.
* src/Makefile.in: Regenerate.
* acinclude.m4: Add check for nanosleep.
* configure.ac: Call it.
* configure: Regenerate.
* config.h.in: Likewise.
* config/abi/pre/gnu.ver: Add exports.
* doc/doxygen/user.cfg.in: Add thread header.
* testsuite/lib/libstdc++.exp (check_v3_target_nanosleep): Add.
* testsuite/lib/dg-options.exp (dg-require-nanosleep): Add.
* testsuite/30_threads/thread/cons/1.cc: New.
* testsuite/30_threads/thread/cons/2.cc: Likewise.
* testsuite/30_threads/thread/cons/3.cc: Likewise.
* testsuite/30_threads/thread/cons/4.cc: Likewise.
* testsuite/30_threads/thread/algorithm/1.cc: Likewise.
* testsuite/30_threads/thread/algorithm/2.cc: Likewise.
* testsuite/30_threads/thread/member/1.cc: Likewise.
* testsuite/30_threads/thread/member/2.cc: Likewise.
* testsuite/30_threads/thread/member/3.cc: Likewise.
* testsuite/30_threads/thread/this_thread/1.cc: Likewise.
* testsuite/30_threads/thread/this_thread/2.cc: Likewise.
* testsuite/30_threads/thread/this_thread/3.cc: Likewise.
* testsuite/30_threads/thread/this_thread/4.cc: Likewise.
* testsuite/30_threads/headers/thread/types_std_c++0x.cc: Likewise.
* testsuite/30_threads/headers/thread/std_c++0x_neg.cc: Likewise.
* testsuite/17_intro/headers/c++200x/all.cc: Add thread.
* testsuite/17_intro/headers/c++200x/all_multiple_inclusion.cc:
Add thread, condition_variable and mutex.
Co-Authored-By: Benjamin Kosnik <bkoz@redhat.com>
From-SVN: r140332
Diffstat (limited to 'libstdc++-v3/src')
-rw-r--r-- | libstdc++-v3/src/Makefile.am | 6 | ||||
-rw-r--r-- | libstdc++-v3/src/Makefile.in | 10 | ||||
-rw-r--r-- | libstdc++-v3/src/thread.cc | 139 |
3 files changed, 153 insertions, 2 deletions
diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index cf4522f..4b086c6 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -187,6 +187,7 @@ sources = \ mutex.cc \ condition_variable.cc \ chrono.cc \ + thread.cc \ ${host_sources} \ ${host_sources_extra} @@ -292,6 +293,11 @@ chrono.lo: chrono.cc chrono.o: chrono.cc $(CXXCOMPILE) -std=gnu++0x -c $< +thread.lo: thread.cc + $(LTCXXCOMPILE) -std=gnu++0x -c $< +thread.o: thread.cc + $(CXXCOMPILE) -std=gnu++0x -c $< + if GLIBCXX_LDBL_COMPAT # Use special rules for compatibility-ldbl.cc compilation, as we need to # pass -mlong-double-64. diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 6c2030a..5071254 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -86,7 +86,7 @@ am__libstdc___la_SOURCES_DIST = atomic.cc bitmap_allocator.cc \ ostream-inst.cc sstream-inst.cc streambuf-inst.cc streambuf.cc \ string-inst.cc valarray-inst.cc wlocale-inst.cc \ wstring-inst.cc mutex.cc condition_variable.cc chrono.cc \ - atomicity.cc codecvt_members.cc collate_members.cc \ + thread.cc atomicity.cc codecvt_members.cc collate_members.cc \ ctype_members.cc messages_members.cc monetary_members.cc \ numeric_members.cc time_members.cc basic_file.cc c++locale.cc \ compatibility-ldbl.cc parallel_list.cc parallel_settings.cc @@ -111,7 +111,7 @@ am__objects_5 = atomic.lo bitmap_allocator.lo pool_allocator.lo \ ostream-inst.lo sstream-inst.lo streambuf-inst.lo streambuf.lo \ string-inst.lo valarray-inst.lo wlocale-inst.lo \ wstring-inst.lo mutex.lo condition_variable.lo chrono.lo \ - $(am__objects_1) $(am__objects_4) + thread.lo $(am__objects_1) $(am__objects_4) am_libstdc___la_OBJECTS = $(am__objects_5) libstdc___la_OBJECTS = $(am_libstdc___la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) @@ -425,6 +425,7 @@ sources = \ mutex.cc \ condition_variable.cc \ chrono.cc \ + thread.cc \ ${host_sources} \ ${host_sources_extra} @@ -889,6 +890,11 @@ chrono.lo: chrono.cc chrono.o: chrono.cc $(CXXCOMPILE) -std=gnu++0x -c $< +thread.lo: thread.cc + $(LTCXXCOMPILE) -std=gnu++0x -c $< +thread.o: thread.cc + $(CXXCOMPILE) -std=gnu++0x -c $< + # Use special rules for compatibility-ldbl.cc compilation, as we need to # pass -mlong-double-64. @GLIBCXX_LDBL_COMPAT_TRUE@compatibility-ldbl.lo: compatibility-ldbl.cc diff --git a/libstdc++-v3/src/thread.cc b/libstdc++-v3/src/thread.cc new file mode 100644 index 0000000..b869e07 --- /dev/null +++ b/libstdc++-v3/src/thread.cc @@ -0,0 +1,139 @@ +// thread -*- C++ -*- + +// Copyright (C) 2008 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) +// 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 COPYING. If not, write to the Free +// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +// 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 + +#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1) + +namespace std +{ + namespace + { + extern "C" + { + 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->__run(); + } + catch(...) + { + std::terminate(); + } + + return 0; + } + } + } + + thread::thread() + { } + + thread::~thread() + { + detach(); + } + + thread::id + thread::get_id() const + { + if(_M_thread_data) + return thread::id(_M_thread_data->_M_thread_handle); + else + return thread::id(); + } + + bool + thread::joinable() const + { return get_id() != id(); } + + 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(); + } + } + + 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(); + } + } + + void + thread::swap(thread&& __t) + { + std::swap(_M_thread_data, __t._M_thread_data); + } + + void + thread::__start_thread() + { + _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) + __throw_system_error(__e); + } + + namespace this_thread + { + thread::id + get_id() + { return thread::id(__gthread_self()); } + + void + yield() + { __gthread_yield(); } + } +} + +#endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1 |