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

thread (_Impl_base): Move _M_id out and into ... 

2009-02-13  Chris Fairles  <cfairles@gcc.gnu.org>
	    Benjamin Kosnik  <bkoz@redhat.com>

	* include/std/thread (_Impl_base): Move _M_id out and into ...
	(thread): ...here. Call _M_make_routine in body of constructors.
	Adjust data member usage to reflect changes.
	(_M_make_routine): From _M_make_shared_data.
	(_M_start_thread): Add __shared_base_type argument.
	* src/thread.cc: Fixups for above.
	* config/abi/pre/gnu.ver: Adjust exports.
	* testsuite/30_threads/thread/native_handle/typesizes.cc: Enable.
	* testsuite/30_threads/thread/cons/assign_neg.cc: Adjust line numbers.
	* testsuite/30_threads/thread/cons/copy_neg.cc: Same.


Co-Authored-By: Benjamin Kosnik <bkoz@redhat.com>

From-SVN: r144171
This commit is contained in:
Chris Fairles 2009-02-13 23:08:50 +00:00 committed by Benjamin Kosnik
parent 2d05f84dc4
commit 626dda69bc
7 changed files with 49 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,17 @@
2009-02-13 Chris Fairles <cfairles@gcc.gnu.org>
Benjamin Kosnik <bkoz@redhat.com>
* include/std/thread (_Impl_base): Move _M_id out and into ...
(thread): ...here. Call _M_make_routine in body of constructors.
Adjust data member usage to reflect changes.
(_M_make_routine): From _M_make_shared_data.
(_M_start_thread): Add __shared_base_type argument.
* src/thread.cc: Fixups for above.
* config/abi/pre/gnu.ver: Adjust exports.
* testsuite/30_threads/thread/native_handle/typesizes.cc: Enable.
* testsuite/30_threads/thread/cons/assign_neg.cc: Adjust line numbers.
* testsuite/30_threads/thread/cons/copy_neg.cc: Same.
2009-02-12 Benjamin Kosnik <bkoz@redhat.com> 2009-02-12 Benjamin Kosnik <bkoz@redhat.com>
* testsuite/util/thread/all.h (compare_type_to_native_type_sizes): To... * testsuite/util/thread/all.h (compare_type_to_native_type_sizes): To...

2
libstdc++-v3/config/abi/pre/gnu.ver
View File

@ -897,9 +897,9 @@ GLIBCXX_3.4.11 {
_ZNSt22condition_variable_anyD2Ev; _ZNSt22condition_variable_anyD2Ev;
# thread # thread
_ZNSt6thread15_M_start_threadEv;
_ZNSt6thread4joinEv; _ZNSt6thread4joinEv;
_ZNSt6thread6detachEv; _ZNSt6thread6detachEv;
_ZNSt6thread15_M_start_threadESt10shared_ptrINS_10_Impl_baseEE;
# system_error # system_error
_ZSt15system_category; _ZSt15system_category;

50
libstdc++-v3/include/std/thread
View File

@ -57,14 +57,14 @@ namespace std
class thread class thread
{ {
public: public:
typedef __gthread_t native_handle_type; typedef __gthread_t native_handle_type;
struct _Impl_base; struct _Impl_base;
typedef shared_ptr<_Impl_base> __shared_base_type; typedef shared_ptr<_Impl_base> __shared_base_type;
/// thread::id /// thread::id
class id class id
{ {
native_handle_type _M_thread; native_handle_type _M_thread;
public: public:
id() : _M_thread() { } id() : _M_thread() { }
@ -88,35 +88,31 @@ namespace std
operator<<(basic_ostream<_CharT, _Traits>&& __out, thread::id __id); operator<<(basic_ostream<_CharT, _Traits>&& __out, thread::id __id);
}; };
// Simple base type that the templatized, derived class containing
// an abitrary functor can be converted to and called.
struct _Impl_base struct _Impl_base
{ {
id _M_id; __shared_base_type _M_this_ptr;
__shared_base_type _M_this_ptr;
_Impl_base() = default;
virtual ~_Impl_base() = default; virtual ~_Impl_base() = default;
virtual void virtual void _M_run() = 0;
_M_run() = 0;
}; };
template<typename _Callable> template<typename _Callable>
class _Impl : public _Impl_base struct _Impl : public _Impl_base
{ {
_Callable _M_func; _Callable _M_func;
public:
_Impl(_Callable&& __f) : _M_func(std::forward<_Callable>(__f)) _Impl(_Callable&& __f) : _M_func(std::forward<_Callable>(__f))
{ } { }
void void
_M_run() { _M_func(); } _M_run() { _M_func(); }
}; };
private: private:
// NB: Store the base type here. id _M_id;
__shared_base_type _M_data;
public: public:
thread() = default; thread() = default;
@ -127,13 +123,11 @@ namespace std
template<typename _Callable> template<typename _Callable>
explicit thread(_Callable __f) explicit thread(_Callable __f)
: _M_data(_M_make_shared_data<_Callable>(__f)) { _M_start_thread(_M_make_routine<_Callable>(__f)); }
{ _M_start_thread(); }
template<typename _Callable, typename... _Args> template<typename _Callable, typename... _Args>
thread(_Callable&& __f, _Args&&... __args) thread(_Callable&& __f, _Args&&... __args)
: _M_data(_M_make_shared_data(std::bind(__f, __args...))) { _M_start_thread(_M_make_routine(std::bind(__f, __args...))); }
{ _M_start_thread(); }
~thread() ~thread()
{ {
@ -153,11 +147,11 @@ namespace std
void void
swap(thread&& __t) swap(thread&& __t)
{ std::swap(_M_data, __t._M_data); } { std::swap(_M_id, __t._M_id); }
bool bool
joinable() const joinable() const
{ return _M_data; } { return !(_M_id == id()); }
void void
join(); join();
@ -167,18 +161,13 @@ namespace std
thread::id thread::id
get_id() const get_id() const
{ { return _M_id; }
if (_M_data)
return thread::id(_M_data->_M_id._M_thread);
else
return thread::id();
}
/** @pre thread is joinable /** @pre thread is joinable
*/ */
native_handle_type native_handle_type
native_handle() native_handle()
{ return _M_data->_M_id._M_thread; } { return _M_id._M_thread; }
// Returns a value that hints at the number of hardware thread contexts. // Returns a value that hints at the number of hardware thread contexts.
static unsigned int static unsigned int
@ -186,15 +175,16 @@ namespace std
{ return 0; } { return 0; }
private: private:
void
_M_start_thread(__shared_base_type);
template<typename _Callable> template<typename _Callable>
shared_ptr<_Impl<_Callable>> shared_ptr<_Impl<_Callable>>
_M_make_shared_data(_Callable&& __f) _M_make_routine(_Callable&& __f)
{ {
// Create and allocate full data structure, not base. // Create and allocate full data structure, not base.
return make_shared<_Impl<_Callable>>(std::forward<_Callable>(__f)); return make_shared<_Impl<_Callable>>(std::forward<_Callable>(__f));
} }
void _M_start_thread();
}; };
inline void inline void

22
libstdc++-v3/src/thread.cc
View File

@ -61,16 +61,16 @@ namespace std
{ {
int __e = EINVAL; int __e = EINVAL;
if (_M_data) if (_M_id != id())
{ {
void* __r = 0; void* __r = 0;
__e = __gthread_join(_M_data->_M_id._M_thread, &__r); __e = __gthread_join(_M_id._M_thread, &__r);
} }
if (__e) if (__e)
__throw_system_error(__e); __throw_system_error(__e);
_M_data.reset(); _M_id = id();
} }
void void
@ -78,24 +78,24 @@ namespace std
{ {
int __e = EINVAL; int __e = EINVAL;
if (_M_data) if (_M_id != id())
__e = __gthread_detach(_M_data->_M_id._M_thread); __e = __gthread_detach(_M_id._M_thread);
if (__e) if (__e)
__throw_system_error(__e); __throw_system_error(__e);
_M_data.reset(); _M_id = id();
} }
void void
thread::_M_start_thread() thread::_M_start_thread(__shared_base_type __b)
{ {
_M_data->_M_this_ptr = _M_data; __b->_M_this_ptr = __b;
int __e = __gthread_create(&_M_data->_M_id._M_thread, int __e = __gthread_create(&_M_id._M_thread,
&execute_native_thread_routine, _M_data.get()); &execute_native_thread_routine, __b.get());
if (__e) if (__e)
{ {
_M_data->_M_this_ptr.reset(); __b->_M_this_ptr.reset();
__throw_system_error(__e); __throw_system_error(__e);
} }
} }

2
libstdc++-v3/testsuite/30_threads/thread/cons/assign_neg.cc
View File

@ -33,4 +33,4 @@ void test01()
} }
// { dg-error "used here" "" { target *-*-* } 32 } // { dg-error "used here" "" { target *-*-* } 32 }
// { dg-error "deleted function" "" { target *-*-* } 144 } // { dg-error "deleted function" "" { target *-*-* } 138 }

2
libstdc++-v3/testsuite/30_threads/thread/cons/copy_neg.cc
View File

@ -32,5 +32,5 @@ void test01()
} }
// { dg-error "here" "" { target *-*-* } 31 } // { dg-error "here" "" { target *-*-* } 31 }
// { dg-error "deleted function" "" { target *-*-* } 123 } // { dg-error "deleted function" "" { target *-*-* } 119 }
// { dg-excess-errors "In file included from" } // { dg-excess-errors "In file included from" }

3
libstdc++-v3/testsuite/30_threads/thread/native_handle/typesizes.cc
View File

@ -29,7 +29,6 @@
int main() int main()
{ {
typedef std::thread test_type; typedef std::thread test_type;
// XX disable for now __gnu_test::compare_type_to_native_type<test_type>();
//__gnu_test::compare_type_to_native_type<test_type>();
return 0; return 0;
} }