|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r51524 - in sandbox/interthreads: boost/interthreads libs/interthreads/test
From: vicente.botet_at_[hidden]
Date: 2009-03-01 18:34:52
Author: viboes
Date: 2009-03-01 18:34:51 EST (Sun, 01 Mar 2009)
New Revision: 51524
URL: http://svn.boost.org/trac/boost/changeset/51524
Log:
0.4.1 : Adaptation to the Boost.ThreadPoold Version 0.21 + Scoped forking + Parallel sort
Added:
sandbox/interthreads/boost/interthreads/scoped_act.hpp (contents, props changed)
Text files modified:
sandbox/interthreads/boost/interthreads/algorithm.hpp | 2 +
sandbox/interthreads/boost/interthreads/fork.hpp | 8 ++--
sandbox/interthreads/boost/interthreads/fork_all.hpp | 10 ++--
sandbox/interthreads/boost/interthreads/scheduler.hpp | 51 ++++++++++++++++++++++-----
sandbox/interthreads/boost/interthreads/threader.hpp | 73 ++++++++++++++++++++++++++++++---------
sandbox/interthreads/libs/interthreads/test/test_thread_pool.cpp | 4 +-
6 files changed, 110 insertions(+), 38 deletions(-)
Modified: sandbox/interthreads/boost/interthreads/algorithm.hpp
==============================================================================
--- sandbox/interthreads/boost/interthreads/algorithm.hpp (original)
+++ sandbox/interthreads/boost/interthreads/algorithm.hpp 2009-03-01 18:34:51 EST (Sun, 01 Mar 2009)
@@ -12,6 +12,8 @@
#define BOOST_INTERTHREADS_ALGORITHM__HPP
#include <boost/interthreads/fork.hpp>
+#include <boost/interthreads/scoped_act.hpp>
+
//#include <boost/interthreads/lazy_fork.hpp>
#include <boost/interthreads/fork_after.hpp>
#include <boost/interthreads/fork_all.hpp>
Modified: sandbox/interthreads/boost/interthreads/fork.hpp
==============================================================================
--- sandbox/interthreads/boost/interthreads/fork.hpp (original)
+++ sandbox/interthreads/boost/interthreads/fork.hpp 2009-03-01 18:34:51 EST (Sun, 01 Mar 2009)
@@ -55,25 +55,25 @@
template< typename AE, typename F, typename A1 >
typename asynchronous_completion_token<AE, typename boost::result_of<F(A1)>::type >::type
fork( AE& ae, F fn, A1 a1 ) {
- return ae.fork( bind( fn, a1 ) );
+ return interthreads::fork(ae, bind( fn, a1 ) );
}
template< typename AE, typename F, typename A1, typename A2 >
typename asynchronous_completion_token<AE, typename boost::result_of<F(A1,A2)>::type >::type
fork( AE& ae, F fn, A1 a1, A2 a2 ) {
- return ae.fork( bind( fn, a1, a2 ) );
+ return interthreads::fork(ae, bind( fn, a1, a2 ) );
}
template< typename AE, typename F, typename A1, typename A2, typename A3 >
typename asynchronous_completion_token<AE, typename boost::result_of<F(A1,A2,A3)>::type >::type
fork( AE& ae, F fn, A1 a1, A2 a2, A3 a3 ) {
- return ae.fork( bind( fn, a1, a2, a3 ) );
+ return interthreads::fork( ae, bind( fn, a1, a2, a3 ) );
}
template< typename AE, typename F, typename A1, typename A2, typename A3, typename A4 >
typename asynchronous_completion_token<AE, typename boost::result_of<F(A1,A2,A3,A4)>::type >::type
fork( AE& ae, F fn, A1 a1, A2 a2, A3 a3, A4 a4 ) {
- return ae.fork( bind( fn, a1, a2, a3, a4 ) );
+ return interthreads::fork( ae, bind( fn, a1, a2, a3, a4 ) );
}
}
Modified: sandbox/interthreads/boost/interthreads/fork_all.hpp
==============================================================================
--- sandbox/interthreads/boost/interthreads/fork_all.hpp (original)
+++ sandbox/interthreads/boost/interthreads/fork_all.hpp 2009-03-01 18:34:51 EST (Sun, 01 Mar 2009)
@@ -106,7 +106,7 @@
typename result_of::fork_all<AE, fusion::tuple<F1> >::type
fork_all( AE& ae, F1 f1 ) {
typedef typename result_of::fork_all<AE, fusion::tuple<F1> >::type type;
- typename result_of::fork<AE, F1>::type j1 =ae.fork(f1);
+ typename result_of::fork<AE, F1>::type j1 = interthreads::fork(ae, f1);
return type(j1);
}
@@ -114,8 +114,8 @@
typename result_of::fork_all<AE, fusion::tuple<F1,F2> >::type
fork_all( AE& ae, F1 f1, F2 f2 ) {
typedef typename result_of::fork_all<AE, fusion::tuple<F1,F2> >::type type;
- typename result_of::fork<AE, F1>::type j1 =ae.fork(f1);
- typename result_of::fork<AE, F2>::type j2 =ae.fork(f2);
+ typename result_of::fork<AE, F1>::type j1 =interthreads::fork(ae, f1);
+ typename result_of::fork<AE, F2>::type j2 =interthreads::fork(ae, f2);
return type(j1,j2);
}
@@ -143,14 +143,14 @@
typename result_of::fork_all<AE, fusion::tuple<F1,F2,F3> >::type
fork_all( AE& ae, F1 f1, F2 f2, F3 f3 ) {
typedef typename result_of::fork_all<AE, fusion::tuple<F1,F2,F3> >::type type;
- return type(ae.fork(f1),ae.fork(f2),ae.fork(f3));
+ return type(interthreads::fork(ae, f1),interthreads::fork(ae, f2),interthreads::fork(ae, f3));
}
template< typename AE, typename F1, typename F2, typename F3, typename F4>
typename result_of::fork_all<AE, fusion::tuple<F1,F2,F3,F4> >::type
fork_all( AE& ae, F1 f1, F2 f2, F3 f3, F4 f4 ) {
typedef typename result_of::fork_all<AE, fusion::tuple<F1,F2,F3,F4> >::type type;
- return type(ae.fork(f1),ae.fork(f2),ae.fork(f3),ae.fork(f4));
+ return type(interthreads::fork(ae, f1),interthreads::fork(ae, f2),interthreads::fork(ae, f3),interthreads::fork(ae, f4));
}
}
Modified: sandbox/interthreads/boost/interthreads/scheduler.hpp
==============================================================================
--- sandbox/interthreads/boost/interthreads/scheduler.hpp (original)
+++ sandbox/interthreads/boost/interthreads/scheduler.hpp 2009-03-01 18:34:51 EST (Sun, 01 Mar 2009)
@@ -104,6 +104,9 @@
return ae.submit(fn);
}
};
+
+
+
}
template <typename C>
@@ -152,6 +155,20 @@
#ifdef TASK_POOL
namespace partial_specialization_workaround {
+ template <typename Pool, typename R, typename Duration>
+ struct wait_until<tp::task<Pool, R> > {
+ static typename result_of::template wait_until<tp::task<Pool, R> >::type apply( tp::task<Pool, R>& act, const system_time& abs_time ) {
+ return act.timed_wait_until(abs_time);
+ }
+ };
+ template <typename Pool, typename R, typename Duration>
+ struct wait_for<tp::task<Pool, R>, Duration> {
+ static typename result_of::template wait_for<tp::task<Pool, R>,Duration>::type
+ apply( tp::task<Pool, R>& act, Duration rel_time ) {
+ return act.timed_wait(rel_time);
+ }
+ };
+
template <typename Pool, typename R>
struct join<tp::task<Pool, R> > {
static typename result_of::template join<tp::task<Pool, R> >::type apply( tp::task<Pool, R>& act) {
@@ -170,25 +187,38 @@
return interthreads::join_until(act, get_system_time()+rel_time );
}
};
- template <typename Pool, typename R, typename Duration>
- struct wait_for<tp::task<Pool, R>, Duration> {
- static typename result_of::template wait_for<tp::task<Pool, R>,Duration>::type apply( tp::task<Pool, R>& act, Duration rel_time ) {
- return interthreads::wait_until(act, get_system_time()+rel_time );
+ template< typename Pool, typename R >
+ struct interruption_requested<tp::task<Pool, R> > {
+ static typename result_of::template interruption_requested<tp::task<Pool, R> >::type apply( tp::task<Pool, R>& act ) {
+ return act.interrupt_requested();
}
};
}
#else
namespace partial_specialization_workaround {
template <typename R>
+ struct wait_until<tp::task<R> > {
+ static typename result_of::template wait_until<tp::task<R> >::type apply( tp::task<R>& act, const system_time& abs_time ) {
+ return act.timed_wait_until(abs_time);
+ }
+ };
+ template <typename R, typename Duration>
+ struct wait_for<tp::task<R>, Duration> {
+ static typename result_of::template wait_for<tp::task<R>,Duration>::type apply( tp::task<R>& act, Duration abs_time ) {
+ return interthreads::wait_until(act, get_system_time()+abs_time);
+ }
+ };
+
+ template <typename R>
struct join<tp::task<R> > {
static typename result_of::template join<tp::task<R> >::type apply( tp::task<R>& act) {
- return act.wait();
+ return interthreads::wait(act);
}
};
template <typename R>
struct join_until<tp::task<R> > {
static typename result_of::template join_until<tp::task<R> >::type apply( tp::task<R>& act, const system_time& abs_time ) {
- return act.wait_until(abs_time);
+ return interthreads::wait_until(act, abs_time);
}
};
template <typename R, typename Duration>
@@ -197,14 +227,15 @@
return interthreads::wait_until(act, get_system_time()+abs_time);
}
};
- template <typename R, typename Duration>
- struct wait_for<tp::task<R>, Duration> {
- static typename result_of::template wait_for<tp::task<R>,Duration>::type apply( tp::task<R>& act, Duration abs_time ) {
- return interthreads::wait_until(act, get_system_time()+abs_time);
+ template< typename R >
+ struct interruption_requested<tp::task<R> > {
+ static typename result_of::template interruption_requested<tp::task<R> >::type apply( tp::task<R>& act ) {
+ return act.interrupt_requested();
}
};
}
+
#endif
}
}
Added: sandbox/interthreads/boost/interthreads/scoped_act.hpp
==============================================================================
--- (empty file)
+++ sandbox/interthreads/boost/interthreads/scoped_act.hpp 2009-03-01 18:34:51 EST (Sun, 01 Mar 2009)
@@ -0,0 +1,92 @@
+#ifndef BOOST_INTERTHREADS_SCOPED_ACT__HPP
+#define BOOST_INTERTHREADS_SCOPED_ACT__HPP
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// (C) Copyright Vicente J. Botet Escriba 2008-2009.
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or
+// copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// Based on the threader/joiner design from of Kevlin Henney (n1883)
+//
+// See http://www.boost.org/libs/interthreads for documentation.
+//
+//////////////////////////////////////////////////////////////////////////////
+
+#include <boost/interthreads/algorithm/joinable.hpp>
+#include <boost/interthreads/algorithm/join.hpp>
+#include <boost/interthreads/fork.hpp>
+
+#include <boost/config/abi_prefix.hpp>
+
+
+namespace boost {
+namespace interthreads {
+
+ template <typename ACT>
+ class scoped_join {
+ ACT& act_;
+ public:
+ scoped_join(ACT& act) : act_(act) {}
+ ~scoped_join() {
+ if (interthreads::joinable(act_)) {
+ interthreads::join(act_);
+ }
+ }
+ ACT& get() {return act_;};
+ };
+
+ template <typename ACT>
+ class scoped_terminate {
+ ACT& act_;
+ public:
+ scoped_terminate(ACT& act) : act_(act) {}
+ ~scoped_terminate() {
+ if (interthreads::joinable(act_)) {
+ std::terminate();
+ }
+ }
+ ACT& get() {return act_;};
+ };
+
+ template <typename ACT>
+ class scoped_fork_join {
+ ACT act_;
+ public:
+ template <typename AE, typename F>
+ scoped_fork_join(AE& ae, F f)
+ : act_(interthreads::fork(ae, f))
+ {}
+ ~scoped_fork_join() {
+ if (interthreads::joinable(act_)) {
+ interthreads::join(act_);
+ }
+ }
+ ACT& get() {return act_;};
+ };
+
+ template <typename ACT>
+ class scoped_fork_terminate {
+ ACT act_;
+ public:
+ template <typename AE, typename F>
+ scoped_fork_terminate(AE& ae, F f)
+ : act_(interthreads::fork(ae, f))
+ {}
+ ~scoped_fork_terminate() {
+ if (interthreads::joinable(act_)) {
+ std::terminate();
+ }
+ }
+ ACT& get() {return act_;};
+ };
+
+}
+}
+
+
+#include <boost/config/abi_suffix.hpp>
+
+#endif
+
Modified: sandbox/interthreads/boost/interthreads/threader.hpp
==============================================================================
--- sandbox/interthreads/boost/interthreads/threader.hpp (original)
+++ sandbox/interthreads/boost/interthreads/threader.hpp 2009-03-01 18:34:51 EST (Sun, 01 Mar 2009)
@@ -26,6 +26,7 @@
#include <boost/interthreads/fork.hpp>
#include <boost/interthreads/launcher.hpp>
+#include <cstdlib>
#include <boost/config/abi_prefix.hpp>
@@ -33,6 +34,15 @@
namespace boost {
namespace interthreads {
+namespace on_destruction {
+ enum type {
+ do_terminate,
+ do_join,
+ do_detach
+ };
+}
+
+
template <typename ResultType>
class unique_joiner;
@@ -49,22 +59,35 @@
struct unique_joiner_data {
unique_future< result_type > fut_;
thread th_;
+ on_destruction::type on_destruction_;
- unique_joiner_data() {}
+ unique_joiner_data(on_destruction::type on_destruction_do= on_destruction::do_join)
+ : on_destruction_(on_destruction_do)
+ {}
~unique_joiner_data() {
- //if (th_.joinable()) th_.join();
+ if (th_.joinable()) {
+ if (on_destruction_== on_destruction::do_terminate) {
+ std::terminate();
+ } else if (on_destruction_== on_destruction::do_join) {
+ th_.join();
+ }
+ }
}
template <typename Nullary>
#ifdef BOOST_THREAD_HAS_THREAD_ATTR
- unique_joiner_data(thread::native_handle_attr_type& attr, Nullary f) {
+ unique_joiner_data(thread::native_handle_attr_type& attr, Nullary f, on_destruction::type on_destruction_do)
+ : on_destruction_(on_destruction_do)
+ {
packaged_task<result_type> tsk(f);
fut_ = tsk.get_future();
thread th(attr, boost::move(tsk));
th_ = boost::move(th);
}
#else
- unique_joiner_data(Nullary f) {
+ unique_joiner_data(Nullary f, on_destruction::type on_destruction_do)
+ : on_destruction_(on_destruction_do)
+ {
packaged_task<result_type> tsk(f);
fut_ = tsk.get_future();
#if 0
@@ -81,8 +104,8 @@
typedef unique_joiner_data this_impl_type;
typedef unique_joiner this_type;
- unique_joiner(unique_joiner& other);
- this_type& operator=(unique_joiner& other);
+ unique_joiner(unique_joiner<ResultType>& other);
+ unique_joiner& operator=(unique_joiner<ResultType>& other);
//protected:
public:
friend class unique_threader;
@@ -90,11 +113,11 @@
template <typename Nullary>
// requires result_of<Nullary>::type is convertible to ResultType
#ifdef BOOST_THREAD_HAS_THREAD_ATTR
- unique_joiner(thread::native_handle_attr_type& attr, Nullary f)
- : data_(new this_impl_type(attr, f))
+ unique_joiner(thread::native_handle_attr_type& attr, Nullary f, on_destruction::type on_destruction_do=on_destruction::do_join)
+ : data_(new this_impl_type(attr, f,on_destruction_do))
#else
- unique_joiner(Nullary f)
- : data_(new this_impl_type(f))
+ unique_joiner(Nullary f, on_destruction::type on_destruction_do=on_destruction::do_join)
+ : data_(new this_impl_type(f,on_destruction_do))
#endif
{}
@@ -273,19 +296,35 @@
struct shared_joiner_data {
shared_future< result_type > fut_;
thread th_;
+ on_destruction::type on_destruction_;
- shared_joiner_data() {}
+ shared_joiner_data(on_destruction::type on_destruction_do= on_destruction::do_join)
+ : on_destruction_(on_destruction_do)
+ {}
+ ~shared_joiner_data() {
+ if (th_.joinable()) {
+ if (on_destruction_== on_destruction::do_terminate) {
+ std::terminate();
+ } else if (on_destruction_== on_destruction::do_join) {
+ th_.join();
+ }
+ }
+ }
template <typename Nullary>
#ifdef BOOST_THREAD_HAS_THREAD_ATTR
- shared_joiner_data(thread::native_handle_attr_type& attr, Nullary f) {
+ shared_joiner_data(thread::native_handle_attr_type& attr, Nullary f, on_destruction::type on_destruction_do) {
+ : on_destruction(on_destruction_do)
+ {
packaged_task<result_type> tsk(f);
fut_ = tsk.get_future();
thread th(attr, boost::move(tsk));
th_ = boost::move(th);
}
#else
- shared_joiner_data(Nullary f) {
+ shared_joiner_data(Nullary f, on_destruction::type on_destruction_do)
+ : on_destruction_(on_destruction_do)
+ {
packaged_task<result_type> tsk(f);
fut_ = tsk.get_future();
#if 0
@@ -308,11 +347,11 @@
template <typename Nullary>
// requires result_of<Nullary>::type is convertible to ResultType
#ifdef BOOST_THREAD_HAS_THREAD_ATTR
- shared_joiner(thread::native_handle_attr_type& attr, Nullary f)
- : data_(new this_impl_type(attr, f))
+ shared_joiner(thread::native_handle_attr_type& attr, Nullary f, on_destruction::type on_destruction_do=on_destruction::do_join)
+ : data_(new this_impl_type(attr, f,on_destruction_do))
#else
- shared_joiner(Nullary f)
- : data_(new this_impl_type(f))
+ shared_joiner(Nullary f, on_destruction::type on_destruction_do=on_destruction::do_join)
+ : data_(new this_impl_type(f,on_destruction_do))
#endif
{
}
Modified: sandbox/interthreads/libs/interthreads/test/test_thread_pool.cpp
==============================================================================
--- sandbox/interthreads/libs/interthreads/test/test_thread_pool.cpp (original)
+++ sandbox/interthreads/libs/interthreads/test/test_thread_pool.cpp 2009-03-01 18:34:51 EST (Sun, 01 Mar 2009)
@@ -164,7 +164,7 @@
pool_type ae(boost::tp::poolsize(2));
aetst::do_test_wait_for_all(ae);
}
-#if 1
+#if 0
void do_test_fork_after_wait() {
pool_type ae(boost::tp::poolsize(2));
aetst::do_test_fork_after_wait(ae);
@@ -211,7 +211,7 @@
test->add(BOOST_TEST_CASE(&do_test_wait_for_all));
-#if 1 // DO NOT WORK YET
+#if 0 // DO NOT WORK YET
test->add(BOOST_TEST_CASE(&do_test_wait_for_any));
test->add(BOOST_TEST_CASE(&do_test_fork_after_wait));
test->add(BOOST_TEST_CASE(&do_test_fork_after_get));
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk