Renaming launch::lazy --> launch::select

STEllAR-GROUP · Aug 10, 2017 · 338459f · 338459f
1 parent 69fef1f
commit 338459f
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 25 deletions.
diff --git a/hpx/runtime/launch_policy.hpp b/hpx/runtime/launch_policy.hpp
@@ -196,15 +196,15 @@ namespace hpx
         };
 
         template <typename Pred>
-        struct lazy_policy : policy_holder<lazy_policy<Pred> >
+        struct select_policy : policy_holder<select_policy<Pred> >
         {
             template <typename F, typename U =
                 typename std::enable_if<!std::is_same<
-                    lazy_policy<Pred>, typename std::decay<F>::type
+                    select_policy<Pred>, typename std::decay<F>::type
                 >::value>::type>
-            explicit lazy_policy(F && f, threads::thread_priority priority =
+            explicit select_policy(F && f, threads::thread_priority priority =
                         threads::thread_priority_default)
-              : policy_holder<lazy_policy<Pred> >(launch_policy::async, priority)
+              : policy_holder<select_policy<Pred> >(launch_policy::async, priority)
               , pred_(std::forward<F>(f))
             {}
 
@@ -222,7 +222,7 @@ namespace hpx
             Pred pred_;
         };
 
-        struct lazy_policy_generator
+        struct select_policy_generator
         {
             HPX_CONSTEXPR async_policy operator()(
                 threads::thread_priority priority) const noexcept
@@ -231,11 +231,11 @@ namespace hpx
             }
 
             template <typename F>
-            lazy_policy<typename std::decay<F>::type> operator()(F && f,
+            select_policy<typename std::decay<F>::type> operator()(F && f,
                 threads::thread_priority priority =
                     threads::thread_priority_default) const
             {
-                return lazy_policy<typename std::decay<F>::type>(
+                return select_policy<typename std::decay<F>::type>(
                     std::forward<F>(f), priority);
             }
         };
@@ -377,7 +377,7 @@ namespace hpx
 
         /// Create a launch policy representing fire and forget execution
         template <typename F>
-        HPX_CONSTEXPR launch(detail::lazy_policy<F> const& p) noexcept
+        HPX_CONSTEXPR launch(detail::select_policy<F> const& p) noexcept
           : detail::policy_holder<>{p.policy()}
         {}
 
@@ -389,7 +389,7 @@ namespace hpx
         using deferred_policy = detail::deferred_policy;
         using apply_policy = detail::apply_policy;
         template <typename F>
-        using lazy_policy = detail::lazy_policy<F>;
+        using select_policy = detail::select_policy<F>;
         /// \endcond
 
         ///////////////////////////////////////////////////////////////////////
@@ -409,9 +409,8 @@ namespace hpx
         /// Predefined launch policy representing fire and forget execution
         HPX_EXPORT static const detail::apply_policy apply;
 
-        /// Predefined launch policy representing conditionally asynchronous
-        /// execution
-        HPX_EXPORT static const detail::lazy_policy_generator lazy;
+        /// Predefined launch policy representing delayed policy selection
+        HPX_EXPORT static const detail::select_policy_generator select;
 
         /// \cond NOINTERNAL
         HPX_EXPORT static const detail::policy_holder<> all;

diff --git a/src/runtime/launch_policy.cpp b/src/runtime/launch_policy.cpp
@@ -20,8 +20,8 @@ namespace hpx
     const detail::deferred_policy launch::deferred = detail::deferred_policy{};
     const detail::apply_policy launch::apply = detail::apply_policy{};
 
-    const detail::lazy_policy_generator launch::lazy =
-        detail::lazy_policy_generator{};
+    const detail::select_policy_generator launch::select =
+        detail::select_policy_generator{};
 
     const detail::policy_holder<> launch::all =
         detail::policy_holder<>{detail::launch_policy::all};

diff --git a/tests/unit/lcos/async_local.cpp b/tests/unit/lcos/async_local.cpp
@@ -260,7 +260,7 @@ int hpx_main()
         using hpx::util::placeholders::_1;
 
         auto policy1 =
-            hpx::launch::lazy([]()
+            hpx::launch::select([]()
             {
                 return hpx::launch::sync;
             });
@@ -275,7 +275,7 @@ int hpx_main()
 
         boost::atomic<int> count(0);
         auto policy2 =
-            hpx::launch::lazy([&count]() -> hpx::launch
+            hpx::launch::select([&count]() -> hpx::launch
             {
                 if (count++ == 0)
                     return hpx::launch::async;

diff --git a/tests/unit/lcos/async_remote.cpp b/tests/unit/lcos/async_remote.cpp
@@ -159,7 +159,7 @@ void test_remote_async(hpx::id_type const& target)
 
     {
         auto policy1 =
-            hpx::launch::lazy([]()
+            hpx::launch::select([]()
             {
                 return hpx::launch::deferred;
             });
@@ -170,7 +170,7 @@ void test_remote_async(hpx::id_type const& target)
 
         boost::atomic<int> count(0);
         auto policy2 =
-            hpx::launch::lazy([&count]() -> hpx::launch
+            hpx::launch::select([&count]() -> hpx::launch
             {
                 if (count++ == 0)
                     return hpx::launch::async;

diff --git a/tests/unit/lcos/future_then.cpp b/tests/unit/lcos/future_then.cpp
@@ -161,7 +161,7 @@ void test_complex_then()
 void test_complex_then_launch()
 {
     auto policy =
-        hpx::launch::lazy([]()
+        hpx::launch::select([]()
         {
             return hpx::launch::async;
         });
@@ -184,7 +184,7 @@ void test_complex_then_chain_one_launch()
 {
     boost::atomic<int> count(0);
     auto policy =
-        hpx::launch::lazy(
+        hpx::launch::select(
             [&count]() -> hpx::launch
             {
                 if (count++ == 0)

diff --git a/tests/unit/lcos/local_dataflow.cpp b/tests/unit/lcos/local_dataflow.cpp
@@ -327,7 +327,7 @@ void plain_arguments_lazy()
     int_f4_count.store(0);
 
     auto policy1 =
-        hpx::launch::lazy([]()
+        hpx::launch::select([]()
         {
             return hpx::launch::sync;
         });
@@ -344,7 +344,7 @@ void plain_arguments_lazy()
     }
 
     auto policy2 =
-        hpx::launch::lazy([]()
+        hpx::launch::select([]()
         {
             return hpx::launch::async;
         });
@@ -365,7 +365,7 @@ void plain_arguments_lazy()
 
     boost::atomic<int> count(0);
     auto policy3 =
-        hpx::launch::lazy([&count]() -> hpx::launch
+        hpx::launch::select([&count]() -> hpx::launch
         {
             if (count++ == 0)
                 return hpx::launch::async;

diff --git a/tests/unit/lcos/remote_dataflow.cpp b/tests/unit/lcos/remote_dataflow.cpp
@@ -85,7 +85,7 @@ void plain_actions(hpx::id_type const& there)
     }
 
     auto policy1 =
-        hpx::launch::lazy([]()
+        hpx::launch::select([]()
         {
             return hpx::launch::sync;
         });
@@ -106,7 +106,7 @@ void plain_actions(hpx::id_type const& there)
 
     boost::atomic<int> count(0);
     auto policy2 =
-        hpx::launch::lazy([&count]() -> hpx::launch
+        hpx::launch::select([&count]() -> hpx::launch
         {
             if (count++ == 0)
                 return hpx::launch::async;