[Boost-commit] svn:boost r83667 - in trunk/libs/thread/test: . sync/futures/shared_future

Subject: [Boost-commit] svn:boost r83667 - in trunk/libs/thread/test: . sync/futures/shared_future
From: vicente.botet_at_[hidden]
Date: 2013-03-31 11:16:26

Author: viboes
Date: 2013-03-31 11:16:25 EDT (Sun, 31 Mar 2013)
New Revision: 83667
URL: http://svn.boost.org/trac/boost/changeset/83667

Log:
Thread: Added shared_future<>::wait... tests.
Added:
   trunk/libs/thread/test/sync/futures/shared_future/wait_for_pass.cpp   (contents, props changed)
   trunk/libs/thread/test/sync/futures/shared_future/wait_pass.cpp   (contents, props changed)
   trunk/libs/thread/test/sync/futures/shared_future/wait_until_pass.cpp   (contents, props changed)
Text files modified: 
   trunk/libs/thread/test/Jamfile.v2 |     3 +++                                     
   1 files changed, 3 insertions(+), 0 deletions(-)

Modified: trunk/libs/thread/test/Jamfile.v2
==============================================================================
--- trunk/libs/thread/test/Jamfile.v2	(original)
+++ trunk/libs/thread/test/Jamfile.v2	2013-03-31 11:16:25 EDT (Sun, 31 Mar 2013)
@@ -350,6 +350,9 @@
           [ thread-run2-noit ./sync/futures/shared_future/get_pass.cpp : shared_future__get_p ]
           [ thread-run2-noit ./sync/futures/shared_future/move_ctor_pass.cpp : shared_future__move_ctor_p ]
           [ thread-run2-noit ./sync/futures/shared_future/move_assign_pass.cpp : shared_future__move_asign_p ]
+          [ thread-run2-noit ./sync/futures/shared_future/wait_pass.cpp : shared_future__wait_p ]
+          [ thread-run2-noit ./sync/futures/shared_future/wait_for_pass.cpp : shared_future__wait_for_p ]
+          [ thread-run2-noit ./sync/futures/shared_future/wait_until_pass.cpp : shared_future__wait_until_p ]
     ;
 
     #explicit ts_packaged_task ;

Added: trunk/libs/thread/test/sync/futures/shared_future/wait_for_pass.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/thread/test/sync/futures/shared_future/wait_for_pass.cpp	2013-03-31 11:16:25 EDT (Sun, 31 Mar 2013)
@@ -0,0 +1,163 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// Copyright (C) 2013 Vicente J. Botet Escriba
+//
+//  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)
+
+// <boost/thread/future.hpp>
+
+// class shared_future<R>
+
+// template <class Rep, class Period>
+//   future_status
+//   wait_for(const chrono::duration<Rep, Period>& rel_time) const;
+
+#define BOOST_THREAD_VERSION 4
+#define BOOST_THREAD_USES_LOG
+#define BOOST_THREAD_USES_LOG_THREAD_ID
+#include <boost/thread/detail/log.hpp>
+
+#include <boost/thread/future.hpp>
+#include <boost/thread/thread.hpp>
+#include <boost/chrono/chrono_io.hpp>
+#include <boost/detail/lightweight_test.hpp>
+
+#if defined BOOST_THREAD_USES_CHRONO
+
+typedef boost::chrono::milliseconds ms;
+
+namespace boost
+{
+  template <typename OStream>
+  OStream& operator<<(OStream& os , boost::future_status st )
+  {
+    os << int(st) << " ";
+    return os;
+  }
+  template <typename T>
+  struct wrap
+  {
+    wrap(T const& v) :
+      value(v)
+    {
+    }
+    T value;
+
+  };
+
+  template <typename T>
+  exception_ptr make_exception_ptr(T v)
+  {
+    return copy_exception(wrap<T> (v));
+  }
+}
+
+void func1(boost::promise<int> p)
+{
+  boost::this_thread::sleep_for(ms(500));
+  p.set_value(3);
+}
+
+int j = 0;
+
+void func3(boost::promise<int&> p)
+{
+  boost::this_thread::sleep_for(ms(500));
+  j = 5;
+  p.set_value(j);
+}
+
+void func5(boost::promise<void> p)
+{
+  boost::this_thread::sleep_for(ms(500));
+  p.set_value();
+}
+
+int main()
+{
+  BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
+  {
+    typedef boost::chrono::high_resolution_clock Clock;
+    {
+      typedef int T;
+      boost::promise<T> p;
+      boost::shared_future<T> f((p.get_future()));
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+      boost::thread(func1, boost::move(p)).detach();
+#endif
+      BOOST_TEST(f.valid());
+      BOOST_TEST_EQ(f.wait_for(ms(300)) , boost::future_status::timeout);
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+#else
+      func1(boost::move(p));
+#endif
+      BOOST_TEST(f.valid());
+      BOOST_TEST_EQ(f.wait_for(ms(300)) , boost::future_status::ready);
+      BOOST_TEST(f.valid());
+      Clock::time_point t0 = Clock::now();
+      f.wait();
+      Clock::time_point t1 = Clock::now();
+      BOOST_TEST(f.valid());
+      BOOST_TEST(t1 - t0 < ms(50));
+    }
+    {
+      typedef int& T;
+      boost::promise<T> p;
+      boost::shared_future<T> f((p.get_future()));
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+      boost::thread(func3, boost::move(p)).detach();
+#endif
+      BOOST_TEST(f.valid());
+      BOOST_TEST_EQ(f.wait_for(ms(300)) , boost::future_status::timeout);
+      BOOST_TEST(f.valid());
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+#else
+      func3(boost::move(p));
+#endif
+      BOOST_TEST_EQ(f.wait_for(ms(300)) , boost::future_status::ready);
+      BOOST_TEST(f.valid());
+      Clock::time_point t0 = Clock::now();
+      f.wait();
+      Clock::time_point t1 = Clock::now();
+      BOOST_TEST(f.valid());
+      BOOST_TEST(t1 - t0 < ms(50));
+    }
+    {
+      typedef void T;
+      boost::promise<T> p;
+      boost::shared_future<T> f((p.get_future()));
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+      boost::thread(func5, boost::move(p)).detach();
+#endif
+      BOOST_TEST(f.valid());
+      BOOST_TEST_EQ(f.wait_for(ms(300)) , boost::future_status::timeout);
+      BOOST_TEST(f.valid());
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+#else
+      func5(boost::move(p));
+#endif
+      BOOST_TEST_EQ(f.wait_for(ms(300)) , boost::future_status::ready);
+      BOOST_TEST(f.valid());
+      Clock::time_point t0 = Clock::now();
+      f.wait();
+      Clock::time_point t1 = Clock::now();
+      BOOST_TEST(f.valid());
+      BOOST_TEST(t1 - t0 < ms(50));
+    }
+  }
+  BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
+
+  return boost::report_errors();
+}
+
+#else
+#error "Test not applicable: BOOST_THREAD_USES_CHRONO not defined for this platform as not supported"
+#endif

Added: trunk/libs/thread/test/sync/futures/shared_future/wait_pass.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/thread/test/sync/futures/shared_future/wait_pass.cpp	2013-03-31 11:16:25 EDT (Sun, 31 Mar 2013)
@@ -0,0 +1,151 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// Copyright (C) 2013 Vicente J. Botet Escriba
+//
+//  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)
+
+// <boost/thread/future.hpp>
+
+// class shared_future<R>
+
+// template <class Rep, class Period>
+// void wait() const;
+
+//#define BOOST_THREAD_VERSION 3
+#define BOOST_THREAD_VERSION 4
+#define BOOST_THREAD_USES_LOG
+#define BOOST_THREAD_USES_LOG_THREAD_ID
+#include <boost/thread/detail/log.hpp>
+
+#include <boost/thread/future.hpp>
+#include <boost/thread/thread.hpp>
+#include <boost/chrono/chrono_io.hpp>
+#include <boost/detail/lightweight_test.hpp>
+
+#if defined BOOST_THREAD_USES_CHRONO
+
+typedef boost::chrono::milliseconds ms;
+
+namespace boost
+{
+  template <typename OStream>
+  OStream& operator<<(OStream& os , boost::future_status st )
+  {
+    os << int(st) << " ";
+    return os;
+  }
+  template <typename T>
+  struct wrap
+  {
+    wrap(T const& v) :
+      value(v)
+    {
+    }
+    T value;
+
+  };
+
+  template <typename T>
+  exception_ptr make_exception_ptr(T v)
+  {
+    return copy_exception(wrap<T> (v));
+  }
+}
+
+void func1(boost::promise<int> p)
+{
+  boost::this_thread::sleep_for(ms(500));
+  p.set_value(3);
+}
+
+int j = 0;
+
+void func3(boost::promise<int&> p)
+{
+  boost::this_thread::sleep_for(ms(500));
+  j = 5;
+  p.set_value(j);
+}
+
+void func5(boost::promise<void> p)
+{
+  boost::this_thread::sleep_for(ms(500));
+  p.set_value();
+}
+
+int main()
+{
+  BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
+  {
+    typedef boost::chrono::high_resolution_clock Clock;
+    {
+      typedef int T;
+      boost::promise<T> p;
+      boost::shared_future<T> f((p.get_future()));
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+      boost::thread(func1, boost::move(p)).detach();
+#else
+      func1(boost::move(p));
+#endif
+      BOOST_TEST(f.valid());
+      f.wait();
+      BOOST_TEST(f.valid());
+      Clock::time_point t0 = Clock::now();
+      f.wait();
+      Clock::time_point t1 = Clock::now();
+      BOOST_TEST(f.valid());
+      BOOST_TEST(t1 - t0 < ms(50));
+    }
+    {
+      typedef int& T;
+      boost::promise<T> p;
+      boost::shared_future<T> f((p.get_future()));
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+      boost::thread(func3, boost::move(p)).detach();
+#else
+      func3(boost::move(p));
+#endif
+      BOOST_TEST(f.valid());
+      f.wait();
+      BOOST_TEST(f.valid());
+      Clock::time_point t0 = Clock::now();
+      f.wait();
+      Clock::time_point t1 = Clock::now();
+      BOOST_TEST(f.valid());
+      BOOST_TEST(t1 - t0 < ms(50));
+    }
+    {
+      typedef void T;
+      boost::promise<T> p;
+      boost::shared_future<T> f((p.get_future()));
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+      boost::thread(func5, boost::move(p)).detach();
+#else
+      func5(boost::move(p));
+#endif
+      BOOST_TEST(f.valid());
+      f.wait();
+      BOOST_TEST(f.valid());
+      Clock::time_point t0 = Clock::now();
+      f.wait();
+      Clock::time_point t1 = Clock::now();
+      BOOST_TEST(f.valid());
+      BOOST_TEST(t1 - t0 < ms(50));
+    }
+  }
+  BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
+
+  return boost::report_errors();
+}
+
+#else
+#error "Test not applicable: BOOST_THREAD_USES_CHRONO not defined for this platform as not supported"
+#endif

Added: trunk/libs/thread/test/sync/futures/shared_future/wait_until_pass.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/thread/test/sync/futures/shared_future/wait_until_pass.cpp	2013-03-31 11:16:25 EDT (Sun, 31 Mar 2013)
@@ -0,0 +1,164 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// Copyright (C) 2013 Vicente J. Botet Escriba
+//
+//  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)
+
+// <boost/thread/future.hpp>
+
+// class shared_future<R>
+
+// template <class Rep, class Period>
+//   future_status
+//   wait_until(const chrono::time_point<Clock, Duration>& abs_time) const;
+
+//#define BOOST_THREAD_VERSION 3
+#define BOOST_THREAD_VERSION 4
+#define BOOST_THREAD_USES_LOG
+#define BOOST_THREAD_USES_LOG_THREAD_ID
+#include <boost/thread/detail/log.hpp>
+
+#include <boost/thread/future.hpp>
+#include <boost/thread/thread.hpp>
+#include <boost/chrono/chrono_io.hpp>
+#include <boost/detail/lightweight_test.hpp>
+
+#if defined BOOST_THREAD_USES_CHRONO
+
+typedef boost::chrono::milliseconds ms;
+
+namespace boost
+{
+  template <typename OStream>
+  OStream& operator<<(OStream& os , boost::future_status st )
+  {
+    os << int(st) << " ";
+    return os;
+  }
+  template <typename T>
+  struct wrap
+  {
+    wrap(T const& v) :
+      value(v)
+    {
+    }
+    T value;
+
+  };
+
+  template <typename T>
+  exception_ptr make_exception_ptr(T v)
+  {
+    return copy_exception(wrap<T> (v));
+  }
+}
+
+void func1(boost::promise<int> p)
+{
+  boost::this_thread::sleep_for(ms(500));
+  p.set_value(3);
+}
+
+int j = 0;
+
+void func3(boost::promise<int&> p)
+{
+  boost::this_thread::sleep_for(ms(500));
+  j = 5;
+  p.set_value(j);
+}
+
+void func5(boost::promise<void> p)
+{
+  boost::this_thread::sleep_for(ms(500));
+  p.set_value();
+}
+
+int main()
+{
+  BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
+  {
+    typedef boost::chrono::high_resolution_clock Clock;
+    {
+      typedef int T;
+      boost::promise<T> p;
+      boost::shared_future<T> f((p.get_future()));
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+      boost::thread(func1, boost::move(p)).detach();
+#endif
+      BOOST_TEST(f.valid());
+      BOOST_TEST_EQ(f.wait_until(Clock::now() + ms(300)) , boost::future_status::timeout);
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+#else
+      func1(boost::move(p));
+#endif
+      BOOST_TEST(f.valid());
+      BOOST_TEST_EQ(f.wait_until(Clock::now() + ms(300)) , boost::future_status::ready);
+      BOOST_TEST(f.valid());
+      Clock::time_point t0 = Clock::now();
+      f.wait();
+      Clock::time_point t1 = Clock::now();
+      BOOST_TEST(f.valid());
+      BOOST_TEST(t1 - t0 < ms(50));
+    }
+    {
+      typedef int& T;
+      boost::promise<T> p;
+      boost::shared_future<T> f((p.get_future()));
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+      boost::thread(func3, boost::move(p)).detach();
+#endif
+      BOOST_TEST(f.valid());
+      BOOST_TEST_EQ(f.wait_until(Clock::now() + ms(300)) , boost::future_status::timeout);
+      BOOST_TEST(f.valid());
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+#else
+      func3(boost::move(p));
+#endif
+      BOOST_TEST_EQ(f.wait_until(Clock::now() + ms(300)) , boost::future_status::ready);
+      BOOST_TEST(f.valid());
+      Clock::time_point t0 = Clock::now();
+      f.wait();
+      Clock::time_point t1 = Clock::now();
+      BOOST_TEST(f.valid());
+      BOOST_TEST(t1 - t0 < ms(50));
+    }
+    {
+      typedef void T;
+      boost::promise<T> p;
+      boost::shared_future<T> f((p.get_future()));
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+      boost::thread(func5, boost::move(p)).detach();
+#endif
+      BOOST_TEST(f.valid());
+      BOOST_TEST_EQ(f.wait_until(Clock::now() + ms(300)) , boost::future_status::timeout);
+      BOOST_TEST(f.valid());
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+#else
+      func5(boost::move(p));
+#endif
+      BOOST_TEST_EQ(f.wait_until(Clock::now() + ms(300)) , boost::future_status::ready);
+      BOOST_TEST(f.valid());
+      Clock::time_point t0 = Clock::now();
+      f.wait();
+      Clock::time_point t1 = Clock::now();
+      BOOST_TEST(f.valid());
+      BOOST_TEST(t1 - t0 < ms(50));
+    }
+  }
+  BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
+
+  return boost::report_errors();
+}
+
+#else
+#error "Test not applicable: BOOST_THREAD_USES_CHRONO not defined for this platform as not supported"
+#endif