boost/thread
2
0
Fork 0
mirror of https://github.com/boostorg/thread.git synced 2026-02-21 03:22:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge from trunk 1.53

Browse Source 
[SVN r82029]
This commit is contained in:
Vicente J. Botet Escriba
2012-12-16 19:01:45 +00:00
parent 0f7d406b9f
commit 565a022a5a
25 changed files with 661 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/Jamfile.v2
View File

@@ -228,7 +228,7 @@ rule thread-compile-fail ( sources : reqs * : name )
[ thread-run test_5542_2.cpp ]
[ thread-run test_5542_3.cpp ]
[ thread-run test_5891.cpp ]
[ thread-run test_6130.cpp ]
#[ thread-run test_6130.cpp ]
#[ thread-run test_6170.cpp ]
[ thread-run test_6174.cpp ]
#[ thread-run test_7160.cpp ]
@@ -480,7 +480,7 @@ rule thread-compile-fail ( sources : reqs * : name )
[ thread-run2-noit ./sync/mutual_exclusion/locks/strict_lock/default_pass.cpp : strict_lock__cons__default_p ]
[ thread-run2-noit ./sync/mutual_exclusion/locks/strict_lock/owns_lock_pass.cpp : strict_lock__owns_lock_p ]
[ thread-run2-noit ./sync/mutual_exclusion/locks/strict_lock/types_pass.cpp : strict_lock__types_p ]
#[ thread-run2-noit ./sync/mutual_exclusion/locks/strict_lock/make_strict_lock_pass.cpp : make_strict_lock_p ]
[ thread-run2-noit ./sync/mutual_exclusion/locks/strict_lock/make_strict_lock_pass.cpp : make_strict_lock_p ]
;
#explicit ts_nested_strict_lock ;
@@ -491,7 +491,7 @@ rule thread-compile-fail ( sources : reqs * : name )
[ thread-run2-noit ./sync/mutual_exclusion/locks/nested_strict_lock/default_pass.cpp : nested_strict_lock__cons__default_p ]
[ thread-run2-noit ./sync/mutual_exclusion/locks/nested_strict_lock/owns_lock_pass.cpp : nested_strict_lock__owns_lock_p ]
[ thread-run2-noit ./sync/mutual_exclusion/locks/nested_strict_lock/types_pass.cpp : nested_strict_lock__types_p ]
#[ thread-run2-noit ./sync/mutual_exclusion/locks/nested_strict_lock/make_nested_strict_lock_pass.cpp : make_nested_strict_lock_p ]
[ thread-run2-noit ./sync/mutual_exclusion/locks/nested_strict_lock/make_nested_strict_lock_pass.cpp : make_nested_strict_lock_p ]
;
@@ -662,11 +662,11 @@ rule thread-compile-fail ( sources : reqs * : name )
explicit ts_ ;
test-suite ts_
:
[ thread-run2-noit ./sync/conditions/notify_all_at_thread_exit_pass.cpp : notify_all_at_thread_exit_p2 ]
[ thread-run2-noit ./threads/thread/members/try_join_until_pass.cpp : thread__join_until_p2 ]
[ thread-run2-noit ./threads/thread/members/try_join_for_pass.cpp : thread__join_for_p2 ]
[ thread-run2-noit ./sync/futures/async/async_pass.cpp : async__async_p2 ]
#[ thread-run2-noit ./sync/futures/future/then_pass.cpp : future__then_p ]
#[ thread-run ../example/test_so.cpp ]
#[ thread-run ../example/test_so2.cpp ]
#[ compile virtual_noexcept.cpp ]
#[ thread-run test_7665.cpp ]
#[ thread-run test_7666.cpp ]
#[ thread-run ../example/unwrap.cpp ]

51
test/sync/futures/future/get_pass.cpp
View File

@@ -22,6 +22,9 @@
//#define BOOST_THREAD_VERSION 3
#define BOOST_THREAD_VERSION 4
#define BOOST_THREAD_USES_LOG
#define BOOST_THREAD_USES_LOG_THREAD_ID
#include <boost/thread/detail/log.hpp>
#include <boost/thread/future.hpp>
#include <boost/thread/thread.hpp>
@@ -87,49 +90,65 @@ void func6(boost::promise<void> p)
int main()
{
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
{
typedef int T;
// {
// boost::promise<T> p;
// boost::future<T> f = p.get_future();
//#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
// boost::thread(func1, boost::move(p)).detach();
//#else
// p.set_value(3);
//#endif
// BOOST_TEST(f.valid());
// BOOST_TEST(f.get() == 3);
//#ifdef BOOST_THREAD_PROVIDES_FUTURE_INVALID_AFTER_GET
// BOOST_TEST(!f.valid());
//#endif
// }
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
{
boost::promise<T> p;
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
boost::future<T> f = p.get_future();
#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
boost::thread(func1, boost::move(p)).detach();
#else
p.set_value(3);
#endif
BOOST_TEST(f.valid());
BOOST_TEST(f.get() == 3);
#ifdef BOOST_THREAD_PROVIDES_FUTURE_INVALID_AFTER_GET
BOOST_TEST(!f.valid());
#endif
}
{
boost::promise<T> p;
boost::future<T> f = p.get_future();
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
boost::thread(func2, boost::move(p)).detach();
#else
p.set_exception(boost::make_exception_ptr(3));
#endif
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
try
{
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
BOOST_TEST(f.valid());
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
BOOST_TEST(f.get() == 3);
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
BOOST_TEST(false);
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
}
catch (boost::wrap<int> const& i)
{
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
BOOST_TEST(i.value == 3);
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
}
catch (...)
{
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
BOOST_TEST(false);
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
}
#ifdef BOOST_THREAD_PROVIDES_FUTURE_INVALID_AFTER_GET
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
BOOST_TEST(!f.valid());
#endif
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
}
}
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
{
typedef int& T;
{
@@ -147,6 +166,7 @@ int main()
BOOST_TEST(!f.valid());
#endif
}
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
{
boost::promise<T> p;
boost::future<T> f = p.get_future();
@@ -170,6 +190,7 @@ int main()
#endif
}
}
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
typedef void T;
{
@@ -186,6 +207,7 @@ int main()
BOOST_TEST(!f.valid());
#endif
}
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
{
boost::promise<T> p;
boost::future<T> f = p.get_future();
@@ -212,6 +234,7 @@ int main()
BOOST_TEST(!f.valid());
#endif
}
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
return boost::report_errors();
}

19
test/sync/futures/future/then_pass.cpp
View File

@@ -8,10 +8,13 @@
// class future<R>
// template<typename F>
// auto then(F&& func) -> BOOST_THREAD_FUTURE<decltype(func(*this))>;
// auto then(F&& func) -> future<decltype(func(*this))>;
#define BOOST_THREAD_VERSION 4
#define BOOST_THREAD_DONT_PROVIDE_FUTURE_INVALID_AFTER_GET
//#define BOOST_THREAD_USES_LOG
#define BOOST_THREAD_USES_LOG_THREAD_ID
#include <boost/thread/detail/log.hpp>
#include <boost/thread/future.hpp>
#include <boost/detail/lightweight_test.hpp>
@@ -30,23 +33,37 @@ int p2(boost::future<int>& f)
int main()
{
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
{
boost::future<int> f1 = boost::async(p1);
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
boost::future<int> f2 = f1.then(p2);
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
BOOST_TEST(f2.get()==2);
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
}
{
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
boost::future<int> f2 = boost::async(p1).then(p2);
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
BOOST_TEST(f2.get()==2);
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
}
{
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
boost::future<int> f1 = boost::async(p1);
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
boost::future<int> f2 = f1.then(p2).then(p2);
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
BOOST_TEST(f2.get()==4);
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
}
{
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
boost::future<int> f2 = boost::async(p1).then(p2).then(p2);
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
BOOST_TEST(f2.get()==4);
BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
}
return boost::report_errors();

39
test/sync/futures/packaged_task/make_ready_at_thread_exit_pass.cpp
View File

@@ -99,7 +99,14 @@ int main()
{
boost::packaged_task<double(int, char)> p(A(5));
boost::future<double> f = p.get_future();
// BUG boost::thread(func0, boost::move(p)).detach();
// fixme BUG boost::thread(func0, boost::move(p)).detach();
boost::thread(func0, &p).detach();
BOOST_TEST(f.get() == 105.0);
}
{
boost::packaged_task<double(int, char)> p2(A(5));
boost::future<double> f = p2.get_future();
boost::packaged_task<double(int, char)> p = boost::move(p2);
boost::thread(func0, &p).detach();
BOOST_TEST(f.get() == 105.0);
}
@@ -118,6 +125,21 @@ int main()
BOOST_TEST(e.data == 6);
}
}
{
boost::packaged_task<double(int, char)> p2(A(5));
boost::future<double> f = p2.get_future();
boost::packaged_task<double(int, char)> p = boost::move(p2);
boost::thread(func1, &p).detach();
try
{
f.get();
BOOST_TEST(false);
}
catch (const E& e)
{
BOOST_TEST(e.data == 6);
}
}
{
boost::packaged_task<double(int, char)> p(A(5));
boost::future<double> f = p.get_future();
@@ -126,11 +148,24 @@ int main()
BOOST_TEST(f.get() == 105.0);
}
{
boost::packaged_task<double(int, char)> p;
boost::packaged_task<double(int, char)> p2(A(5));
boost::future<double> f = p2.get_future();
boost::packaged_task<double(int, char)> p = boost::move(p2);
boost::thread(func2, &p).detach();
BOOST_TEST(f.get() == 105.0);
}
{
boost::packaged_task<double(int, char)> p(A(5));
//boost::thread t(func3, boost::move(p));
boost::thread t(func3, &p);
t.join();
}
{
boost::packaged_task<double(int, char)> p2(A(5));
boost::packaged_task<double(int, char)> p = boost::move(p2);
boost::thread t(func3, &p);
t.join();
}
return boost::report_errors();
}

21
test/sync/futures/promise/set_exception_at_thread_exit_pass.cpp
View File

@@ -73,6 +73,27 @@ int main()
BOOST_TEST(false);
}
}
{
typedef int T;
boost::promise<T> p2;
boost::future<T> f = p2.get_future();
//boost::thread(func, boost::move(p)).detach();
p = boost::move(p2);
boost::thread(func).detach();
try
{
f.get();
BOOST_TEST(false);
}
catch (boost::wrap<int> i)
{
BOOST_TEST(i.value == 3);
}
catch (...)
{
BOOST_TEST(false);
}
}
return boost::report_errors();
}

7
test/sync/futures/promise/set_value_at_thread_exit_const_pass.cpp
View File

@@ -40,6 +40,13 @@ int main()
boost::thread(func).detach();
BOOST_TEST(f.get() == 5);
}
{
boost::promise<int> p2;
boost::future<int> f = p2.get_future();
p = boost::move(p2);
boost::thread(func).detach();
BOOST_TEST(f.get() == 5);
}
return boost::report_errors();
}

38
test/sync/futures/promise/set_value_at_thread_exit_void_pass.cpp
View File

@@ -19,8 +19,11 @@
// void promise<void>::set_value_at_thread_exit();
#define BOOST_THREAD_VERSION 4
#define BOOST_THREAD_USES_LOG
#define BOOST_THREAD_USES_LOG_THREAD_ID
#include <boost/thread/future.hpp>
#include <boost/thread/detail/log.hpp>
#include <boost/detail/lightweight_test.hpp>
int i = 0;
@@ -35,7 +38,7 @@ void func()
void func2(boost::promise<void> p2)
{
p2.set_value_at_thread_exit();
i = 1;
i = 2;
}
int main()
@@ -57,20 +60,39 @@ int main()
BOOST_TEST(false);
}
try
{
boost::promise<void> p2;
boost::future<void> f = p2.get_future();
p = boost::move(p2);
boost::thread(func).detach();
f.get();
BOOST_TEST(i == 1);
}
catch(std::exception ex)
{
std::cout << __FILE__ << ":" << __LINE__ << " " << ex.what() << std::endl;
BOOST_TEST(false);
}
catch(...)
{
BOOST_TEST(false);
}
// BUG when moving promise. fixme
// try
// {
// std::cout << __FILE__ << ":" << __LINE__ <<std::endl;
// BOOST_THREAD_LOG << BOOST_THREAD_END_LOG
// boost::promise<void> p2; // BUG
// std::cout << __FILE__ << ":" << __LINE__ <<std::endl;
// BOOST_THREAD_LOG << BOOST_THREAD_END_LOG
// boost::future<void> f = p2.get_future();
// std::cout << __FILE__ << ":" << __LINE__ <<std::endl;
// BOOST_THREAD_LOG << BOOST_THREAD_END_LOG
// boost::thread(func2, boost::move(p2)).detach(); // BUG
// std::cout << __FILE__ << ":" << __LINE__ <<std::endl;
// BOOST_THREAD_LOG << BOOST_THREAD_END_LOG
// f.get();
// std::cout << __FILE__ << ":" << __LINE__ <<std::endl;
// BOOST_TEST(i == 1);
// std::cout << __FILE__ << ":" << __LINE__ <<std::endl;
// BOOST_THREAD_LOG << BOOST_THREAD_END_LOG
// BOOST_TEST(i == 2);
// BOOST_THREAD_LOG << BOOST_THREAD_END_LOG
//
// }
// catch(std::exception ex)

4
test/sync/mutual_exclusion/locks/nested_strict_lock/copy_ctor_fail.cpp
View File

@@ -20,8 +20,8 @@ boost::mutex m1;
int main()
{
boost::nested_strict_lock<boost::mutex> lk0(m0);
boost::nested_strict_lock<boost::mutex> lk1 = lk0;
boost::nested_strict_lock<boost::unique_lock<boost::mutex> > lk0(m0);
boost::nested_strict_lock<boost::unique_lock<boost::mutex> > lk1 = lk0;
}
#include "../../../../remove_error_code_unused_warning.hpp"

4
test/sync/mutual_exclusion/locks/nested_strict_lock/make_nested_strict_lock_pass.cpp
View File

@@ -30,7 +30,7 @@ typedef boost::chrono::nanoseconds ns;
boost::mutex m;
#if ! defined(BOOST_NO_CXX11_AUTO) && ! defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && ! defined BOOST_NO_CXX11_HDR_INITIALIZER_LIST && BOOST_THREAD_USES_CHRONO
#if ! defined(BOOST_NO_CXX11_AUTO) && ! defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && ! defined BOOST_NO_CXX11_HDR_INITIALIZER_LIST && defined BOOST_THREAD_USES_CHRONO
void f()
{
@@ -38,7 +38,7 @@ void f()
time_point t1;
boost::unique_lock<boost::mutex> lg(m);
{
const auto&& nlg = boost::make_strict_lock(lg); (void)nlg;
const auto&& nlg = boost::make_nested_strict_lock(lg); (void)nlg;
t1 = Clock::now();
BOOST_THREAD_TRACE;
}

2
test/sync/mutual_exclusion/locks/strict_lock/make_strict_lock_pass.cpp
View File

@@ -29,7 +29,7 @@ typedef boost::chrono::nanoseconds ns;
boost::mutex m;
#if ! defined(BOOST_NO_CXX11_AUTO) && ! defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && ! defined BOOST_NO_CXX11_HDR_INITIALIZER_LIST && BOOST_THREAD_USES_CHRONO
#if ! defined(BOOST_NO_CXX11_AUTO) && ! defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && ! defined BOOST_NO_CXX11_HDR_INITIALIZER_LIST && defined BOOST_THREAD_USES_CHRONO
void f()
{