From 376d7c51ece6f8b39d83001717d66a2741318121 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 2 Nov 2011 00:53:12 +0000 Subject: [PATCH] future (promise): Add constructors for uses-allocator construction from rvalue promise. * include/std/future (promise): Add constructors for uses-allocator construction from rvalue promise. (packaged_task): Implement LWG 2067. Add additional constructors for uses-allocator construction. * testsuite/30_threads/packaged_task/cons/3.cc: New. * testsuite/30_threads/packaged_task/cons/alloc2.cc: New. * testsuite/30_threads/promise/cons/alloc2.cc: New. From-SVN: r180757 --- libstdc++-v3/ChangeLog | 10 ++++ libstdc++-v3/include/std/future | 53 ++++++++++++++++-- .../30_threads/packaged_task/cons/3.cc | 56 +++++++++++++++++++ .../30_threads/packaged_task/cons/alloc2.cc | 40 +++++++++++++ .../30_threads/promise/cons/alloc2.cc | 42 ++++++++++++++ 5 files changed, 197 insertions(+), 4 deletions(-) create mode 100644 libstdc++-v3/testsuite/30_threads/packaged_task/cons/3.cc create mode 100644 libstdc++-v3/testsuite/30_threads/packaged_task/cons/alloc2.cc create mode 100644 libstdc++-v3/testsuite/30_threads/promise/cons/alloc2.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ddc30f80aba..0e21cc7cc62 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,13 @@ +2011-11-02 Jonathan Wakely + + * include/std/future (promise): Add constructors for uses-allocator + construction from rvalue promise. + (packaged_task): Implement LWG 2067. Add additional constructors for + uses-allocator construction. + * testsuite/30_threads/packaged_task/cons/3.cc: New. + * testsuite/30_threads/packaged_task/cons/alloc2.cc: New. + * testsuite/30_threads/promise/cons/alloc2.cc: New. + 2011-10-31 Jason Merrill * include/Makefile.am (install-freestanding-headers): Install diff --git a/libstdc++-v3/include/std/future b/libstdc++-v3/include/std/future index 497b964833f..cc8779b40b3 100644 --- a/libstdc++-v3/include/std/future +++ b/libstdc++-v3/include/std/future @@ -955,6 +955,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_storage(__future_base::_S_allocate_result<_Res>(__a)) { } + template + promise(allocator_arg_t, const _Allocator&, promise&& __rhs) + : _M_future(std::move(__rhs._M_future)), + _M_storage(std::move(__rhs._M_storage)) + { } + promise(const promise&) = delete; ~promise() @@ -1047,6 +1053,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_storage(__future_base::_S_allocate_result<_Res&>(__a)) { } + template + promise(allocator_arg_t, const _Allocator&, promise&& __rhs) + : _M_future(std::move(__rhs._M_future)), + _M_storage(std::move(__rhs._M_storage)) + { } + promise(const promise&) = delete; ~promise() @@ -1122,6 +1134,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_storage(__future_base::_S_allocate_result(__a)) { } + template + promise(allocator_arg_t, const _Allocator&, promise&& __rhs) + : _M_future(std::move(__rhs._M_future)), + _M_storage(std::move(__rhs._M_storage)) + { } + promise(const promise&) = delete; ~promise() @@ -1270,6 +1288,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { return std::forward<_Tp>(__t); } }; + template::type>::value> + struct __is_same_pkgdtask + { typedef void __type; }; + + template + struct __is_same_pkgdtask<_Task, _Fn, true> + { }; + /// packaged_task template class packaged_task<_Res(_ArgTypes...)> @@ -1281,13 +1308,20 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // Construction and destruction packaged_task() noexcept { } - template + template + explicit + packaged_task(allocator_arg_t, const _Allocator& __a) noexcept + { } + + template::__type> explicit packaged_task(_Fn&& __fn) : _M_state(std::make_shared<_State_type>(std::forward<_Fn>(__fn))) { } - template + template::__type> explicit packaged_task(allocator_arg_t, const _Allocator& __a, _Fn&& __fn) : _M_state(std::allocate_shared<_State_type>(__a, @@ -1301,13 +1335,24 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } // No copy - packaged_task(packaged_task&) = delete; - packaged_task& operator=(packaged_task&) = delete; + packaged_task(const packaged_task&) = delete; + packaged_task& operator=(const packaged_task&) = delete; + + template + explicit + packaged_task(allocator_arg_t, const _Allocator&, + const packaged_task&) = delete; // Move support packaged_task(packaged_task&& __other) noexcept { this->swap(__other); } + template + explicit + packaged_task(allocator_arg_t, const _Allocator&, + packaged_task&& __other) noexcept + { this->swap(__other); } + packaged_task& operator=(packaged_task&& __other) noexcept { packaged_task(std::move(__other)).swap(*this); diff --git a/libstdc++-v3/testsuite/30_threads/packaged_task/cons/3.cc b/libstdc++-v3/testsuite/30_threads/packaged_task/cons/3.cc new file mode 100644 index 00000000000..24ca72085fc --- /dev/null +++ b/libstdc++-v3/testsuite/30_threads/packaged_task/cons/3.cc @@ -0,0 +1,56 @@ +// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } } +// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } } +// { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } } +// { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } } +// { dg-require-cstdint "" } +// { dg-require-gthreads "" } +// { dg-require-atomic-builtins "" } + +// Copyright (C) 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 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 +// . + +// LWG 2067. packaged_task should have deleted copy c'tor with const parameter + +#include +#include +#include + +template +std::future::type> spawn_task(F f) +{ + typedef typename std::result_of::type result_type; + std::packaged_task task(std::move(f)); + std::future res(task.get_future()); + std::thread(std::move(task)).detach(); + return res; +} + +int get_res() +{ + return 42; +} + +void test01() +{ + auto f = spawn_task(get_res); + VERIFY( f.get() == get_res() ); +} + +int main() +{ + test01(); +} diff --git a/libstdc++-v3/testsuite/30_threads/packaged_task/cons/alloc2.cc b/libstdc++-v3/testsuite/30_threads/packaged_task/cons/alloc2.cc new file mode 100644 index 00000000000..40d30705a63 --- /dev/null +++ b/libstdc++-v3/testsuite/30_threads/packaged_task/cons/alloc2.cc @@ -0,0 +1,40 @@ +// { dg-do compile } +// { dg-options "-std=gnu++0x" } +// { dg-require-cstdint "" } +// { dg-require-gthreads "" } +// { dg-require-atomic-builtins "" } + +// Copyright (C) 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 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 +// . + +// Test that packaged_task can be default-constructed or move-constructed +// in a context that does uses-allocator construction. + +#include +#include +#include + +using std::packaged_task; +using std::allocator_arg; +using std::allocator; +using std::tuple; + +typedef packaged_task task; +allocator a; + +tuple t1{ allocator_arg, a }; +tuple t2{ allocator_arg, a, task{} }; diff --git a/libstdc++-v3/testsuite/30_threads/promise/cons/alloc2.cc b/libstdc++-v3/testsuite/30_threads/promise/cons/alloc2.cc new file mode 100644 index 00000000000..a22fd203438 --- /dev/null +++ b/libstdc++-v3/testsuite/30_threads/promise/cons/alloc2.cc @@ -0,0 +1,42 @@ +// { dg-do compile } +// { dg-options "-std=gnu++0x" } +// { dg-require-cstdint "" } +// { dg-require-gthreads "" } +// { dg-require-atomic-builtins "" } + +// Copyright (C) 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 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 +// . + +// Test that promise can be default-constructed or move-constructed +// in a context that does uses-allocator construction. + +#include +#include +#include + +using std::promise; +using std::allocator_arg; +using std::allocator; +using std::tuple; + +typedef promise p; +typedef promise pr; +typedef promise pv; +allocator

a; + +tuple t1{ allocator_arg, a }; +tuple t2{ allocator_arg, a, p{}, pr{}, pv{} };