Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r51542 - in sandbox/threadpool: boost boost/tp boost/tp/detail libs/tp/doc libs/tp/doc/html libs/tp/doc/html/boost_threadpool libs/tp/examples libs/tp/test
From: oliver.kowalke_at_[hidden]
Date: 2009-03-02 15:16:02

Author: olli
Date: 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
New Revision: 51542
URL: http://svn.boost.org/trac/boost/changeset/51542

Log:
* taks let access internal future object
* documentation changed
* tests changed

Added:
   sandbox/threadpool/libs/tp/examples/reschedule_until.cpp (contents, props changed)
Removed:
   sandbox/threadpool/libs/tp/doc/wait_ref.qbk
Text files modified:
   sandbox/threadpool/boost/future.hpp | 8
   sandbox/threadpool/boost/tp/detail/callable.hpp | 6
   sandbox/threadpool/boost/tp/detail/interrupter.hpp | 18 +-
   sandbox/threadpool/boost/tp/pool.hpp | 49 +++-
   sandbox/threadpool/boost/tp/task.hpp | 243 ++--------------------------
   sandbox/threadpool/libs/tp/doc/forkjoin.qbk | 4
   sandbox/threadpool/libs/tp/doc/html/boost_threadpool/channel.html | 4
   sandbox/threadpool/libs/tp/doc/html/boost_threadpool/forkjoin.html | 37 ++--
   sandbox/threadpool/libs/tp/doc/html/boost_threadpool/pool.html | 10
   sandbox/threadpool/libs/tp/doc/html/boost_threadpool/reference.html | 246 +---------------------------
   sandbox/threadpool/libs/tp/doc/html/boost_threadpool/scheduling.html | 8
   sandbox/threadpool/libs/tp/doc/html/boost_threadpool/task.html | 22 -
   sandbox/threadpool/libs/tp/doc/html/boost_threadpool/this_task.html | 13
   sandbox/threadpool/libs/tp/doc/html/index.html | 11
   sandbox/threadpool/libs/tp/doc/introduction.qbk | 3
   sandbox/threadpool/libs/tp/doc/pool.qbk | 5
   sandbox/threadpool/libs/tp/doc/reference.qbk | 1
   sandbox/threadpool/libs/tp/doc/task.qbk | 12
   sandbox/threadpool/libs/tp/doc/task_ref.qbk | 88 ---------
   sandbox/threadpool/libs/tp/doc/this_task.qbk | 2
   sandbox/threadpool/libs/tp/doc/this_task_ref.qbk | 5
   sandbox/threadpool/libs/tp/doc/threadpool.xml | 334 ++++++---------------------------------
   sandbox/threadpool/libs/tp/examples/fork_join.cpp | 4
   sandbox/threadpool/libs/tp/examples/interrupt.cpp | 2
   sandbox/threadpool/libs/tp/examples/pending.cpp | 2
   sandbox/threadpool/libs/tp/examples/shutdonw_now.cpp | 2
   sandbox/threadpool/libs/tp/examples/spread_over_hardware.cpp | 4
   sandbox/threadpool/libs/tp/examples/submit.cpp | 2
   sandbox/threadpool/libs/tp/test/test_bounded_queue_fifo.cpp | 16
   sandbox/threadpool/libs/tp/test/test_bounded_queue_lifo.cpp | 43 ++--
   sandbox/threadpool/libs/tp/test/test_bounded_queue_priority.cpp | 45 ++--
   sandbox/threadpool/libs/tp/test/test_bounded_queue_smart.cpp | 45 ++--
   sandbox/threadpool/libs/tp/test/test_unbounded_queue_fifo.cpp | 43 ++--
   sandbox/threadpool/libs/tp/test/test_unbounded_queue_lifo.cpp | 43 ++--
   sandbox/threadpool/libs/tp/test/test_unbounded_queue_priority.cpp | 45 ++--
   sandbox/threadpool/libs/tp/test/test_unbounded_queue_smart.cpp | 45 ++--
   36 files changed, 367 insertions(+), 1103 deletions(-)

Modified: sandbox/threadpool/boost/future.hpp
==============================================================================
--- sandbox/threadpool/boost/future.hpp (original)
+++ sandbox/threadpool/boost/future.hpp 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -4,8 +4,8 @@
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)

-#ifndef N2561_FUTURE_HPP
-#define N2561_FUTURE_HPP
+#ifndef BOOST_FUTURE_HPP
+#define BOOST_FUTURE_HPP
#include <stdexcept>
#include <boost/exception.hpp>
#include <boost/thread.hpp>
@@ -31,7 +31,7 @@
catch ( Exception const& e) \
{ throw boost::enable_current_exception( e); }

-namespace jss
+namespace boost
{
 class future_uninitialized:
 public std::logic_error
@@ -1182,7 +1182,7 @@
 if(!started)
 {
 started=true;
- this->mark_exceptional_finish_internal(boost::copy_exception(jss::broken_promise()));
+ this->mark_exceptional_finish_internal(boost::copy_exception(boost::broken_promise()));
 }
 }

Modified: sandbox/threadpool/boost/tp/detail/callable.hpp
==============================================================================
--- sandbox/threadpool/boost/tp/detail/callable.hpp (original)
+++ sandbox/threadpool/boost/tp/detail/callable.hpp 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -25,9 +25,9 @@
 struct impl_wrapper
 : public impl
 {
- jss::packaged_task< T > tsk;
+ packaged_task< T > tsk;

- impl_wrapper( boost::detail::thread_move_t< jss::packaged_task< T > > const& t)
+ impl_wrapper( boost::detail::thread_move_t< packaged_task< T > > const& t)
 : tsk( t)
 {}

@@ -43,7 +43,7 @@
 {}

 template< typename T >
- callable( boost::detail::thread_move_t< jss::packaged_task< T > > const& t)
+ callable( boost::detail::thread_move_t< packaged_task< T > > const& t)
 : impl_( new impl_wrapper< T >( t) )
 {}

Modified: sandbox/threadpool/boost/tp/detail/interrupter.hpp
==============================================================================
--- sandbox/threadpool/boost/tp/detail/interrupter.hpp (original)
+++ sandbox/threadpool/boost/tp/detail/interrupter.hpp 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -23,16 +23,16 @@
 : private noncopyable
 {
 private:
- bool interrupt_requested_;
+ bool interruption_requested_;
 condition_variable cond_;
 mutex mtx_;
 shared_ptr< thread > thrd_;

 void interrupt_()
 {
- if ( ! interrupt_requested_)
+ if ( ! interruption_requested_)
 {
- interrupt_requested_ = true;
+ interruption_requested_ = true;
 if ( thrd_) thrd_->interrupt();
 }
 }
@@ -40,7 +40,7 @@
 public:
 impl()
 :
- interrupt_requested_( false),
+ interruption_requested_( false),
 cond_(),
 mtx_(),
 thrd_()
@@ -52,7 +52,7 @@
 unique_lock< mutex > lk( mtx_);
 thrd_ = thrd;
 BOOST_ASSERT( thrd_);
- if ( interrupt_requested_) thrd_->interrupt();
+ if ( interruption_requested_) thrd_->interrupt();
 }

 void reset()
@@ -96,10 +96,10 @@
 cond_.timed_wait( lk, rel_time);
 }

- bool interrupt_requested()
+ bool interruption_requested()
 {
 unique_lock< mutex > lk( mtx_);
- return interrupt_requested_;
+ return interruption_requested_;
 }
 };

@@ -129,8 +129,8 @@
 void interrupt_and_wait( DurationType const& rel_time)
 { impl_->interrupt_and_wait( rel_time); }

- bool interrupt_requested()
- { return impl_->interrupt_requested(); }
+ bool interruption_requested()
+ { return impl_->interruption_requested(); }
};
}
} }

Modified: sandbox/threadpool/boost/tp/pool.hpp
==============================================================================
--- sandbox/threadpool/boost/tp/pool.hpp (original)
+++ sandbox/threadpool/boost/tp/pool.hpp 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -51,9 +51,9 @@
namespace boost
{
 template< typename T >
- detail::thread_move_t< jss::packaged_task< T > > move( jss::packaged_task< T > & t)
+ detail::thread_move_t< packaged_task< T > > move( packaged_task< T > & t)
 {
- return detail::thread_move_t< jss::packaged_task< T > >( t);
+ return detail::thread_move_t< packaged_task< T > >( t);
 }
}

@@ -65,7 +65,18 @@
 typename Pool,
 typename R
>
-void reschedule_until( jss::shared_future< R > const& f)
+void reschedule_until( unique_future< R > const& f)
+{
+ typename Pool::worker * w( Pool::tss_worker_.get() );
+ BOOST_ASSERT( w);
+ w->reschedule_until( f);
+}
+
+template<
+ typename Pool,
+ typename R
+>
+void reschedule_until( shared_future< R > const& f)
{
 typename Pool::worker * w( Pool::tss_worker_.get() );
 BOOST_ASSERT( w);
@@ -91,7 +102,13 @@
 typename Pool,
 typename R
>
- friend void this_task::reschedule_until( jss::shared_future< R > const&);
+ friend void this_task::reschedule_until( unique_future< R > const&);
+
+ template<
+ typename Pool,
+ typename R
+ >
+ friend void this_task::reschedule_until( shared_future< R > const&);

 template< typename Pool >
 friend Pool & this_task::get_thread_pool();
@@ -212,8 +229,8 @@
 void reset_scanns()
 { scns_ = 0; }

- template< typename R >
- void reschedule_until( jss::shared_future< R > const& f)
+ template< typename F >
+ void reschedule_until( F const& f)
 { pool_ptr_->reschedule_until_( f); }

 pool & get_thread_pool()
@@ -280,8 +297,8 @@
 void reset_scanns()
 { impl_->reset_scanns(); }

- template< typename R >
- void reschedule_until( jss::shared_future< R > const& f)
+ template< typename F >
+ void reschedule_until( F const& f)
 { return impl_->reschedule_until( f); }

 pool & get_thread_pool()
@@ -398,8 +415,8 @@
 }
 }

- template< typename R >
- void reschedule_until_( jss::shared_future< R > const& f)
+ template< typename F >
+ void reschedule_until_( F const& f)
 {
 worker * w( tss_worker_.get() );
 BOOST_ASSERT( w);
@@ -722,14 +739,14 @@
 {
 typedef typename result_of< Act() >::type R;
 detail::interrupter intr;
- jss::packaged_task< R > tsk( act);
- jss::shared_future< R > f( tsk.get_future() );
+ packaged_task< R > tsk( act);
+ shared_future< R > f( tsk.get_future() );
 worker * w( tss_worker_.get() );
 if ( w)
 {
 tsk.set_wait_callback(
 bind(
- ( void ( pool::*)( jss::shared_future< R > const&) ) & pool::reschedule_until_,
+ ( void ( pool::*)( shared_future< R > const&) ) & pool::reschedule_until_,
 this,
 f) );
 w->put( detail::callable( move( tsk) ), intr);
@@ -759,14 +776,14 @@
 {
 typedef typename result_of< Act() >::type R;
 detail::interrupter intr;
- jss::packaged_task< R > tsk( act);
- jss::shared_future< R > f( tsk.get_future() );
+ packaged_task< R > tsk( act);
+ shared_future< R > f( tsk.get_future() );
 worker * w( tss_worker_.get() );
 if ( w)
 {
 tsk.set_wait_callback(
 bind(
- ( void ( pool::*)( jss::shared_future< R > const&) ) & pool::reschedule_until_,
+ ( void ( pool::*)( shared_future< R > const&) ) & pool::reschedule_until_,
 this,
 f) );
 w->put( detail::callable( move( tsk) ), intr);

Modified: sandbox/threadpool/boost/tp/task.hpp
==============================================================================
--- sandbox/threadpool/boost/tp/task.hpp (original)
+++ sandbox/threadpool/boost/tp/task.hpp 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -16,65 +16,16 @@
class task
{
private:
- template<
- typename T1,
- typename T2
- >
- friend void wait_for_any( task< T1 > &, task< T2 > &);
- template<
- typename T1,
- typename T2,
- typename T3
- >
- friend void wait_for_any( task< T1 > &, task< T2 > &, task< T3 > &);
- template<
- typename T1,
- typename T2,
- typename T3,
- typename T4
- >
- friend void wait_for_any( task< T1 > &, task< T2 > &, task< T3 > &, task< T4 > &);
- template<
- typename T1,
- typename T2,
- typename T3,
- typename T4,
- typename T5
- >
- friend void wait_for_any( task< T1 > &, task< T2 > &, task< T3 > &, task< T4 > &, task< T5 > &);
- template<
- typename T1,
- typename T2
- >
- friend void wait_for_all( task< T1 > &, task< T2 > &);
- template<
- typename T1,
- typename T2,
- typename T3
- >
- friend void wait_for_all( task< T1 > &, task< T2 > &, task< T3 > &);
- template<
- typename T1,
- typename T2,
- typename T3,
- typename T4
- >
- friend void wait_for_all( task< T1 > &, task< T2 > &, task< T3 > &, task< T4 > &);
- template<
- typename T1,
- typename T2,
- typename T3,
- typename T4,
- typename T5
- >
- friend void wait_for_all( task< T1 > &, task< T2 > &, task< T3 > &, task< T4 > &, task< T5 > &);
-
- jss::shared_future< R > fut_;
- detail::interrupter intr_;
+ shared_future< R > fut_;
+ detail::interrupter intr_;

public:
+ task()
+ : fut_(), intr_()
+ {}
+
 task(
- jss::shared_future< R > const& fut,
+ shared_future< R > const& fut,
 detail::interrupter const& intr)
 :
 fut_( fut),
@@ -94,95 +45,23 @@
 void interrupt_and_wait( Duration const& rel_time)
 { intr_.interrupt_and_wait( rel_time); }

- bool interrupt_requested()
- { return intr_.interrupt_requested(); }
-
- R get()
- { return fut_.get(); }
-
- bool is_ready() const
- { return fut_.is_ready(); }
-
- bool has_value() const
- { return fut_.has_value(); }
-
- bool has_exception() const
- { return fut_.has_exception(); }
-
- void wait() const
- { fut_.wait(); }
+ bool interruption_requested()
+ { return intr_.interruption_requested(); }

- template< typename Duration >
- bool timed_wait( Duration const& rel_time) const
- { return fut_.timed_wait( rel_time); }
-
- bool timed_wait_until( system_time const& abs_time) const
- { return fut_.timed_wait_until( abs_time); }
+ shared_future< R > result()
+ { return fut_; }
};

template<>
class task< void >
{
private:
- template<
- typename T1,
- typename T2
- >
- friend void wait_for_any( task< T1 > &, task< T2 > &);
- template<
- typename T1,
- typename T2,
- typename T3
- >
- friend void wait_for_any( task< T1 > &, task< T2 > &, task< T3 > &);
- template<
- typename T1,
- typename T2,
- typename T3,
- typename T4
- >
- friend void wait_for_any( task< T1 > &, task< T2 > &, task< T3 > &, task< T4 > &);
- template<
- typename T1,
- typename T2,
- typename T3,
- typename T4,
- typename T5
- >
- friend void wait_for_any( task< T1 > &, task< T2 > &, task< T3 > &, task< T4 > &, task< T5 > &);
- template<
- typename T1,
- typename T2
- >
- friend void wait_for_all( task< T1 > &, task< T2 > &);
- template<
- typename T1,
- typename T2,
- typename T3
- >
- friend void wait_for_all( task< T1 > &, task< T2 > &, task< T3 > &);
- template<
- typename T1,
- typename T2,
- typename T3,
- typename T4
- >
- friend void wait_for_all( task< T1 > &, task< T2 > &, task< T3 > &, task< T4 > &);
- template<
- typename T1,
- typename T2,
- typename T3,
- typename T4,
- typename T5
- >
- friend void wait_for_all( task< T1 > &, task< T2 > &, task< T3 > &, task< T4 > &, task< T5 > &);
-
- jss::shared_future< void > fut_;
- detail::interrupter intr_;
+ shared_future< void > fut_;
+ detail::interrupter intr_;

public:
 task(
- jss::shared_future< void > const& fut,
+ shared_future< void > const& fut,
 detail::interrupter const& intr)
 :
 fut_( fut),
@@ -202,99 +81,13 @@
 void interrupt_and_wait( Duration const& rel_time)
 { intr_.interrupt_and_wait( rel_time); }

- bool interrupt_requested()
- { return intr_.interrupt_requested(); }
-
- void get()
- { fut_.get(); }
-
- bool is_ready() const
- { return fut_.is_ready(); }
-
- bool has_value() const
- { return fut_.has_value(); }
-
- bool has_exception() const
- { return fut_.has_exception(); }
-
- void wait() const
- { fut_.wait(); }
-
- template< typename Duration >
- bool timed_wait( Duration const& rel_time) const
- { return fut_.timed_wait( rel_time); }
+ bool interruption_requested()
+ { return intr_.interruption_requested(); }

- bool timed_wait_until( system_time const& abs_time) const
- { return fut_.timed_wait_until( abs_time); }
+ shared_future< void > result()
+ { return fut_; }
};

-template<
- typename T1,
- typename T2
->
-void wait_for_all( task< T1 > & t1, task< T2 > & t2)
-{ jss::wait_for_all( t1.fut_, t2.fut_); };
-
-template<
- typename T1,
- typename T2,
- typename T3
->
-void wait_for_all( task< T1 > & t1, task< T2 > & t2, task< T3 > & t3)
-{ jss::wait_for_all( t1.fut_, t2.fut_, t3.fut_); };
-
-template<
- typename T1,
- typename T2,
- typename T3,
- typename T4
->
-void wait_for_all( task< T1 > & t1, task< T2 > & t2, task< T3 > & t3, task< T4 > & t4)
-{ jss::wait_for_all( t1.fut_, t2.fut_, t3.fut_, t4.fut_); };
-
-template<
- typename T1,
- typename T2,
- typename T3,
- typename T4,
- typename T5
->
-void wait_for_all( task< T1 > & t1, task< T2 > & t2, task< T3 > & t3, task< T4 > & t4, task< T5 > & t5)
-{ jss::wait_for_all( t1.fut_, t2.fut_, t3.fut_, t4.fut_, t5.fut_); };
-
-template<
- typename T1,
- typename T2
->
-void wait_for_any( task< T1 > & t1, task< T2 > & t2)
-{ jss::wait_for_any( t1.fut_, t2.fut_); };
-
-template<
- typename T1,
- typename T2,
- typename T3
->
-void wait_for_any( task< T1 > & t1, task< T2 > & t2, task< T3 > & t3)
-{ jss::wait_for_any( t1.fut_, t2.fut_, t3.fut_); };
-
-template<
- typename T1,
- typename T2,
- typename T3,
- typename T4
->
-void wait_for_any( task< T1 > & t1, task< T2 > & t2, task< T3 > & t3, task< T4 > & t4)
-{ jss::wait_for_any( t1.fut_, t2.fut_, t3.fut_, t4.fut_); };
-
-template<
- typename T1,
- typename T2,
- typename T3,
- typename T4,
- typename T5
->
-void wait_for_any( task< T1 > & t1, task< T2 > & t2, task< T3 > & t3, task< T4 > & t4, task< T5 > & t5)
-{ jss::wait_for_any( t1.fut_, t2.fut_, t3.fut_, t4.fut_, t5.fut_); };
} }

#endif // BOOST_TP_TASK_H

Modified: sandbox/threadpool/libs/tp/doc/forkjoin.qbk
==============================================================================
--- sandbox/threadpool/libs/tp/doc/forkjoin.qbk (original)
+++ sandbox/threadpool/libs/tp/doc/forkjoin.qbk 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -44,7 +44,7 @@
 & fibo::par_,
 boost::ref( * this),
 n - 2) ) );
- return t1.get() + t2.get();
+ return t1.result().get() + t2.result().get();
 }
 }

@@ -85,7 +85,7 @@
 std::vector< tp::task< int > >::iterator i( results.begin() );
 i != e;
 ++i)
- std::cout << "fibonacci " << k++ << " == " << i->get() << std::endl;
+ std::cout << "fibonacci " << k++ << " == " << i->result().get() << std::endl;

 pt::ptime stop( pt::microsec_clock::universal_time() );
 std::cout << ( stop - start).total_milliseconds() << " milli seconds" << std::endl;

Modified: sandbox/threadpool/libs/tp/doc/html/boost_threadpool/channel.html
==============================================================================
--- sandbox/threadpool/libs/tp/doc/html/boost_threadpool/channel.html (original)
+++ sandbox/threadpool/libs/tp/doc/html/boost_threadpool/channel.html 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -34,7 +34,7 @@
 action is put in.
 
<a name="boost_threadpool.channel.bounded_channel"></a><h4>
-<a name="id372152"></a>
+<a name="id372093"></a>
 <a class="link" href="channel.html#boost_threadpool.channel.bounded_channel">bounded channel</a>
 </h4>
<pre class="programlisting">template< typename SchedulingPolicy > class bounded_channel
@@ -52,7 +52,7 @@
 tasks reaches low watermark.
 
<a name="boost_threadpool.channel.unbounded_channel"></a><h4>
-<a name="id372266"></a>
+<a name="id372209"></a>
 <a class="link" href="channel.html#boost_threadpool.channel.unbounded_channel">unbounded channel</a>
 </h4>
<pre class="programlisting">template< typename SchedulingPolicy > class unbounded_channel

Modified: sandbox/threadpool/libs/tp/doc/html/boost_threadpool/forkjoin.html
==============================================================================
--- sandbox/threadpool/libs/tp/doc/html/boost_threadpool/forkjoin.html (original)
+++ sandbox/threadpool/libs/tp/doc/html/boost_threadpool/forkjoin.html 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -72,7 +72,7 @@
 & fibo::par_,
 boost::ref( * this),
 n - 2) ) );
- return t1.get() + t2.get();
+ return t1.result().get() + t2.result().get();
 }
 }

@@ -113,7 +113,7 @@
 std::vector< tp::task< int > >::iterator i( results.begin() );
 i != e;
 ++i)
- std::cout << "fibonacci " << k++ << " == " << i->get() << std::endl;
+ std::cout << "fibonacci " << k++ << " == " << i->result().get() << std::endl;

 pt::ptime stop( pt::microsec_clock::universal_time() );
 std::cout << ( stop - start).total_milliseconds() << " milli seconds" << std::endl;
@@ -162,7 +162,7 @@
 & fibo::par_,
 boost::ref( * this),
 n - 2) ) );
- return t1.get() + t2.get();
+ return t1.result().get() + t2.result().get();
 }
 }

@@ -203,7 +203,7 @@
 std::vector< tp::task< int > >::iterator i( results.begin() );
 i != e;
 ++i)
- std::cout << "fibonacci " << k++ << " == " << i->get() << std::endl;
+ std::cout << "fibonacci " << k++ << " == " << i->result().get() << std::endl;

 pt::ptime stop( pt::microsec_clock::universal_time() );
 std::cout << ( stop - start).total_milliseconds() << " milli seconds" << std::endl;
@@ -249,7 +249,7 @@
 & fibo::par_,
 boost::ref( * this),
 n - 2) ) );
- return t1.get() + t2.get();
+ return t1.result().get() + t2.result().get();
 }
 }

@@ -290,7 +290,7 @@
 std::vector< tp::task< int > >::iterator i( results.begin() );
 i != e;
 ++i)
- std::cout << "fibonacci " << k++ << " == " << i->get() << std::endl;
+ std::cout << "fibonacci " << k++ << " == " << i->result().get() << std::endl;

 pt::ptime stop( pt::microsec_clock::universal_time() );
 std::cout << ( stop - start).total_milliseconds() << " milli seconds" << std::endl;
@@ -331,7 +331,7 @@
 & fibo::par_,
 boost::ref( * this),
 n - 2) ) );
- return t1.get() + t2.get();
+ return t1.result().get() + t2.result().get();
 }
 }

@@ -372,7 +372,7 @@
 std::vector< tp::task< int > >::iterator i( results.begin() );
 i != e;
 ++i)
- std::cout << "fibonacci " << k++ << " == " << i->get() << std::endl;
+ std::cout << "fibonacci " << k++ << " == " << i->result().get() << std::endl;

 pt::ptime stop( pt::microsec_clock::universal_time() );
 std::cout << ( stop - start).total_milliseconds() << " milli seconds" << std::endl;
@@ -408,7 +408,7 @@
 & fibo::par_,
 boost::ref( * this),
 n - 2) ) );
- return t1.get() + t2.get();
+ return t1.result().get() + t2.result().get();
 }
 }

@@ -449,7 +449,7 @@
 std::vector< tp::task< int > >::iterator i( results.begin() );
 i != e;
 ++i)
- std::cout << "fibonacci " << k++ << " == " << i->get() << std::endl;
+ std::cout << "fibonacci " << k++ << " == " << i->result().get() << std::endl;

 pt::ptime stop( pt::microsec_clock::universal_time() );
 std::cout << ( stop - start).total_milliseconds() << " milli seconds" << std::endl;
@@ -470,7 +470,8 @@
 pooltype >().submit( boost::bind( & fibo::par,
 boost::ref( * this), n - 1) ) ); tp::task< int > t2( boost::this_task::get_thread_pool<
 pooltype >().submit( boost::bind( & fibo::par,
- boost::ref( * this), n - 2) ) ); return t1.get() + t2.get(); } }
+ boost::ref( * this), n - 2) ) ); return t1.result().get() + t2.result().get();
+ } }
 
<pre class="programlisting">public:
 fibo( int offset)
@@ -509,7 +510,7 @@
 std::vector< tp::task< int > >::iterator i( results.begin() );
 i != e;
 ++i)
- std::cout << "fibonacci " << k++ << " == " << i->get() << std::endl;
+ std::cout << "fibonacci " << k++ << " == " << i->result().get() << std::endl;

 pt::ptime stop( pt::microsec_clock::universal_time() );
 std::cout << ( stop - start).total_milliseconds() << " milli seconds" << std::endl;
@@ -559,7 +560,7 @@
 std::vector< tp::task< int > >::iterator i( results.begin() );
 i != e;
 ++i)
- std::cout << "fibonacci " << k++ << " == " << i->get() << std::endl;
+ std::cout << "fibonacci " << k++ << " == " << i->result().get() << std::endl;

 pt::ptime stop( pt::microsec_clock::universal_time() );
 std::cout << ( stop - start).total_milliseconds() << " milli seconds" << std::endl;
@@ -602,7 +603,7 @@
 std::vector< tp::task< int > >::iterator i( results.begin() );
 i != e;
 ++i)
- std::cout << "fibonacci " << k++ << " == " << i->get() << std::endl;
+ std::cout << "fibonacci " << k++ << " == " << i->result().get() << std::endl;

 pt::ptime stop( pt::microsec_clock::universal_time() );
 std::cout << ( stop - start).total_milliseconds() << " milli seconds" << std::endl;
@@ -638,7 +639,7 @@
 std::vector< tp::task< int > >::iterator i( results.begin() );
 i != e;
 ++i)
- std::cout << "fibonacci " << k++ << " == " << i->get() << std::endl;
+ std::cout << "fibonacci " << k++ << " == " << i->result().get() << std::endl;

 pt::ptime stop( pt::microsec_clock::universal_time() );
 std::cout << ( stop - start).total_milliseconds() << " milli seconds" << std::endl;
@@ -670,7 +671,7 @@
 std::vector< tp::task< int > >::iterator i( results.begin() );
 i != e;
 ++i)
- std::cout << "fibonacci " << k++ << " == " << i->get() << std::endl;
+ std::cout << "fibonacci " << k++ << " == " << i->result().get() << std::endl;

 pt::ptime stop( pt::microsec_clock::universal_time() );
 std::cout << ( stop - start).total_milliseconds() << " milli seconds" << std::endl;
@@ -695,7 +696,7 @@
 std::vector< tp::task< int > >::iterator i( results.begin() );
 i != e;
 ++i)
- std::cout << "fibonacci " << k++ << " == " << i->get() << std::endl;
+ std::cout << "fibonacci " << k++ << " == " << i->result().get() << std::endl;

 pt::ptime stop( pt::microsec_clock::universal_time() );
 std::cout << ( stop - start).total_milliseconds() << " milli seconds" << std::endl;
@@ -714,7 +715,7 @@
 int k = 0; std::vector< tp::task< int > >::iterator e( results.end()
 ); for ( std::vector< tp::task< int > >::iterator i( results.begin()
 ); i != e; ++i) std::cout << "fibonacci " << k++ <<
- " == " << i->get() << std::endl;
+ " == " << i->result().get() << std::endl;
 
<pre class="programlisting"> pt::ptime stop( pt::microsec_clock::universal_time() );
 std::cout << ( stop - start).total_milliseconds() << " milli seconds" << std::endl;

Modified: sandbox/threadpool/libs/tp/doc/html/boost_threadpool/pool.html
==============================================================================
--- sandbox/threadpool/libs/tp/doc/html/boost_threadpool/pool.html (original)
+++ sandbox/threadpool/libs/tp/doc/html/boost_threadpool/pool.html 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -200,11 +200,11 @@

pool.shutdown();

-std::cout << t1.get() << std::endl; // 55
-std::cout << t2.get() << std::endl; // 55
+std::cout << t1.result().get() << std::endl; // 55
+std::cout << t2.result().get() << std::endl; // 55
</pre>
<a name="boost_threadpool.pool.shutdown_immediatly"></a><h4>
-<a name="id368828"></a>
+<a name="id368845"></a>
 <a class="link" href="pool.html#boost_threadpool.pool.shutdown_immediatly">Shutdown immediatly</a>
 </h4>

@@ -225,7 +225,7 @@
 </td></tr>
</table></div>
<a name="boost_threadpool.pool.meta_functions"></a><h4>
-<a name="id368961"></a>
+<a name="id368978"></a>
 <a class="link" href="pool.html#boost_threadpool.pool.meta_functions">Meta functions</a>
 </h4>

@@ -249,7 +249,7 @@
<pre class="programlisting">std::cout << std::boolalpha << boost::tp::has_fibers< pool_type >::value << std::endl;
</pre>
<a name="boost_threadpool.pool.processor_binding"></a><h4>
-<a name="id369535"></a>
+<a name="id369552"></a>
 <a class="link" href="pool.html#boost_threadpool.pool.processor_binding">Processor binding</a>
 </h4>

Modified: sandbox/threadpool/libs/tp/doc/html/boost_threadpool/reference.html
==============================================================================
--- sandbox/threadpool/libs/tp/doc/html/boost_threadpool/reference.html (original)
+++ sandbox/threadpool/libs/tp/doc/html/boost_threadpool/reference.html 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -28,10 +28,6 @@
<div class="toc"><dl>
<dt> Class template pool</dt>
<dt> Class template task</dt>
-<dt><a href="reference.html#boost_threadpool.reference.wait_for_all"> Non-member
- function <code class="computeroutput">wait_for_all</code></a></dt>
-<dt><a href="reference.html#boost_threadpool.reference.wait_for_any"> Non-member
- function <code class="computeroutput">wait_for_any</code></a></dt>
<dt><a href="reference.html#boost_threadpool.reference.reschedule_until"> Non-member
 function <code class="computeroutput">reschedule_until</code></a></dt>
<dt><a href="reference.html#boost_threadpool.reference.get_thread_pool"> Non-member
@@ -762,20 +758,8 @@
 function <code class="computeroutput">interrupt()</code></a></dt>
<dt><a href="reference.html#boost_threadpool.reference.task.interrupt_and_wait">
 Member function <code class="computeroutput">interrupt_and_wait()</code></a></dt>
-<dt><a href="reference.html#boost_threadpool.reference.task.get"> Member function
- <code class="computeroutput">get()</code></a></dt>
-<dt><a href="reference.html#boost_threadpool.reference.task.is_read"> Member function
- <code class="computeroutput">is_ready()</code></a></dt>
-<dt><a href="reference.html#boost_threadpool.reference.task.has_value"> Member
- function <code class="computeroutput">has_value()</code></a></dt>
-<dt><a href="reference.html#boost_threadpool.reference.task.has_exception"> Member
- function <code class="computeroutput">has_exception()</code></a></dt>
-<dt><a href="reference.html#boost_threadpool.reference.task.wait"> Member function
- <code class="computeroutput">wait()</code></a></dt>
-<dt><a href="reference.html#boost_threadpool.reference.task.timed_wait"> Member
- function <code class="computeroutput">timed_wait()</code></a></dt>
-<dt><a href="reference.html#boost_threadpool.reference.task.timed_wait_until">
- Member function <code class="computeroutput">timed_wait_until()</code></a></dt>
+<dt><a href="reference.html#boost_threadpool.reference.task.result"> Member function
+ <code class="computeroutput">result()</code></a></dt>
</dl></div>
<pre class="programlisting">#include <boost/tp/task.hpp>

@@ -786,7 +770,7 @@
 template< typename Pool >
 task(
 Pool * pool,
- future< R > const& fut,
+ shared_future< R > const& fut,
 detail::interrupter const& intr);

 void interrupt();
@@ -796,16 +780,7 @@
 void interrupt_and_wait( Duration const& rel_time);
 bool interrupt_requested();

- R get() const;
-
- bool is_ready() const;
- bool has_value() const;
- bool has_exception() const;
-
- void wait() const;
- template< typename Duration >
- bool timed_wait( Duration const& rel_time) const;
- bool timed_wait_until( system_time const& abs_time) const;
+ shared_future< R > result() const;
};
</pre>
<div class="section" lang="en">
@@ -815,7 +790,7 @@
<pre class="programlisting">template< typename Pool >
task(
 Pool * pool,
- future< R > const& fut,
+ shared_future< R > const& fut,
 detail::interrupter const& intr);
</pre>
<div class="variablelist">
@@ -892,17 +867,17 @@
</div>
<div class="section" lang="en">
<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_threadpool.reference.task.get"></a><a class="link" href="reference.html#boost_threadpool.reference.task.get" title="Member function get()"> Member function
- <code class="computeroutput">get()</code></a>
+<a name="boost_threadpool.reference.task.result"></a><a class="link" href="reference.html#boost_threadpool.reference.task.result" title="Member function result()"> Member function
+ <code class="computeroutput">result()</code></a>
</h4></div></div></div>
-<pre class="programlisting">R get() const;
+<pre class="programlisting">shared_future< R > result() const;
</pre>
<div class="variablelist">

<dl>
<dt>Effects:</dt>
<dd>
- Returns fulfilled value or throws fulfilled exception.
+ Returns fulfilled value or throws fulfilled exception via a shared_future.
 </dd>
<dt>Throws:</dt>
<dd>
@@ -911,204 +886,6 @@
</dl>
</div>
</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_threadpool.reference.task.is_read"></a><a class="link" href="reference.html#boost_threadpool.reference.task.is_read" title="Member function is_ready()"> Member function
- <code class="computeroutput">is_ready()</code></a>
-</h4></div></div></div>
-<pre class="programlisting">bool is_ready() const;
-</pre>
-<div class="variablelist">
-
-<dl>
-<dt>Effects:</dt>
-<dd>
- Queries if the action has been fulfilled.
- </dd>
-<dt>Throws:</dt>
-<dd>
- Nothing
- </dd>
-</dl>
-</div>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_threadpool.reference.task.has_value"></a><a class="link" href="reference.html#boost_threadpool.reference.task.has_value" title="Member function has_value()"> Member
- function <code class="computeroutput">has_value()</code></a>
-</h4></div></div></div>
-<pre class="programlisting">bool has_value() const;
-</pre>
-<div class="variablelist">
-
-<dl>
-<dt>Effects:</dt>
-<dd>
- Queries if the action has been fulfilled (is ready) and has a value.
- </dd>
-<dt>Throws:</dt>
-<dd>
- Nothing
- </dd>
-</dl>
-</div>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_threadpool.reference.task.has_exception"></a><a class="link" href="reference.html#boost_threadpool.reference.task.has_exception" title="Member function has_exception()"> Member
- function <code class="computeroutput">has_exception()</code></a>
-</h4></div></div></div>
-<pre class="programlisting">bool has_exception() const;
-</pre>
-<div class="variablelist">
-
-<dl>
-<dt>Effects:</dt>
-<dd>
- Queries if the action has been fulfilled (is ready) and has an exception.
- </dd>
-<dt>Throws:</dt>
-<dd>
- Nothing
- </dd>
-</dl>
-</div>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_threadpool.reference.task.wait"></a><a class="link" href="reference.html#boost_threadpool.reference.task.wait" title="Member function wait()"> Member function
- <code class="computeroutput">wait()</code></a>
-</h4></div></div></div>
-<pre class="programlisting">void wait() const;
-</pre>
-<div class="variablelist">
-
-<dl>
-<dt>Effects:</dt>
-<dd>
- Waits until the result is ready.
- </dd>
-<dt>Throws:</dt>
-<dd>
- Throws thread_interrupted if the result is not ready at the point of
- the call, and the current thread is interrupted.
- </dd>
-</dl>
-</div>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_threadpool.reference.task.timed_wait"></a><a class="link" href="reference.html#boost_threadpool.reference.task.timed_wait" title="Member function timed_wait()"> Member
- function <code class="computeroutput">timed_wait()</code></a>
-</h4></div></div></div>
-<pre class="programlisting">template< typename Duration >
-bool timed_wait( Duration const& wait_duration);
-</pre>
-<div class="variablelist">
-
-<dl>
-<dt>Effects:</dt>
-<dd>
- Waits until the result is ready, or returns false if the time specified
- by wait_duration has elapsed.
- </dd>
-<dt>Throws:</dt>
-<dd>
- Throws thread_interrupted if the result is not ready at the point of
- the call, and the current thread is interrupted.
- </dd>
-</dl>
-</div>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_threadpool.reference.task.timed_wait_until"></a><a class="link" href="reference.html#boost_threadpool.reference.task.timed_wait_until" title="Member function timed_wait_until()">
- Member function <code class="computeroutput">timed_wait_until()</code></a>
-</h4></div></div></div>
-<pre class="programlisting">bool timed_wait_until( system_time const& wait_timeout);
-</pre>
-<div class="variablelist">
-
-<dl>
-<dt>Effects:</dt>
-<dd>
- Waits until the result is ready, or returns false if the time point
- specified by wait_timeout has passed.
- </dd>
-<dt>Throws:</dt>
-<dd>
- Throws thread_interrupted if the result is not ready at the point of
- the call, and the current thread is interrupted.
- </dd>
-</dl>
-</div>
-</div>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_threadpool.reference.wait_for_all"></a><a class="link" href="reference.html#boost_threadpool.reference.wait_for_all" title="Non-member function wait_for_all"> Non-member
- function <code class="computeroutput">wait_for_all</code></a>
-</h3></div></div></div>
-<pre class="programlisting"> #include <boost/tp/task.hpp>
-
-template< typename T1, typename T2 >
-void wait_for_all( task< T1 > &, task< T2 > &);
-
-template< typename T1, typename T2, typename T3 >
-void wait_for_all( task< T1 > &, task< T2 > &, task< T3 > &);
-
-template< typename T1, typename T2, typename T3, typename T4 >
-void wait_for_all( task< T1 > &, task< T2 > &, task< T3 > &, task< T4 > &);
-
-template< typename T1, typename T2, typename T3, typename T4, typename T5 >
-void wait_for_all( task< T1 > &, task< T2 > &, task< T3 > &, task< T4 > &, task< T5 > &);
-</pre>
-<div class="variablelist">
-
-<dl>
-<dt>Effects:</dt>
-<dd>
- Waits until all specified tasks are ready.
- </dd>
-<dt>Throws:</dt>
-<dd>
- Any exceptions that might be thrown by the actions.
- </dd>
-</dl>
-</div>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_threadpool.reference.wait_for_any"></a><a class="link" href="reference.html#boost_threadpool.reference.wait_for_any" title="Non-member function wait_for_any"> Non-member
- function <code class="computeroutput">wait_for_any</code></a>
-</h3></div></div></div>
-<pre class="programlisting"> #include <boost/tp/task.hpp>
-
-template< typename T1, typename T2 >
-void wait_for_any( task< T1 > &, task< T2 > &);
-
-template< typename T1, typename T2, typename T3 >
-void wait_for_any( task< T1 > &, task< T2 > &, task< T3 > &);
-
-template< typename T1, typename T2, typename T3, typename T4 >
-void wait_for_any( task< T1 > &, task< T2 > &, task< T3 > &, task< T4 > &);
-
-template< typename T1, typename T2, typename T3, typename T4, typename T5 >
-void wait_for_any( task< T1 > &, task< T2 > &, task< T3 > &, task< T4 > &, task< T5 > &);
-</pre>
-<div class="variablelist">
-
-<dl>
-<dt>Effects:</dt>
-<dd>
- Waits until at leaste one of specified tasks is ready.
- </dd>
-<dt>Throws:</dt>
-<dd>
- Any exceptions that might be thrown by the actions.
- </dd>
-</dl>
-</div>
</div>
<div class="section" lang="en">
<div class="titlepage"><div><div><h3 class="title">
@@ -1118,7 +895,10 @@
<pre class="programlisting"> #include <boost/tp/pool.hpp>

template< typename Pool, typename R >
-void reschedule_until( jss::future< R > const&);
+void reschedule_until( boost::unique_future< R > const&);
+
+template< typename Pool, typename R >
+void reschedule_until( boost::shared_future< R > const&);
</pre>
<div class="variablelist">

Modified: sandbox/threadpool/libs/tp/doc/html/boost_threadpool/scheduling.html
==============================================================================
--- sandbox/threadpool/libs/tp/doc/html/boost_threadpool/scheduling.html (original)
+++ sandbox/threadpool/libs/tp/doc/html/boost_threadpool/scheduling.html 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -30,7 +30,7 @@
 The scheduling policy determines how actions are scheduled inside the <a class="link" href="channel.html" title="Channel">channel</a>.
 
<a name="boost_threadpool.scheduling.fifo"></a><h4>
-<a name="id372347"></a>
+<a name="id372290"></a>
 <a class="link" href="scheduling.html#boost_threadpool.scheduling.fifo">fifo</a>
 </h4>
<pre class="programlisting">struct fifo
@@ -39,7 +39,7 @@
 First inserted pending action get taken first.
 
<a name="boost_threadpool.scheduling.lifo"></a><h4>
-<a name="id372380"></a>
+<a name="id372323"></a>
 <a class="link" href="scheduling.html#boost_threadpool.scheduling.lifo">lifo</a>
 </h4>
<pre class="programlisting">struct lifo
@@ -48,7 +48,7 @@
 Last inserted pending action get taken first.
 
<a name="boost_threadpool.scheduling.priority"></a><h4>
-<a name="id372412"></a>
+<a name="id372356"></a>
 <a class="link" href="scheduling.html#boost_threadpool.scheduling.priority">priority</a>
 </h4>
<pre class="programlisting">template< typename Attr, typename Ord = std::less< Attr > > struct priority
@@ -58,7 +58,7 @@
 ordering actions.
 
<a name="boost_threadpool.scheduling.smart"></a><h4>
-<a name="id372518"></a>
+<a name="id372462"></a>
 <a class="link" href="scheduling.html#boost_threadpool.scheduling.smart">smart</a>
 </h4>
<pre class="programlisting">template< typename Attr, typename Ord, typename Enq, typename Deq > struct smart

Modified: sandbox/threadpool/libs/tp/doc/html/boost_threadpool/task.html
==============================================================================
--- sandbox/threadpool/libs/tp/doc/html/boost_threadpool/task.html (original)
+++ sandbox/threadpool/libs/tp/doc/html/boost_threadpool/task.html 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -45,10 +45,10 @@
 fibonacci_fn,
 10) ) );

-std::cout << t.get() << std::endl; // 55
+std::cout << t.result().get() << std::endl; // 55
</pre>
<a name="boost_threadpool.task.interruption"></a><h4>
-<a name="id370001"></a>
+<a name="id370026"></a>
 <a class="link" href="task.html#boost_threadpool.task.interruption">Interruption</a>
 </h4>

@@ -97,7 +97,7 @@
t.interrupt();

// throws boost::thread_interrupted exception
-std::cout << t.get() << std::endl;
+std::cout << t.result().get() << std::endl;
</pre>

 
@@ -115,20 +115,10 @@
t.interrupt_and_wait();

// throws boost::thread_interrupted exception
-std::cout << t.get() << std::endl;
+std::cout << t.result().get() << std::endl;
</pre>
-<a name="boost_threadpool.task.waiting_for_multiple_tasks"></a><h4>
-<a name="id371039"></a>
- <a class="link" href="task.html#boost_threadpool.task.waiting_for_multiple_tasks">Waiting for
- multiple tasks</a>
- </h4>
-
- It is possible to wait for multiple tasks - <code class="computeroutput">boost::tp::wait_for_all(tsk1,...,tskn)</code> blocks
- until all n tasks are ready and <code class="computeroutput">boost::tp::wait_for_any(tsk1,...,tskn)</code> blocks
- until at least one of the tasks becomes ready.
- 
<a name="boost_threadpool.task.exceptions_in_tasks"></a><h4>
-<a name="id371148"></a>
+<a name="id371080"></a>
 <a class="link" href="task.html#boost_threadpool.task.exceptions_in_tasks">Exceptions in tasks</a>
 </h4>

@@ -176,7 +166,7 @@
 boost::bind(
 throwing_fn) ) );

-std::cout << t.get() << std::endl; // will rethrow an std::runtime_error
+std::cout << t.result().get() << std::endl; // will rethrow an std::runtime_error
</pre>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: sandbox/threadpool/libs/tp/doc/html/boost_threadpool/this_task.html
==============================================================================
--- sandbox/threadpool/libs/tp/doc/html/boost_threadpool/this_task.html (original)
+++ sandbox/threadpool/libs/tp/doc/html/boost_threadpool/this_task.html 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -28,12 +28,13 @@
</h2></div></div></div>

In the function <code class="computeroutput">boost::this_task::reschedule_until(
- jss::future< R > const&)</code> allows to synchronize the task with other
- asynchronous events without blocking the worker threads. The current task will
- be rescheduled until the passed future becomes ready. The pool can be accessed
- via <code class="computeroutput">boost::this_task::get_thread_pool<
- Pool >()</code>
- if the calling code is executed by a worker thread.
+ boost::shared_future<
+ R >
+ const&)</code>
+ allows to synchronize the task with other asynchronous events without blocking
+ the worker threads. The current task will be rescheduled until the passed future
+ becomes ready. The pool can be accessed via <code class="computeroutput">boost::this_task::get_thread_pool< Pool >()</code> if the calling code is executed by a
+ worker thread.

</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: sandbox/threadpool/libs/tp/doc/html/index.html
==============================================================================
--- sandbox/threadpool/libs/tp/doc/html/index.html (original)
+++ sandbox/threadpool/libs/tp/doc/html/index.html 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -48,10 +48,6 @@
<dd><dl>
<dt> Class template pool</dt>
<dt> Class template task</dt>
-<dt><a href="boost_threadpool/reference.html#boost_threadpool.reference.wait_for_all"> Non-member
- function <code class="computeroutput">wait_for_all</code></a></dt>
-<dt><a href="boost_threadpool/reference.html#boost_threadpool.reference.wait_for_any"> Non-member
- function <code class="computeroutput">wait_for_any</code></a></dt>
<dt><a href="boost_threadpool/reference.html#boost_threadpool.reference.reschedule_until"> Non-member
function <code class="computeroutput">reschedule_until</code></a></dt>
<dt><a href="boost_threadpool/reference.html#boost_threadpool.reference.get_thread_pool"> Non-member
@@ -113,9 +109,8 @@
<th align="left">Note</th>
</tr>
<tr><td align="left" valign="top">
- Boost.Threadpool uses the futures library,
- N2561 C++0x proposal, from Anthony Williams (http://www.justsoftwaresolutions.co.uk/threading/updated-implementation-of-c++-futures-3.html)
- as an implementation detail until boost has an official future library.
+ Boost.Threadpool uses a modified version
+ of the futures library, N2561 C++0x proposal, from Anthony Williams (http://www.justsoftwaresolutions.co.uk/threading/updated-implementation-of-c++-futures-3.html).
</td></tr>
</table></div>
<a name="boost_threadpool.introduction.tested_platforms"></a><h4>
@@ -146,7 +141,7 @@
</div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left">Last revised: March 01, 2009 at 08:18:32 GMT</td>
+<td align="left">Last revised: March 02, 2009 at 20:05:56 GMT</td>
<td align="right"><div class="copyright-footer"></div></td>
</tr></table>
<hr>

Modified: sandbox/threadpool/libs/tp/doc/introduction.qbk
==============================================================================
--- sandbox/threadpool/libs/tp/doc/introduction.qbk (original)
+++ sandbox/threadpool/libs/tp/doc/introduction.qbk 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -19,8 +19,7 @@
which includes all the other headers in turn.

[note
-__boost_threadpool__ uses the futures library, N2561 C++0x proposal, from Anthony Williams ([@http://www.justsoftwaresolutions.co.uk/threading/updated-implementation-of-c++-futures-3.html]) as an implementation detail until boost has
-an official future library.]
+__boost_threadpool__ uses a modified version of the futures library, N2561 C++0x proposal, from Anthony Williams ([@http://www.justsoftwaresolutions.co.uk/threading/updated-implementation-of-c++-futures-3.html]).]

[heading Tested Platforms]
__boost_threadpool__ has been tested on the following compilers/platforms:

Modified: sandbox/threadpool/libs/tp/doc/pool.qbk
==============================================================================
--- sandbox/threadpool/libs/tp/doc/pool.qbk (original)
+++ sandbox/threadpool/libs/tp/doc/pool.qbk 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -78,8 +78,8 @@

pool.shutdown();

- std::cout << t1.get() << std::endl; // 55
- std::cout << t2.get() << std::endl; // 55
+ std::cout << t1.result().get() << std::endl; // 55
+ std::cout << t2.result().get() << std::endl; // 55

[heading Shutdown immediatly]
The function `boost::tp::pool< Channel >::shutdown_now()` sets the pool status to ['terminating] interrupts and then joins all __worker_threads__. After the __worker_threads__ are joined the status of the pool is set to ['terminated] and all pending (unprocessed) __actions__ will be returned.
@@ -112,3 +112,4 @@
The code above will create a pool with two __worker_threads__ on a dual core system (each bound to one core).

[endsect]
+

Modified: sandbox/threadpool/libs/tp/doc/reference.qbk
==============================================================================
--- sandbox/threadpool/libs/tp/doc/reference.qbk (original)
+++ sandbox/threadpool/libs/tp/doc/reference.qbk 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -9,7 +9,6 @@

[include pool_ref.qbk]
[include task_ref.qbk]
-[include wait_ref.qbk]
[include this_task_ref.qbk]
[include poolsize_ref.qbk]
[include scanns_ref.qbk]

Modified: sandbox/threadpool/libs/tp/doc/task.qbk
==============================================================================
--- sandbox/threadpool/libs/tp/doc/task.qbk (original)
+++ sandbox/threadpool/libs/tp/doc/task.qbk 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -21,7 +21,7 @@
 fibonacci_fn,
 10) ) );

- std::cout << t.get() << std::endl; // 55
+ std::cout << t.result().get() << std::endl; // 55

[heading Interruption]
@@ -57,7 +57,7 @@
 t.interrupt();

 // throws boost::thread_interrupted exception
- std::cout << t.get() << std::endl;
+ std::cout << t.result().get() << std::endl;
``

 boost::tp::pool<
@@ -74,11 +74,7 @@
 t.interrupt_and_wait();

 // throws boost::thread_interrupted exception
- std::cout << t.get() << std::endl;
-
-[heading Waiting for multiple tasks]
-It is possible to wait for multiple tasks - `boost::tp::wait_for_all(tsk1,...,tskn)` blocks until all n tasks are ready and
-`boost::tp::wait_for_any(tsk1,...,tskn)` blocks until at least one of the tasks becomes ready.
+ std::cout << t.result().get() << std::endl;

[heading Exceptions in tasks]
Exceptions thrown inside an __action__ are transported by the associated task object.
@@ -121,6 +117,6 @@
 boost::bind(
 throwing_fn) ) );

- std::cout << t.get() << std::endl; // will rethrow an std::runtime_error
+ std::cout << t.result().get() << std::endl; // will rethrow an std::runtime_error

[endsect]

Modified: sandbox/threadpool/libs/tp/doc/task_ref.qbk
==============================================================================
--- sandbox/threadpool/libs/tp/doc/task_ref.qbk (original)
+++ sandbox/threadpool/libs/tp/doc/task_ref.qbk 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -16,7 +16,7 @@
 template< typename Pool >
 task(
 Pool * pool,
- future< R > const& fut,
+ shared_future< R > const& fut,
 detail::interrupter const& intr);

 void interrupt();
@@ -26,16 +26,7 @@
 void interrupt_and_wait( Duration const& rel_time);
 bool interrupt_requested();

- R get() const;
-
- bool is_ready() const;
- bool has_value() const;
- bool has_exception() const;
-
- void wait() const;
- template< typename Duration >
- bool timed_wait( Duration const& rel_time) const;
- bool timed_wait_until( system_time const& abs_time) const;
+ shared_future< R > result() const;
 };

[section:constructor Constructor]
@@ -43,7 +34,7 @@
 template< typename Pool >
 task(
 Pool * pool,
- future< R > const& fut,
+ shared_future< R > const& fut,
 detail::interrupter const& intr);

[variablelist
@@ -81,82 +72,15 @@
[endsect]

-[section:get Member function `get()`]
+[section:result Member function `result()`]

- R get() const;
+ shared_future< R > result() const;

[variablelist
-[[Effects:] [Returns fulfilled value or throws fulfilled exception.]]
+[[Effects:] [Returns fulfilled value or throws fulfilled exception via a shared_future.]]
[[Throws:] [`boost::future::broken_promise`]]
]
[endsect]

-[section:is_read Member function `is_ready()`]
-
- bool is_ready() const;
-
-[variablelist
-[[Effects:] [Queries if the __action__ has been fulfilled.]]
-[[Throws:] [Nothing]]
-]
-[endsect]
-
-
-[section:has_value Member function `has_value()`]
-
- bool has_value() const;
-
-[variablelist
-[[Effects:] [Queries if the __action__ has been fulfilled (is ready) and has a value.]]
-[[Throws:] [Nothing]]
-]
-[endsect]
-
-
-[section:has_exception Member function `has_exception()`]
-
- bool has_exception() const;
-
-[variablelist
-[[Effects:] [Queries if the __action__ has been fulfilled (is ready) and has an exception.]]
-[[Throws:] [Nothing]]
-]
-[endsect]
-
-
-[section:wait Member function `wait()`]
-
- void wait() const;
-
-[variablelist
-[[Effects:] [Waits until the result is ready.]]
-[[Throws:] [Throws thread_interrupted if the result is not ready at the point of the call, and the current thread is interrupted.]]
-]
-[endsect]
-
-
-[section:timed_wait Member function `timed_wait()`]
-
- template< typename Duration >
- bool timed_wait( Duration const& wait_duration);
-
-[variablelist
-[[Effects:] [Waits until the result is ready, or returns false if the time specified by wait_duration has elapsed.]]
-[[Throws:] [Throws thread_interrupted if the result is not ready at the point of the call, and the current thread is interrupted.]]
-]
-[endsect]
-
-
-[section:timed_wait_until Member function `timed_wait_until()`]
-
- bool timed_wait_until( system_time const& wait_timeout);
-
-[variablelist
-[[Effects:] [Waits until the result is ready, or returns false if the time point specified by wait_timeout has passed.]]
-[[Throws:] [Throws thread_interrupted if the result is not ready at the point of the call, and the current thread is interrupted.]]
-]
-[endsect]
-
-
[endsect]

Modified: sandbox/threadpool/libs/tp/doc/this_task.qbk
==============================================================================
--- sandbox/threadpool/libs/tp/doc/this_task.qbk (original)
+++ sandbox/threadpool/libs/tp/doc/this_task.qbk 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -6,7 +6,7 @@
]

[section:this_task Namespace this_task]
-In the function `boost::this_task::reschedule_until( jss::future< R > const&)` allows to synchronize the task with other
+In the function `boost::this_task::reschedule_until( boost::shared_future< R > const&)` allows to synchronize the task with other
asynchronous events without blocking the __worker_threads__. The current task will be rescheduled until the passed future
becomes ready.
The pool can be accessed via `boost::this_task::get_thread_pool< Pool >()` if the calling code is executed by a __worker_thread__.

Modified: sandbox/threadpool/libs/tp/doc/this_task_ref.qbk
==============================================================================
--- sandbox/threadpool/libs/tp/doc/this_task_ref.qbk (original)
+++ sandbox/threadpool/libs/tp/doc/this_task_ref.qbk 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -10,7 +10,10 @@
#include <boost/tp/pool.hpp>

template< typename Pool, typename R >
- void reschedule_until( jss::future< R > const&);
+ void reschedule_until( boost::unique_future< R > const&);
+
+ template< typename Pool, typename R >
+ void reschedule_until( boost::shared_future< R > const&);

[variablelist
[[Effects:] [Reschedules current task until passed future becomes ready.]

Deleted: sandbox/threadpool/libs/tp/doc/wait_ref.qbk
==============================================================================
--- sandbox/threadpool/libs/tp/doc/wait_ref.qbk 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
+++ (empty file)
@@ -1,53 +0,0 @@
-[/
- (C) Copyright 2008 Oliver Kowalke.
- 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).
-]
-
-[section:wait_for_all Non-member function `wait_for_all`]
-
- #include <boost/tp/task.hpp>
-
- template< typename T1, typename T2 >
- void wait_for_all( task< T1 > &, task< T2 > &);
-
- template< typename T1, typename T2, typename T3 >
- void wait_for_all( task< T1 > &, task< T2 > &, task< T3 > &);
-
- template< typename T1, typename T2, typename T3, typename T4 >
- void wait_for_all( task< T1 > &, task< T2 > &, task< T3 > &, task< T4 > &);
-
- template< typename T1, typename T2, typename T3, typename T4, typename T5 >
- void wait_for_all( task< T1 > &, task< T2 > &, task< T3 > &, task< T4 > &, task< T5 > &);
-
-[variablelist
-[[Effects:] [Waits until all specified tasks are ready.]]
-[[Throws:] [Any exceptions that might be thrown by the actions.]]
-]
-
-[endsect]
-
-
-[section:wait_for_any Non-member function `wait_for_any`]
-
- #include <boost/tp/task.hpp>
-
- template< typename T1, typename T2 >
- void wait_for_any( task< T1 > &, task< T2 > &);
-
- template< typename T1, typename T2, typename T3 >
- void wait_for_any( task< T1 > &, task< T2 > &, task< T3 > &);
-
- template< typename T1, typename T2, typename T3, typename T4 >
- void wait_for_any( task< T1 > &, task< T2 > &, task< T3 > &, task< T4 > &);
-
- template< typename T1, typename T2, typename T3, typename T4, typename T5 >
- void wait_for_any( task< T1 > &, task< T2 > &, task< T3 > &, task< T4 > &, task< T5 > &);
-
-[variablelist
-[[Effects:] [Waits until at leaste one of specified tasks is ready.]]
-[[Throws:] [Any exceptions that might be thrown by the actions.]]
-]
-
-[endsect]

Modified: sandbox/threadpool/libs/tp/examples/fork_join.cpp
==============================================================================
--- sandbox/threadpool/libs/tp/examples/fork_join.cpp (original)
+++ sandbox/threadpool/libs/tp/examples/fork_join.cpp 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -44,7 +44,7 @@
 & fibo::par_,
 boost::ref( * this),
 n - 2) ) );
- return t1.get() + t2.get();
+ return t1.result().get() + t2.result().get();
 }
 }

@@ -85,7 +85,7 @@
 std::vector< tp::task< int > >::iterator i( results.begin() );
 i != e;
 ++i)
- std::cout << "fibonacci " << k++ << " == " << i->get() << std::endl;
+ std::cout << "fibonacci " << k++ << " == " << i->result().get() << std::endl;

 pt::ptime stop( pt::microsec_clock::universal_time() );
 std::cout << ( stop - start).total_milliseconds() << " milli seconds" << std::endl;

Modified: sandbox/threadpool/libs/tp/examples/interrupt.cpp
==============================================================================
--- sandbox/threadpool/libs/tp/examples/interrupt.cpp (original)
+++ sandbox/threadpool/libs/tp/examples/interrupt.cpp 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -54,7 +54,7 @@
 fibonacci_fn,
 10) ) );
 t.interrupt();
- std::cout << t.get() << std::endl;
+ std::cout << t.result().get() << std::endl;

 return EXIT_SUCCESS;
 }

Modified: sandbox/threadpool/libs/tp/examples/pending.cpp
==============================================================================
--- sandbox/threadpool/libs/tp/examples/pending.cpp (original)
+++ sandbox/threadpool/libs/tp/examples/pending.cpp 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -52,7 +52,7 @@
 fibonacci_fn,
 10) ) );
 std::cout << "pending tasks == " << pool.pending() << std::endl;
- std::cout << t.get() << std::endl;
+ std::cout << t.result().get() << std::endl;

 return EXIT_SUCCESS;
 }

Added: sandbox/threadpool/libs/tp/examples/reschedule_until.cpp
==============================================================================
--- (empty file)
+++ sandbox/threadpool/libs/tp/examples/reschedule_until.cpp 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -0,0 +1,119 @@
+#include <iostream>
+#include <cstdlib>
+#include <stdexcept>
+#include <vector>
+
+#include <boost/bind.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/interprocess/sync/interprocess_semaphore.hpp>
+#include <boost/thread.hpp>
+
+#include "boost/tp/fifo.hpp"
+#include "boost/tp/pool.hpp"
+#include "boost/tp/poolsize.hpp"
+#include "boost/tp/unbounded_channel.hpp"
+
+namespace pt = boost::posix_time;
+namespace tp = boost::tp;
+
+typedef tp::pool< tp::unbounded_channel< tp::fifo > > pool_type;
+
+class fibo
+{
+private:
+ jss::shared_future< void > f_;
+ int offset_;
+
+ int seq_( int n)
+ {
+ if ( n <= 1) return n;
+ else return seq_( n - 2) + seq_( n - 1);
+ }
+
+ int par_( int n)
+ {
+ if ( n <= offset_) return seq_( n);
+ else
+ {
+ if ( n == 7)
+ boost::this_task::reschedule_until< pool_type >( f_);
+
+ boost::function< int() > fn1 = boost::bind(
+ & fibo::par_,
+ * this,
+ n - 1);
+ tp::task< int > t1(
+ boost::this_task::get_thread_pool< pool_type >().submit(
+ fn1) );
+ boost::function< int() > fn2 = boost::bind(
+ & fibo::par_,
+ * this,
+ n - 2);
+ tp::task< int > t2(
+ boost::this_task::get_thread_pool< pool_type >().submit(
+ fn2) );
+
+ return t1.get() + t2.get();
+ }
+ }
+
+public:
+ fibo(
+ jss::shared_future< void > f,
+ int offset)
+ : f_( f), offset_( offset)
+ {}
+
+ int execute( int n)
+ {
+ int result( par_( n) );
+ return result;
+ }
+};
+
+void f() {}
+
+int main( int argc, char *argv[])
+{
+ try
+ {
+ pool_type pool( tp::poolsize( 1) );
+ jss::packaged_task< void > tsk( boost::bind( f) );
+ jss::shared_future< void > f( tsk.get_future() );
+ fibo fib( f, 3);
+ std::vector< tp::task< int > > results;
+ results.reserve( 40);
+
+ pt::ptime start( pt::microsec_clock::universal_time() );
+
+ for ( int i = 0; i < 10; ++i)
+ results.push_back(
+ pool.submit(
+ boost::bind(
+ & fibo::execute,
+ boost::ref( fib),
+ i) ) );
+
+ ::sleep( 1);
+ tsk();
+
+ int k = 0;
+ std::vector< tp::task< int > >::iterator e( results.end() );
+ for (
+ std::vector< tp::task< int > >::iterator i( results.begin() );
+ i != e;
+ ++i)
+ std::cout << "fibonacci " << k++ << " == " << i->get() << std::endl;
+
+ pt::ptime stop( pt::microsec_clock::universal_time() );
+ std::cout << ( stop - start).total_milliseconds() << " milli seconds" << std::endl;
+
+ return EXIT_SUCCESS;
+ }
+ catch ( std::exception const& e)
+ { std::cerr << "exception: " << e.what() << std::endl; }
+ catch ( ... )
+ { std::cerr << "unhandled" << std::endl; }
+
+ return EXIT_FAILURE;
+}

Modified: sandbox/threadpool/libs/tp/examples/shutdonw_now.cpp
==============================================================================
--- sandbox/threadpool/libs/tp/examples/shutdonw_now.cpp (original)
+++ sandbox/threadpool/libs/tp/examples/shutdonw_now.cpp 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -47,7 +47,7 @@
 10) ) );
 boost::this_thread::sleep( pt::milliseconds( 250) );
 pool.shutdown_now();
- std::cout << t.get() << std::endl;
+ std::cout << t.result().get() << std::endl;

 return EXIT_SUCCESS;
 }

Modified: sandbox/threadpool/libs/tp/examples/spread_over_hardware.cpp
==============================================================================
--- sandbox/threadpool/libs/tp/examples/spread_over_hardware.cpp (original)
+++ sandbox/threadpool/libs/tp/examples/spread_over_hardware.cpp 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -44,7 +44,7 @@
 & fibo::par_,
 boost::ref( * this),
 n - 2) ) );
- return t1.get() + t2.get();
+ return t1.result().get() + t2.result().get();
 }
 }

@@ -86,7 +86,7 @@
 std::vector< tp::task< int > >::iterator i( results.begin() );
 i != e;
 ++i)
- std::cout << "fibonacci " << k++ << " == " << i->get() << std::endl;
+ std::cout << "fibonacci " << k++ << " == " << i->result().get() << std::endl;

 pt::ptime stop( pt::microsec_clock::universal_time() );
 std::cout << ( stop - start).total_milliseconds() << " milli seconds" << std::endl;

Modified: sandbox/threadpool/libs/tp/examples/submit.cpp
==============================================================================
--- sandbox/threadpool/libs/tp/examples/submit.cpp (original)
+++ sandbox/threadpool/libs/tp/examples/submit.cpp 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -40,7 +40,7 @@
 boost::bind(
 fibonacci_fn,
 10) ) );
- std::cout << t.get() << std::endl;
+ std::cout << t.result().get() << std::endl;

 return EXIT_SUCCESS;
 }

Modified: sandbox/threadpool/libs/tp/test/test_bounded_queue_fifo.cpp
==============================================================================
--- sandbox/threadpool/libs/tp/test/test_bounded_queue_fifo.cpp (original)
+++ sandbox/threadpool/libs/tp/test/test_bounded_queue_fifo.cpp 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -62,7 +62,7 @@
                                 boost::bind(
                                         fibonacci_fn,
                                         10) ) );
- BOOST_CHECK_EQUAL( t.get(), 55);
+ BOOST_CHECK_EQUAL( t.result().get(), 55);
         }

         // check shutdown
@@ -81,7 +81,7 @@
                                         10) ) );
                 pool.shutdown();
                 BOOST_CHECK( pool.terminated() );
- BOOST_CHECK_EQUAL( t.get(), 55);
+ BOOST_CHECK_EQUAL( t.result().get(), 55);
         }

         // check runtime_error throw inside task
@@ -100,7 +100,7 @@
                 pool.shutdown();
                 bool thrown( false);
                 try
- { t.get(); }
+ { t.result().get(); }
                 catch ( std::runtime_error const&)
                 { thrown = true; }
                 BOOST_CHECK( thrown);
@@ -158,7 +158,7 @@
                 BOOST_CHECK_EQUAL( pool.active(), std::size_t( 0) );
                 bool thrown( false);
                 try
- { t.get(); }
+ { t.result().get(); }
                 catch ( boost::thread_interrupted const&)
                 { thrown = true; }
                 BOOST_CHECK( thrown);
@@ -194,9 +194,9 @@
                 boost::this_thread::sleep( pt::millisec(250) );
                 BOOST_CHECK_EQUAL( pool.pending(), std::size_t( 2) );
                 b.wait();
- BOOST_CHECK_EQUAL( t1.get(), 55);
- BOOST_CHECK_EQUAL( t2.get(), 55);
- BOOST_CHECK_EQUAL( t3.get(), 55);
+ BOOST_CHECK_EQUAL( t1.result().get(), 55);
+ BOOST_CHECK_EQUAL( t2.result().get(), 55);
+ BOOST_CHECK_EQUAL( t3.result().get(), 55);
                 BOOST_CHECK_EQUAL( pool.pending(), std::size_t( 0) );
         }

@@ -277,7 +277,7 @@
                 BOOST_CHECK_EQUAL( buffer.size(), std::size_t( 1) );
                 bool thrown( false);
                 try
- { t.get(); }
+ { t.result().get(); }
                 catch ( boost::thread_interrupted const&)
                 { thrown = true; }
                 BOOST_CHECK( thrown);

Modified: sandbox/threadpool/libs/tp/test/test_bounded_queue_lifo.cpp
==============================================================================
--- sandbox/threadpool/libs/tp/test/test_bounded_queue_lifo.cpp (original)
+++ sandbox/threadpool/libs/tp/test/test_bounded_queue_lifo.cpp 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -57,12 +57,12 @@
 tp::poolsize( 1),
 tp::high_watermark( 10),
 tp::low_watermark( 10) );
- tp::task< int > f(
+ tp::task< int > t(
 pool.submit(
 boost::bind(
 fibonacci_fn,
 10) ) );
- BOOST_CHECK_EQUAL( f.get(), 55);
+ BOOST_CHECK_EQUAL( t.result().get(), 55);
 }

 // check shutdown
@@ -81,7 +81,7 @@
 10) ) );
 pool.shutdown();
 BOOST_CHECK( pool.terminated() );
- BOOST_CHECK_EQUAL( t.get(), 55);
+ BOOST_CHECK_EQUAL( t.result().get(), 55);
 }

 // check runtime_error throw inside task
@@ -93,14 +93,14 @@
 tp::poolsize( 1),
 tp::high_watermark( 10),
 tp::low_watermark( 10) );
- tp::task< void > f(
+ tp::task< void > t(
 pool.submit(
 boost::bind(
 throwing_fn) ) );
 pool.shutdown();
 bool thrown( false);
 try
- { f.get(); }
+ { t.result().get(); }
 catch ( std::runtime_error const&)
 { thrown = true; }
 BOOST_CHECK( thrown);
@@ -143,7 +143,7 @@
 boost::bind(
 fibonacci_fn,
 10) );
- tp::task< int > f(
+ tp::task< int > t(
 pool.submit(
 boost::bind(
 ( int ( *)( boost::function< int() > const&, pt::time_duration const&) ) delay_fn,
@@ -158,7 +158,7 @@
 BOOST_CHECK_EQUAL( pool.active(), std::size_t( 0) );
 bool thrown( false);
 try
- { f.get(); }
+ { t.result().get(); }
 catch ( boost::thread_interrupted const&)
 { thrown = true; }
 BOOST_CHECK( thrown);
@@ -179,7 +179,7 @@
 boost::bind(
 fibonacci_fn,
 10) );
- tp::task< int > f1(
+ tp::task< int > t1(
 pool.submit(
 boost::bind(
 ( int ( *)( boost::function< int() > const&, boost::barrier &) ) barrier_fn,
@@ -187,16 +187,16 @@
 boost::ref( b) ) ) );
 boost::this_thread::sleep( pt::millisec( 250) );
 BOOST_CHECK_EQUAL( pool.pending(), std::size_t( 0) );
- tp::task< int > f2( pool.submit( fn) );
+ tp::task< int > t2( pool.submit( fn) );
 boost::this_thread::sleep( pt::millisec(250) );
 BOOST_CHECK_EQUAL( pool.pending(), std::size_t( 1) );
- tp::task< int > f3( pool.submit( fn) );
+ tp::task< int > t3( pool.submit( fn) );
 boost::this_thread::sleep( pt::millisec(250) );
 BOOST_CHECK_EQUAL( pool.pending(), std::size_t( 2) );
 b.wait();
- BOOST_CHECK_EQUAL( f1.get(), 55);
- BOOST_CHECK_EQUAL( f2.get(), 55);
- BOOST_CHECK_EQUAL( f3.get(), 55);
+ BOOST_CHECK_EQUAL( t1.result().get(), 55);
+ BOOST_CHECK_EQUAL( t2.result().get(), 55);
+ BOOST_CHECK_EQUAL( t3.result().get(), 55);
 BOOST_CHECK_EQUAL( pool.pending(), std::size_t( 0) );
 }

@@ -215,12 +215,11 @@
 boost::bind(
 fibonacci_fn,
 10) );
- tp::task< int > f1(
- pool.submit(
- boost::bind(
- ( int ( *)( boost::function< int() > const&, boost::barrier &) ) barrier_fn,
- fn,
- boost::ref( b) ) ) );
+ pool.submit(
+ boost::bind(
+ ( int ( *)( boost::function< int() > const&, boost::barrier &) ) barrier_fn,
+ fn,
+ boost::ref( b) ) );
 std::vector< int > buffer;
 pool.submit(
 boost::bind(
@@ -260,7 +259,7 @@
 fn,
 boost::ref( b) ) );
 std::vector< int > buffer;
- tp::task< void > f(
+ tp::task< void > t(
 pool.submit(
 boost::bind(
 buffer_fibonacci_fn,
@@ -271,14 +270,14 @@
 buffer_fibonacci_fn,
 boost::ref( buffer),
 0) );
- f.interrupt();
+ t.interrupt();
 b.wait();
 pool.shutdown();
 BOOST_CHECK_EQUAL( buffer[0], 0);
 BOOST_CHECK_EQUAL( buffer.size(), std::size_t( 1) );
 bool thrown( false);
 try
- { f.get(); }
+ { t.result().get(); }
 catch ( boost::thread_interrupted const&)
 { thrown = true; }
 BOOST_CHECK( thrown);

Modified: sandbox/threadpool/libs/tp/test/test_bounded_queue_priority.cpp
==============================================================================
--- sandbox/threadpool/libs/tp/test/test_bounded_queue_priority.cpp (original)
+++ sandbox/threadpool/libs/tp/test/test_bounded_queue_priority.cpp 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -57,13 +57,13 @@
 tp::poolsize( 1),
 tp::high_watermark( 10),
 tp::low_watermark( 10) );
- tp::task< int > f(
+ tp::task< int > t(
 pool.submit(
 boost::bind(
 fibonacci_fn,
 10),
 0) );
- BOOST_CHECK_EQUAL( f.get(), 55);
+ BOOST_CHECK_EQUAL( t.result().get(), 55);
 }

 // check shutdown
@@ -83,7 +83,7 @@
 0) );
 pool.shutdown();
 BOOST_CHECK( pool.terminated() );
- BOOST_CHECK_EQUAL( t.get(), 55);
+ BOOST_CHECK_EQUAL( t.result().get(), 55);
 }

 // check runtime_error throw inside task
@@ -95,7 +95,7 @@
 tp::poolsize( 1),
 tp::high_watermark( 10),
 tp::low_watermark( 10) );
- tp::task< void > f(
+ tp::task< void > t(
 pool.submit(
 boost::bind(
 throwing_fn),
@@ -103,7 +103,7 @@
 pool.shutdown();
 bool thrown( false);
 try
- { f.get(); }
+ { t.result().get(); }
 catch ( std::runtime_error const&)
 { thrown = true; }
 BOOST_CHECK( thrown);
@@ -147,7 +147,7 @@
 boost::bind(
 fibonacci_fn,
 10) );
- tp::task< int > f(
+ tp::task< int > t(
 pool.submit(
 boost::bind(
 ( int ( *)( boost::function< int() > const&, pt::time_duration const&) ) delay_fn,
@@ -165,7 +165,7 @@
 BOOST_CHECK_EQUAL( pool.active(), std::size_t( 0) );
 bool thrown( false);
 try
- { f.get(); }
+ { t.result().get(); }
 catch ( boost::thread_interrupted const&)
 { thrown = true; }
 BOOST_CHECK( thrown);
@@ -186,7 +186,7 @@
 boost::bind(
 fibonacci_fn,
 10) );
- tp::task< int > f1(
+ tp::task< int > t1(
 pool.submit(
 boost::bind(
 ( int ( *)( boost::function< int() > const&, boost::barrier &) ) barrier_fn,
@@ -195,16 +195,16 @@
 0) );
 boost::this_thread::sleep( pt::millisec( 250) );
 BOOST_CHECK_EQUAL( pool.pending(), std::size_t( 0) );
- tp::task< int > f2( pool.submit( fn, 0) );
+ tp::task< int > t2( pool.submit( fn, 0) );
 boost::this_thread::sleep( pt::millisec(250) );
 BOOST_CHECK_EQUAL( pool.pending(), std::size_t( 1) );
- tp::task< int > f3( pool.submit( fn, 0) );
+ tp::task< int > t3( pool.submit( fn, 0) );
 boost::this_thread::sleep( pt::millisec(250) );
 BOOST_CHECK_EQUAL( pool.pending(), std::size_t( 2) );
 b.wait();
- BOOST_CHECK_EQUAL( f1.get(), 55);
- BOOST_CHECK_EQUAL( f2.get(), 55);
- BOOST_CHECK_EQUAL( f3.get(), 55);
+ BOOST_CHECK_EQUAL( t1.result().get(), 55);
+ BOOST_CHECK_EQUAL( t2.result().get(), 55);
+ BOOST_CHECK_EQUAL( t3.result().get(), 55);
 BOOST_CHECK_EQUAL( pool.pending(), std::size_t( 0) );
 }

@@ -223,13 +223,12 @@
 boost::bind(
 fibonacci_fn,
 10) );
- tp::task< int > f1(
- pool.submit(
- boost::bind(
- ( int ( *)( boost::function< int() > const&, boost::barrier &) ) barrier_fn,
- fn,
- boost::ref( b) ),
- 0) );
+ pool.submit(
+ boost::bind(
+ ( int ( *)( boost::function< int() > const&, boost::barrier &) ) barrier_fn,
+ fn,
+ boost::ref( b) ),
+ 0);
 std::vector< int > buffer;
 pool.submit(
 boost::bind(
@@ -272,7 +271,7 @@
 boost::ref( b) ),
 0);
 std::vector< int > buffer;
- tp::task< void > f(
+ tp::task< void > t(
 pool.submit(
 boost::bind(
 buffer_fibonacci_fn,
@@ -285,14 +284,14 @@
 boost::ref( buffer),
 0),
 0);
- f.interrupt();
+ t.interrupt();
 b.wait();
 pool.shutdown();
 BOOST_CHECK_EQUAL( buffer[0], 0);
 BOOST_CHECK_EQUAL( buffer.size(), std::size_t( 1) );
 bool thrown( false);
 try
- { f.get(); }
+ { t.result().get(); }
 catch ( boost::thread_interrupted const&)
 { thrown = true; }
 BOOST_CHECK( thrown);

Modified: sandbox/threadpool/libs/tp/test/test_bounded_queue_smart.cpp
==============================================================================
--- sandbox/threadpool/libs/tp/test/test_bounded_queue_smart.cpp (original)
+++ sandbox/threadpool/libs/tp/test/test_bounded_queue_smart.cpp 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -57,13 +57,13 @@
 tp::poolsize( 1),
 tp::high_watermark( 10),
 tp::low_watermark( 10) );
- tp::task< int > f(
+ tp::task< int > t(
 pool.submit(
 boost::bind(
 fibonacci_fn,
 10),
 0) );
- BOOST_CHECK_EQUAL( f.get(), 55);
+ BOOST_CHECK_EQUAL( t.result().get(), 55);
 }

 // check shutdown
@@ -83,7 +83,7 @@
 0) );
 pool.shutdown();
 BOOST_CHECK( pool.terminated() );
- BOOST_CHECK_EQUAL( t.get(), 55);
+ BOOST_CHECK_EQUAL( t.result().get(), 55);
 }

 // check runtime_error throw inside task
@@ -95,7 +95,7 @@
 tp::poolsize( 1),
 tp::high_watermark( 10),
 tp::low_watermark( 10) );
- tp::task< void > f(
+ tp::task< void > t(
 pool.submit(
 boost::bind(
 throwing_fn),
@@ -103,7 +103,7 @@
 pool.shutdown();
 bool thrown( false);
 try
- { f.get(); }
+ { t.result().get(); }
 catch ( std::runtime_error const&)
 { thrown = true; }
 BOOST_CHECK( thrown);
@@ -147,7 +147,7 @@
 boost::bind(
 fibonacci_fn,
 10) );
- tp::task< int > f(
+ tp::task< int > t(
 pool.submit(
 boost::bind(
 ( int ( *)( boost::function< int() > const&, pt::time_duration const&) ) delay_fn,
@@ -165,7 +165,7 @@
 BOOST_CHECK_EQUAL( pool.active(), std::size_t( 0) );
 bool thrown( false);
 try
- { f.get(); }
+ { t.result().get(); }
 catch ( boost::thread_interrupted const&)
 { thrown = true; }
 BOOST_CHECK( thrown);
@@ -186,7 +186,7 @@
 boost::bind(
 fibonacci_fn,
 10) );
- tp::task< int > f1(
+ tp::task< int > t1(
 pool.submit(
 boost::bind(
 ( int ( *)( boost::function< int() > const&, boost::barrier &) ) barrier_fn,
@@ -195,16 +195,16 @@
 0) );
 boost::this_thread::sleep( pt::millisec( 250) );
 BOOST_CHECK_EQUAL( pool.pending(), std::size_t( 0) );
- tp::task< int > f2( pool.submit( fn, 1) );
+ tp::task< int > t2( pool.submit( fn, 1) );
 boost::this_thread::sleep( pt::millisec(250) );
 BOOST_CHECK_EQUAL( pool.pending(), std::size_t( 1) );
- tp::task< int > f3( pool.submit( fn, 2) );
+ tp::task< int > t3( pool.submit( fn, 2) );
 boost::this_thread::sleep( pt::millisec(250) );
 BOOST_CHECK_EQUAL( pool.pending(), std::size_t( 2) );
 b.wait();
- BOOST_CHECK_EQUAL( f1.get(), 55);
- BOOST_CHECK_EQUAL( f2.get(), 55);
- BOOST_CHECK_EQUAL( f3.get(), 55);
+ BOOST_CHECK_EQUAL( t1.result().get(), 55);
+ BOOST_CHECK_EQUAL( t2.result().get(), 55);
+ BOOST_CHECK_EQUAL( t3.result().get(), 55);
 BOOST_CHECK_EQUAL( pool.pending(), std::size_t( 0) );
 }

@@ -223,13 +223,12 @@
 boost::bind(
 fibonacci_fn,
 10) );
- tp::task< int > f1(
- pool.submit(
- boost::bind(
- ( int ( *)( boost::function< int() > const&, boost::barrier &) ) barrier_fn,
- fn,
- boost::ref( b) ),
- 0) );
+ pool.submit(
+ boost::bind(
+ ( int ( *)( boost::function< int() > const&, boost::barrier &) ) barrier_fn,
+ fn,
+ boost::ref( b) ),
+ 0);
 std::vector< int > buffer;
 pool.submit(
 boost::bind(
@@ -278,7 +277,7 @@
 boost::ref( b) ),
 0);
 std::vector< int > buffer;
- tp::task< void > f(
+ tp::task< void > t(
 pool.submit(
 boost::bind(
 buffer_fibonacci_fn,
@@ -291,14 +290,14 @@
 boost::ref( buffer),
 0),
 1);
- f.interrupt();
+ t.interrupt();
 b.wait();
 pool.shutdown();
 BOOST_CHECK_EQUAL( buffer[0], 0);
 BOOST_CHECK_EQUAL( buffer.size(), std::size_t( 1) );
 bool thrown( false);
 try
- { f.get(); }
+ { t.result().get(); }
 catch ( boost::thread_interrupted const&)
 { thrown = true; }
 BOOST_CHECK( thrown);

Modified: sandbox/threadpool/libs/tp/test/test_unbounded_queue_fifo.cpp
==============================================================================
--- sandbox/threadpool/libs/tp/test/test_unbounded_queue_fifo.cpp (original)
+++ sandbox/threadpool/libs/tp/test/test_unbounded_queue_fifo.cpp 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -50,12 +50,12 @@
 tp::pool<
 tp::unbounded_channel< tp::fifo >
> pool( tp::poolsize( 1) );
- tp::task< int > tsk(
+ tp::task< int > t(
 pool.submit(
 boost::bind(
 fibonacci_fn,
 10) ) );
- BOOST_CHECK_EQUAL( tsk.get(), 55);
+ BOOST_CHECK_EQUAL( t.result().get(), 55);
 }

 // check shutdown
@@ -71,7 +71,7 @@
 10) ) );
 pool.shutdown();
 BOOST_CHECK( pool.terminated() );
- BOOST_CHECK_EQUAL( t.get(), 55);
+ BOOST_CHECK_EQUAL( t.result().get(), 55);
 }

 // check runtime_error throw inside task
@@ -80,14 +80,14 @@
 tp::pool<
 tp::unbounded_channel< tp::fifo >
> pool( tp::poolsize( 1) );
- tp::task< void > tsk(
+ tp::task< void > t(
 pool.submit(
 boost::bind(
 throwing_fn) ) );
 pool.shutdown();
 bool thrown( false);
 try
- { tsk.get(); }
+ { t.result().get(); }
 catch ( std::runtime_error const&)
 { thrown = true; }
 BOOST_CHECK( thrown);
@@ -124,7 +124,7 @@
 boost::bind(
 fibonacci_fn,
 10) );
- tp::task< int > tsk(
+ tp::task< int > t(
 pool.submit(
 boost::bind(
 ( int ( *)( boost::function< int() > const&, pt::time_duration const&) ) delay_fn,
@@ -139,7 +139,7 @@
 BOOST_CHECK_EQUAL( pool.active(), std::size_t( 0) );
 bool thrown( false);
 try
- { tsk.get(); }
+ { t.result().get(); }
 catch ( boost::thread_interrupted const&)
 { thrown = true; }
 BOOST_CHECK( thrown);
@@ -157,7 +157,7 @@
 boost::bind(
 fibonacci_fn,
 10) );
- tp::task< int > tsk1(
+ tp::task< int > t1(
 pool.submit(
 boost::bind(
 ( int ( *)( boost::function< int() > const&, boost::barrier &) ) barrier_fn,
@@ -165,16 +165,16 @@
 boost::ref( b) ) ) );
 boost::this_thread::sleep( pt::millisec( 250) );
 BOOST_CHECK_EQUAL( pool.pending(), std::size_t( 0) );
- tp::task< int > tsk2( pool.submit( fn) );
+ tp::task< int > t2( pool.submit( fn) );
 boost::this_thread::sleep( pt::millisec(250) );
 BOOST_CHECK_EQUAL( pool.pending(), std::size_t( 1) );
- tp::task< int > tsk3( pool.submit( fn) );
+ tp::task< int > t3( pool.submit( fn) );
 boost::this_thread::sleep( pt::millisec(250) );
 BOOST_CHECK_EQUAL( pool.pending(), std::size_t( 2) );
 b.wait();
- BOOST_CHECK_EQUAL( tsk1.get(), 55);
- BOOST_CHECK_EQUAL( tsk2.get(), 55);
- BOOST_CHECK_EQUAL( tsk3.get(), 55);
+ BOOST_CHECK_EQUAL( t1.result().get(), 55);
+ BOOST_CHECK_EQUAL( t2.result().get(), 55);
+ BOOST_CHECK_EQUAL( t3.result().get(), 55);
 BOOST_CHECK_EQUAL( pool.pending(), std::size_t( 0) );
 }

@@ -190,12 +190,11 @@
 boost::bind(
 fibonacci_fn,
 10) );
- tp::task< int > tsk1(
- pool.submit(
- boost::bind(
- ( int ( *)( boost::function< int() > const&, boost::barrier &) ) barrier_fn,
- fn,
- boost::ref( b) ) ) );
+ pool.submit(
+ boost::bind(
+ ( int ( *)( boost::function< int() > const&, boost::barrier &) ) barrier_fn,
+ fn,
+ boost::ref( b) ) );
 std::vector< int > buffer;
 pool.submit(
 boost::bind(
@@ -232,7 +231,7 @@
 fn,
 boost::ref( b) ) );
 std::vector< int > buffer;
- tp::task< void > tsk(
+ tp::task< void > t(
 pool.submit(
 boost::bind(
 buffer_fibonacci_fn,
@@ -243,14 +242,14 @@
 buffer_fibonacci_fn,
 boost::ref( buffer),
 0) );
- tsk.interrupt();
+ t.interrupt();
 b.wait();
 pool.shutdown();
 BOOST_CHECK_EQUAL( buffer[0], 0);
 BOOST_CHECK_EQUAL( buffer.size(), std::size_t( 1) );
 bool thrown( false);
 try
- { tsk.get(); }
+ { t.result().get(); }
 catch ( boost::thread_interrupted const&)
 { thrown = true; }
 BOOST_CHECK( thrown);

Modified: sandbox/threadpool/libs/tp/test/test_unbounded_queue_lifo.cpp
==============================================================================
--- sandbox/threadpool/libs/tp/test/test_unbounded_queue_lifo.cpp (original)
+++ sandbox/threadpool/libs/tp/test/test_unbounded_queue_lifo.cpp 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -50,12 +50,12 @@
 tp::pool<
 tp::unbounded_channel< tp::lifo >
> pool( tp::poolsize( 1) );
- tp::task< int > tsk(
+ tp::task< int > t(
 pool.submit(
 boost::bind(
 fibonacci_fn,
 10) ) );
- BOOST_CHECK_EQUAL( tsk.get(), 55);
+ BOOST_CHECK_EQUAL( t.result().get(), 55);
 }

 // check shutdown
@@ -71,7 +71,7 @@
 10) ) );
 pool.shutdown();
 BOOST_CHECK( pool.terminated() );
- BOOST_CHECK_EQUAL( t.get(), 55);
+ BOOST_CHECK_EQUAL( t.result().get(), 55);
 }

 // check runtime_error throw inside task
@@ -80,14 +80,14 @@
 tp::pool<
 tp::unbounded_channel< tp::lifo >
> pool( tp::poolsize( 1) );
- tp::task< void > tsk(
+ tp::task< void > t(
 pool.submit(
 boost::bind(
 throwing_fn) ) );
 pool.shutdown();
 bool thrown( false);
 try
- { tsk.get(); }
+ { t.result().get(); }
 catch ( std::runtime_error const&)
 { thrown = true; }
 BOOST_CHECK( thrown);
@@ -124,7 +124,7 @@
 boost::bind(
 fibonacci_fn,
 10) );
- tp::task< int > tsk(
+ tp::task< int > t(
 pool.submit(
 boost::bind(
 ( int ( *)( boost::function< int() > const&, pt::time_duration const&) ) delay_fn,
@@ -139,7 +139,7 @@
 BOOST_CHECK_EQUAL( pool.active(), std::size_t( 0) );
 bool thrown( false);
 try
- { tsk.get(); }
+ { t.result().get(); }
 catch ( boost::thread_interrupted const&)
 { thrown = true; }
 BOOST_CHECK( thrown);
@@ -157,7 +157,7 @@
 boost::bind(
 fibonacci_fn,
 10) );
- tp::task< int > tsk1(
+ tp::task< int > t1(
 pool.submit(
 boost::bind(
 ( int ( *)( boost::function< int() > const&, boost::barrier &) ) barrier_fn,
@@ -165,16 +165,16 @@
 boost::ref( b) ) ) );
 boost::this_thread::sleep( pt::millisec( 250) );
 BOOST_CHECK_EQUAL( pool.pending(), std::size_t( 0) );
- tp::task< int > tsk2( pool.submit( fn) );
+ tp::task< int > t2( pool.submit( fn) );
 boost::this_thread::sleep( pt::millisec(250) );
 BOOST_CHECK_EQUAL( pool.pending(), std::size_t( 1) );
- tp::task< int > tsk3( pool.submit( fn) );
+ tp::task< int > t3( pool.submit( fn) );
 boost::this_thread::sleep( pt::millisec(250) );
 BOOST_CHECK_EQUAL( pool.pending(), std::size_t( 2) );
 b.wait();
- BOOST_CHECK_EQUAL( tsk1.get(), 55);
- BOOST_CHECK_EQUAL( tsk2.get(), 55);
- BOOST_CHECK_EQUAL( tsk3.get(), 55);
+ BOOST_CHECK_EQUAL( t1.result().get(), 55);
+ BOOST_CHECK_EQUAL( t2.result().get(), 55);
+ BOOST_CHECK_EQUAL( t3.result().get(), 55);
 BOOST_CHECK_EQUAL( pool.pending(), std::size_t( 0) );
 }

@@ -190,12 +190,11 @@
 boost::bind(
 fibonacci_fn,
 10) );
- tp::task< int > tsk1(
- pool.submit(
- boost::bind(
- ( int ( *)( boost::function< int() > const&, boost::barrier &) ) barrier_fn,
- fn,
- boost::ref( b) ) ) );
+ pool.submit(
+ boost::bind(
+ ( int ( *)( boost::function< int() > const&, boost::barrier &) ) barrier_fn,
+ fn,
+ boost::ref( b) ) );
 std::vector< int > buffer;
 pool.submit(
 boost::bind(
@@ -232,7 +231,7 @@
 fn,
 boost::ref( b) ) );
 std::vector< int > buffer;
- tp::task< void > tsk(
+ tp::task< void > t(
 pool.submit(
 boost::bind(
 buffer_fibonacci_fn,
@@ -243,14 +242,14 @@
 buffer_fibonacci_fn,
 boost::ref( buffer),
 0) );
- tsk.interrupt();
+ t.interrupt();
 b.wait();
 pool.shutdown();
 BOOST_CHECK_EQUAL( buffer[0], 0);
 BOOST_CHECK_EQUAL( buffer.size(), std::size_t( 1) );
 bool thrown( false);
 try
- { tsk.get(); }
+ { t.result().get(); }
 catch ( boost::thread_interrupted const&)
 { thrown = true; }
 BOOST_CHECK( thrown);

Modified: sandbox/threadpool/libs/tp/test/test_unbounded_queue_priority.cpp
==============================================================================
--- sandbox/threadpool/libs/tp/test/test_unbounded_queue_priority.cpp (original)
+++ sandbox/threadpool/libs/tp/test/test_unbounded_queue_priority.cpp 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -50,13 +50,13 @@
 tp::pool<
 tp::unbounded_channel< tp::priority< int > >
> pool( tp::poolsize( 1) );
- tp::task< int > tsk(
+ tp::task< int > t(
 pool.submit(
 boost::bind(
 fibonacci_fn,
 10),
 0) );
- BOOST_CHECK_EQUAL( tsk.get(), 55);
+ BOOST_CHECK_EQUAL( t.result().get(), 55);
 }

 // check shutdown
@@ -73,7 +73,7 @@
 0) );
 pool.shutdown();
 BOOST_CHECK( pool.terminated() );
- BOOST_CHECK_EQUAL( t.get(), 55);
+ BOOST_CHECK_EQUAL( t.result().get(), 55);
 }

 // check runtime_error throw inside task
@@ -82,7 +82,7 @@
 tp::pool<
 tp::unbounded_channel< tp::priority< int > >
> pool( tp::poolsize( 1) );
- tp::task< void > tsk(
+ tp::task< void > t(
 pool.submit(
 boost::bind(
 throwing_fn),
@@ -90,7 +90,7 @@
 pool.shutdown();
 bool thrown( false);
 try
- { tsk.get(); }
+ { t.result().get(); }
 catch ( std::runtime_error const&)
 { thrown = true; }
 BOOST_CHECK( thrown);
@@ -128,7 +128,7 @@
 boost::bind(
 fibonacci_fn,
 10) );
- tp::task< int > tsk(
+ tp::task< int > t(
 pool.submit(
 boost::bind(
 ( int ( *)( boost::function< int() > const&, pt::time_duration const&) ) delay_fn,
@@ -146,7 +146,7 @@
 BOOST_CHECK_EQUAL( pool.active(), std::size_t( 0) );
 bool thrown( false);
 try
- { tsk.get(); }
+ { t.result().get(); }
 catch ( boost::thread_interrupted const&)
 { thrown = true; }
 BOOST_CHECK( thrown);
@@ -164,7 +164,7 @@
 boost::bind(
 fibonacci_fn,
 10) );
- tp::task< int > tsk1(
+ tp::task< int > t1(
 pool.submit(
 boost::bind(
 ( int ( *)( boost::function< int() > const&, boost::barrier &) ) barrier_fn,
@@ -173,16 +173,16 @@
 0) );
 boost::this_thread::sleep( pt::millisec( 250) );
 BOOST_CHECK_EQUAL( pool.pending(), std::size_t( 0) );
- tp::task< int > tsk2( pool.submit( fn, 0) );
+ tp::task< int > t2( pool.submit( fn, 0) );
 boost::this_thread::sleep( pt::millisec(250) );
 BOOST_CHECK_EQUAL( pool.pending(), std::size_t( 1) );
- tp::task< int > tsk3( pool.submit( fn, 0) );
+ tp::task< int > t3( pool.submit( fn, 0) );
 boost::this_thread::sleep( pt::millisec(250) );
 BOOST_CHECK_EQUAL( pool.pending(), std::size_t( 2) );
 b.wait();
- BOOST_CHECK_EQUAL( tsk1.get(), 55);
- BOOST_CHECK_EQUAL( tsk2.get(), 55);
- BOOST_CHECK_EQUAL( tsk3.get(), 55);
+ BOOST_CHECK_EQUAL( t1.result().get(), 55);
+ BOOST_CHECK_EQUAL( t2.result().get(), 55);
+ BOOST_CHECK_EQUAL( t3.result().get(), 55);
 BOOST_CHECK_EQUAL( pool.pending(), std::size_t( 0) );
 }

@@ -198,13 +198,12 @@
 boost::bind(
 fibonacci_fn,
 10) );
- tp::task< int > tsk1(
- pool.submit(
- boost::bind(
- ( int ( *)( boost::function< int() > const&, boost::barrier &) ) barrier_fn,
- fn,
- boost::ref( b) ),
- 0) );
+ pool.submit(
+ boost::bind(
+ ( int ( *)( boost::function< int() > const&, boost::barrier &) ) barrier_fn,
+ fn,
+ boost::ref( b) ),
+ 0);
 std::vector< int > buffer;
 pool.submit(
 boost::bind(
@@ -244,7 +243,7 @@
 boost::ref( b) ),
 0);
 std::vector< int > buffer;
- tp::task< void > tsk(
+ tp::task< void > t(
 pool.submit(
 boost::bind(
 buffer_fibonacci_fn,
@@ -257,14 +256,14 @@
 boost::ref( buffer),
 0),
 0);
- tsk.interrupt();
+ t.interrupt();
 b.wait();
 pool.shutdown();
 BOOST_CHECK_EQUAL( buffer[0], 0);
 BOOST_CHECK_EQUAL( buffer.size(), std::size_t( 1) );
 bool thrown( false);
 try
- { tsk.get(); }
+ { t.result().get(); }
 catch ( boost::thread_interrupted const&)
 { thrown = true; }
 BOOST_CHECK( thrown);

Modified: sandbox/threadpool/libs/tp/test/test_unbounded_queue_smart.cpp
==============================================================================
--- sandbox/threadpool/libs/tp/test/test_unbounded_queue_smart.cpp (original)
+++ sandbox/threadpool/libs/tp/test/test_unbounded_queue_smart.cpp 2009-03-02 15:15:58 EST (Mon, 02 Mar 2009)
@@ -50,13 +50,13 @@
 tp::pool<
 tp::unbounded_channel< tp::smart< int, std::less< int >, tp::replace_oldest, tp::take_oldest > >
> pool( tp::poolsize( 1) );
- tp::task< int > tsk(
+ tp::task< int > t(
 pool.submit(
 boost::bind(
 fibonacci_fn,
 10),
 0) );
- BOOST_CHECK_EQUAL( tsk.get(), 55);
+ BOOST_CHECK_EQUAL( t.result().get(), 55);
 }

 // check shutdown
@@ -73,7 +73,7 @@
 0) );
 pool.shutdown();
 BOOST_CHECK( pool.terminated() );
- BOOST_CHECK_EQUAL( t.get(), 55);
+ BOOST_CHECK_EQUAL( t.result().get(), 55);
 }

 // check runtime_error throw inside task
@@ -82,7 +82,7 @@
 tp::pool<
 tp::unbounded_channel< tp::smart< int, std::less< int >, tp::replace_oldest, tp::take_oldest > >
> pool( tp::poolsize( 1) );
- tp::task< void > tsk(
+ tp::task< void > t(
 pool.submit(
 boost::bind(
 throwing_fn),
@@ -90,7 +90,7 @@
 pool.shutdown();
 bool thrown( false);
 try
- { tsk.get(); }
+ { t.result().get(); }
 catch ( std::runtime_error const&)
 { thrown = true; }
 BOOST_CHECK( thrown);
@@ -128,7 +128,7 @@
 boost::bind(
 fibonacci_fn,
 10) );
- tp::task< int > tsk(
+ tp::task< int > t(
 pool.submit(
 boost::bind(
 ( int ( *)( boost::function< int() > const&, pt::time_duration const&) ) delay_fn,
@@ -146,7 +146,7 @@
 BOOST_CHECK_EQUAL( pool.active(), std::size_t( 0) );
 bool thrown( false);
 try
- { tsk.get(); }
+ { t.result().get(); }
 catch ( boost::thread_interrupted const&)
 { thrown = true; }
 BOOST_CHECK( thrown);
@@ -164,7 +164,7 @@
 boost::bind(
 fibonacci_fn,
 10) );
- tp::task< int > tsk1(
+ tp::task< int > t1(
 pool.submit(
 boost::bind(
 ( int ( *)( boost::function< int() > const&, boost::barrier &) ) barrier_fn,
@@ -173,16 +173,16 @@
 0) );
 boost::this_thread::sleep( pt::millisec( 250) );
 BOOST_CHECK_EQUAL( pool.pending(), std::size_t( 0) );
- tp::task< int > tsk2( pool.submit( fn, 1) );
+ tp::task< int > t2( pool.submit( fn, 1) );
 boost::this_thread::sleep( pt::millisec(250) );
 BOOST_CHECK_EQUAL( pool.pending(), std::size_t( 1) );
- tp::task< int > tsk3( pool.submit( fn, 2) );
+ tp::task< int > t3( pool.submit( fn, 2) );
 boost::this_thread::sleep( pt::millisec(250) );
 BOOST_CHECK_EQUAL( pool.pending(), std::size_t( 2) );
 b.wait();
- BOOST_CHECK_EQUAL( tsk1.get(), 55);
- BOOST_CHECK_EQUAL( tsk2.get(), 55);
- BOOST_CHECK_EQUAL( tsk3.get(), 55);
+ BOOST_CHECK_EQUAL( t1.result().get(), 55);
+ BOOST_CHECK_EQUAL( t2.result().get(), 55);
+ BOOST_CHECK_EQUAL( t3.result().get(), 55);
 BOOST_CHECK_EQUAL( pool.pending(), std::size_t( 0) );
 }

@@ -198,13 +198,12 @@
 boost::bind(
 fibonacci_fn,
 10) );
- tp::task< int > tsk1(
- pool.submit(
- boost::bind(
- ( int ( *)( boost::function< int() > const&, boost::barrier &) ) barrier_fn,
- fn,
- boost::ref( b) ),
- 0) );
+ pool.submit(
+ boost::bind(
+ ( int ( *)( boost::function< int() > const&, boost::barrier &) ) barrier_fn,
+ fn,
+ boost::ref( b) ),
+ 0);
 std::vector< int > buffer;
 pool.submit(
 boost::bind(
@@ -250,7 +249,7 @@
 boost::ref( b) ),
 0);
 std::vector< int > buffer;
- tp::task< void > tsk(
+ tp::task< void > t(
 pool.submit(
 boost::bind(
 buffer_fibonacci_fn,
@@ -263,14 +262,14 @@
 boost::ref( buffer),
 0),
 1);
- tsk.interrupt();
+ t.interrupt();
 b.wait();
 pool.shutdown();
 BOOST_CHECK_EQUAL( buffer[0], 0);
 BOOST_CHECK_EQUAL( buffer.size(), std::size_t( 1) );
 bool thrown( false);
 try
- { tsk.get(); }
+ { t.result().get(); }
 catch ( boost::thread_interrupted const&)
 { thrown = true; }
 BOOST_CHECK( thrown);

Date view	Thread view	Subject view	Author view

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