From e73960979c451d87cdf9b684d6086bba0a3ea8b3 Mon Sep 17 00:00:00 2001 From: Mikael Simberg Date: Fri, 13 Nov 2020 15:48:38 +0100 Subject: [PATCH] Fix unused variable warnings in schedule and p0443 executor tests --- .../tests/unit/basic_schedule.cpp | 3 ++ .../executors/tests/unit/p0443_executor.cpp | 41 +++++++++++++++++-- 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/libs/core/execution_base/tests/unit/basic_schedule.cpp b/libs/core/execution_base/tests/unit/basic_schedule.cpp index 6551b829222a..1d606efd7af8 100644 --- a/libs/core/execution_base/tests/unit/basic_schedule.cpp +++ b/libs/core/execution_base/tests/unit/basic_schedule.cpp @@ -133,16 +133,19 @@ int main() scheduler_1 s1; sender snd1 = hpx::execution::experimental::schedule(s1); + HPX_UNUSED(snd1); HPX_TEST_EQ(member_schedule_calls, std::size_t(1)); HPX_TEST_EQ(tag_invoke_schedule_calls, std::size_t(0)); scheduler_2 s2; sender snd2 = hpx::execution::experimental::schedule(s2); + HPX_UNUSED(snd2); HPX_TEST_EQ(member_schedule_calls, std::size_t(1)); HPX_TEST_EQ(tag_invoke_schedule_calls, std::size_t(1)); scheduler_3 s3; sender snd3 = hpx::execution::experimental::schedule(s3); + HPX_UNUSED(snd3); HPX_TEST_EQ(member_schedule_calls, std::size_t(2)); HPX_TEST_EQ(tag_invoke_schedule_calls, std::size_t(1)); diff --git a/libs/parallelism/executors/tests/unit/p0443_executor.cpp b/libs/parallelism/executors/tests/unit/p0443_executor.cpp index ae1474acb646..5c381c788209 100644 --- a/libs/parallelism/executors/tests/unit/p0443_executor.cpp +++ b/libs/parallelism/executors/tests/unit/p0443_executor.cpp @@ -75,8 +75,8 @@ void test_sender_receiver_transform_wait() HPX_TEST_NEQ(sender_receiver_transform_thread_id, parent_id); ++transform_count; }); - auto work2 = hpx::execution::experimental::transform( - work1, [&transform_count, parent_id]() { + auto work2 = + hpx::execution::experimental::transform(work1, [&transform_count]() { HPX_TEST_EQ(sender_receiver_transform_thread_id, hpx::this_thread::get_id()); ++transform_count; @@ -126,14 +126,14 @@ void test_sender_receiver_transform_arguments() return 3; }); auto work2 = hpx::execution::experimental::transform( - work1, [&transform_count, parent_id](int x) -> std::string { + work1, [&transform_count](int x) -> std::string { HPX_TEST_EQ(sender_receiver_transform_thread_id, hpx::this_thread::get_id()); ++transform_count; return std::string("hello") + std::to_string(x); }); auto work3 = hpx::execution::experimental::transform( - work2, [&transform_count, parent_id](std::string s) { + work2, [&transform_count](std::string s) { HPX_TEST_EQ(sender_receiver_transform_thread_id, hpx::this_thread::get_id()); ++transform_count; @@ -147,6 +147,38 @@ void test_sender_receiver_transform_arguments() HPX_TEST_EQ(result, std::size_t(12)); } +// void test_sender_receiver_change_context() +// { +// hpx::execution::experimental::executor exec{}; +// hpx::thread::id parent_id = hpx::this_thread::get_id(); + +// auto begin = hpx::execution::experimental::schedule(exec); +// auto work1 = hpx::execution::experimental::transform(begin, [=]() { +// sender_receiver_transform_thread_id = hpx::this_thread::get_id(); +// HPX_TEST_NEQ(sender_receiver_transform_thread_id, parent_id); +// }); +// auto work2 = hpx::execution::experimental::transform(work1, []() { +// HPX_TEST_EQ(sender_receiver_transform_thread_id, hpx::this_thread::get_id()); +// }); +// auto work3 = hpx::execution::experimental::transform(work2, []() { +// HPX_TEST_EQ(sender_receiver_transform_thread_id, hpx::this_thread::get_id()); +// }); +// auto new_context = hpx::execution::experimental::via(exec, work3); +// auto work4 = hpx::execution::experimental::transform(new_context, []() { +// hpx::thread::id this_thread_id = hpx::this_thread::get_id(); +// HPX_TEST_NEQ(parent_id, this_thread_id); +// HPX_TEST_NEQ(sender_receiver_transform_thread_id, this_thread_id); +// sender_receiver_transform_thread_id = this_thread_id; +// }); +// auto work5 = hpx::execution::experimental::transform(new_context, []() { +// HPX_TEST_EQ(sender_receiver_transform_thread_id, hpx::this_thread::get_id()); +// }); +// auto work6 = hpx::execution::experimental::transform(new_context, []() { +// HPX_TEST_EQ(sender_receiver_transform_thread_id, hpx::this_thread::get_id()); +// }); +// hpx::execution::experimental::wait(work6); +// } + /////////////////////////////////////////////////////////////////////////////// int hpx_main(int argc, char* argv[]) { @@ -157,6 +189,7 @@ int hpx_main(int argc, char* argv[]) test_sender_receiver_transform_wait(); test_sender_receiver_transform_sync_wait(); test_sender_receiver_transform_arguments(); + // test_sender_receiver_then_change_context(); return hpx::finalize(); }