Skip to content

Commit

Permalink
Fix unused variable warnings in schedule and p0443 executor tests
Browse files Browse the repository at this point in the history
  • Loading branch information
msimberg committed Nov 13, 2020
1 parent 0e55aba commit e739609
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 4 deletions.
3 changes: 3 additions & 0 deletions libs/core/execution_base/tests/unit/basic_schedule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down
41 changes: 37 additions & 4 deletions libs/parallelism/executors/tests/unit/p0443_executor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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[])
{
Expand All @@ -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();
}
Expand Down

0 comments on commit e739609

Please sign in to comment.