Skip to content

Commit

Permalink
Merge pull request #15 from fmrico/events_executor
Browse files Browse the repository at this point in the history
Change to EventsExecutor
  • Loading branch information
fmrico authored Nov 8, 2024
2 parents ad2e905 + a5a5521 commit 3ffd0bc
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 39 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/jazzy-devel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: jazzy-devel
on:
pull_request:
branches:
- jazzy
- jazzy-devel
push:
branches:
- jazzy
- jazzy-devel
workflow_dispatch:
schedule:
- cron: '0 0 * * 0'
Expand All @@ -20,11 +20,11 @@ jobs:
fail-fast: false
steps:
- name: Setup ROS 2
uses: ros-tooling/[email protected].1
uses: ros-tooling/[email protected].9
with:
required-ros-distributions: jazzy
- name: build and test
uses: ros-tooling/[email protected].6
uses: ros-tooling/[email protected].13
with:
package-name: rclcpp_cascade_lifecycle rclcpy_cascade_lifecycle cascade_lifecycle_msgs
target-ros2-distro: jazzy
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rolling.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ jobs:
fail-fast: false
steps:
- name: Setup ROS 2
uses: ros-tooling/[email protected].1
uses: ros-tooling/[email protected].9
with:
required-ros-distributions: rolling
- name: build and test
uses: ros-tooling/[email protected].6
uses: ros-tooling/[email protected].13
with:
package-name: rclcpp_cascade_lifecycle rclpy_cascade_lifecycle cascade_lifecycle_msgs
target-ros2-distro: rolling
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Using `rclcpp_cascade_lifecycle` in the next example, `node_b` makes the same st
auto node_a = std::make_shared<rclcpp_cascade_lifecycle::CascadeLifecycleNode>("node_A");
auto node_b = std::make_shared<rclcpp_cascade_lifecycle::CascadeLifecycleNode>("node_B");
rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_a->get_node_base_interface());
executor.add_node(node_b->get_node_base_interface());
Expand Down
32 changes: 16 additions & 16 deletions rclcpp_cascade_lifecycle/test/rclcpp_cascade_lifecycle_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ TEST(rclcpp_cascade_lifecycle, activations_managing_basic)
auto node_b = std::make_shared<rclcpp_cascade_lifecycle::CascadeLifecycleNode>("node_B");
auto node_c = std::make_shared<rclcpp_cascade_lifecycle::CascadeLifecycleNode>("node_C");

rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_a->get_node_base_interface());
executor.add_node(node_b->get_node_base_interface());
executor.add_node(node_c->get_node_base_interface());
Expand Down Expand Up @@ -104,7 +104,7 @@ TEST(rclcpp_cascade_lifecycle, activations_managing_late_joining)
auto node_a = std::make_shared<rclcpp_cascade_lifecycle::CascadeLifecycleNode>("node_A");
auto node_b = std::make_shared<rclcpp_cascade_lifecycle::CascadeLifecycleNode>("node_B");

rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_a->get_node_base_interface());
executor.add_node(node_b->get_node_base_interface());

Expand Down Expand Up @@ -164,7 +164,7 @@ TEST(rclcpp_cascade_lifecycle, activations_chained)
auto node_a = std::make_shared<rclcpp_cascade_lifecycle::CascadeLifecycleNode>("node_A");
auto node_b = std::make_shared<rclcpp_cascade_lifecycle::CascadeLifecycleNode>("node_B");

rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_a->get_node_base_interface());
executor.add_node(node_b->get_node_base_interface());

Expand Down Expand Up @@ -265,7 +265,7 @@ TEST(rclcpp_cascade_lifecycle, multiple_activations_chained)
auto node_b = std::make_shared<rclcpp_cascade_lifecycle::CascadeLifecycleNode>("node_B");
auto node_c = std::make_shared<rclcpp_cascade_lifecycle::CascadeLifecycleNode>("node_C");

rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_a->get_node_base_interface());
executor.add_node(node_b->get_node_base_interface());
executor.add_node(node_c->get_node_base_interface());
Expand Down Expand Up @@ -447,7 +447,7 @@ TEST(rclcpp_cascade_lifecycle, fast_change)
auto node_a = std::make_shared<rclcpp_cascade_lifecycle::CascadeLifecycleNode>("node_A");
auto node_b = std::make_shared<rclcpp_cascade_lifecycle::CascadeLifecycleNode>("node_B");

rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_a->get_node_base_interface());
executor.add_node(node_b->get_node_base_interface());

Expand Down Expand Up @@ -489,7 +489,7 @@ TEST(rclcpp_cascade_lifecycle, activators_disappearance)
auto node_a = std::make_shared<rclcpp_cascade_lifecycle::CascadeLifecycleNode>("node_A");
auto node_b = std::make_shared<rclcpp_cascade_lifecycle::CascadeLifecycleNode>("node_B");

rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_a->get_node_base_interface());
executor.add_node(node_b->get_node_base_interface());

Expand Down Expand Up @@ -549,7 +549,7 @@ TEST(rclcpp_cascade_lifecycle, activators_disappearance_inter)
auto node_b = std::make_shared<rclcpp_cascade_lifecycle::CascadeLifecycleNode>("node_B");
auto node_c = std::make_shared<rclcpp_cascade_lifecycle::CascadeLifecycleNode>("node_C");

rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_a->get_node_base_interface());
executor.add_node(node_b->get_node_base_interface());
executor.add_node(node_c->get_node_base_interface());
Expand Down Expand Up @@ -901,7 +901,7 @@ TEST(rclcpp_cascade_lifecycle, inheritance)
auto node_1 = std::make_shared<TestNode>("node_1");
auto node_2 = std::make_shared<TestNode>("node_2");

rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_1->get_node_base_interface());
executor.add_node(node_2->get_node_base_interface());

Expand Down Expand Up @@ -967,7 +967,7 @@ TEST(rclcpp_cascade_lifecycle, activations_managing_basic_with_namespace)
"node_C",
"test_ns");

rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_a->get_node_base_interface());
executor.add_node(node_b->get_node_base_interface());
executor.add_node(node_c->get_node_base_interface());
Expand Down Expand Up @@ -1001,7 +1001,7 @@ TEST(rclcpp_cascade_lifecycle, activations_managing_late_joining_with_namespace)
"node_B",
"test_ns");

rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_a->get_node_base_interface());
executor.add_node(node_b->get_node_base_interface());

Expand Down Expand Up @@ -1069,7 +1069,7 @@ TEST(rclcpp_cascade_lifecycle, activations_chained_with_namespace)
"node_B",
"test_ns");

rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_a->get_node_base_interface());
executor.add_node(node_b->get_node_base_interface());

Expand Down Expand Up @@ -1176,7 +1176,7 @@ TEST(rclcpp_cascade_lifecycle, multiple_activations_chained_with_namespace)
"node_C",
"test_ns");

rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_a->get_node_base_interface());
executor.add_node(node_b->get_node_base_interface());
executor.add_node(node_c->get_node_base_interface());
Expand Down Expand Up @@ -1362,7 +1362,7 @@ TEST(rclcpp_cascade_lifecycle, fast_change_with_namespace)
"node_B",
"test_ns");

rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_a->get_node_base_interface());
executor.add_node(node_b->get_node_base_interface());

Expand Down Expand Up @@ -1408,7 +1408,7 @@ TEST(rclcpp_cascade_lifecycle, activators_disappearance_with_namespace)
"node_B",
"test_ns");

rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_a->get_node_base_interface());
executor.add_node(node_b->get_node_base_interface());

Expand Down Expand Up @@ -1474,7 +1474,7 @@ TEST(rclcpp_cascade_lifecycle, activators_disappearance_inter_with_namespace)
"node_C",
"test_ns");

rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_a->get_node_base_interface());
executor.add_node(node_b->get_node_base_interface());
executor.add_node(node_c->get_node_base_interface());
Expand Down Expand Up @@ -1830,7 +1830,7 @@ TEST(rclcpp_cascade_lifecycle, inheritance_with_namespace)
"node_2",
"test_ns");

rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_1->get_node_base_interface());
executor.add_node(node_2->get_node_base_interface());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ TEST(rclcpp_cascade_lifecycle_no_duplicates, activations_managing_basic)
auto node_b = std::make_shared<rclcpp_cascade_lifecycle::CascadeLifecycleNode>("node_B", options);
auto node_c = std::make_shared<rclcpp_cascade_lifecycle::CascadeLifecycleNode>("node_C", options);

rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_a->get_node_base_interface());
executor.add_node(node_b->get_node_base_interface());
executor.add_node(node_c->get_node_base_interface());
Expand Down Expand Up @@ -113,7 +113,7 @@ TEST(rclcpp_cascade_lifecycle_no_duplicates, activations_managing_late_joining)
auto node_a = std::make_shared<rclcpp_cascade_lifecycle::CascadeLifecycleNode>("node_A", options);
auto node_b = std::make_shared<rclcpp_cascade_lifecycle::CascadeLifecycleNode>("node_B", options);

rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_a->get_node_base_interface());
executor.add_node(node_b->get_node_base_interface());

Expand Down Expand Up @@ -177,7 +177,7 @@ TEST(rclcpp_cascade_lifecycle_no_duplicates, activations_chained)
auto node_a = std::make_shared<rclcpp_cascade_lifecycle::CascadeLifecycleNode>("node_A", options);
auto node_b = std::make_shared<rclcpp_cascade_lifecycle::CascadeLifecycleNode>("node_B", options);

rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_a->get_node_base_interface());
executor.add_node(node_b->get_node_base_interface());

Expand Down Expand Up @@ -282,7 +282,7 @@ TEST(rclcpp_cascade_lifecycle_no_duplicates, multiple_activations_chained)
auto node_b = std::make_shared<rclcpp_cascade_lifecycle::CascadeLifecycleNode>("node_B", options);
auto node_c = std::make_shared<rclcpp_cascade_lifecycle::CascadeLifecycleNode>("node_C", options);

rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_a->get_node_base_interface());
executor.add_node(node_b->get_node_base_interface());
executor.add_node(node_c->get_node_base_interface());
Expand Down Expand Up @@ -468,7 +468,7 @@ TEST(rclcpp_cascade_lifecycle_no_duplicates, fast_change)
auto node_a = std::make_shared<rclcpp_cascade_lifecycle::CascadeLifecycleNode>("node_A", options);
auto node_b = std::make_shared<rclcpp_cascade_lifecycle::CascadeLifecycleNode>("node_B", options);

rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_a->get_node_base_interface());
executor.add_node(node_b->get_node_base_interface());

Expand Down Expand Up @@ -514,7 +514,7 @@ TEST(rclcpp_cascade_lifecycle_no_duplicates, activators_disappearance)
auto node_a = std::make_shared<rclcpp_cascade_lifecycle::CascadeLifecycleNode>("node_A", options);
auto node_b = std::make_shared<rclcpp_cascade_lifecycle::CascadeLifecycleNode>("node_B", options);

rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_a->get_node_base_interface());
executor.add_node(node_b->get_node_base_interface());

Expand Down Expand Up @@ -578,7 +578,7 @@ TEST(rclcpp_cascade_lifecycle_no_duplicates, activators_disappearance_inter)
auto node_b = std::make_shared<rclcpp_cascade_lifecycle::CascadeLifecycleNode>("node_B", options);
auto node_c = std::make_shared<rclcpp_cascade_lifecycle::CascadeLifecycleNode>("node_C", options);

rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_a->get_node_base_interface());
executor.add_node(node_b->get_node_base_interface());
executor.add_node(node_c->get_node_base_interface());
Expand Down Expand Up @@ -934,7 +934,7 @@ TEST(rclcpp_cascade_lifecycle_no_duplicates, inheritance)
auto node_1 = std::make_shared<TestNode>("node_1", "", options);
auto node_2 = std::make_shared<TestNode>("node_2", "", options);

rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_1->get_node_base_interface());
executor.add_node(node_2->get_node_base_interface());

Expand Down Expand Up @@ -1007,7 +1007,7 @@ TEST(rclcpp_cascade_lifecycle_no_duplicates, activations_managing_basic_with_nam
"test_ns",
options);

rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_a->get_node_base_interface());
executor.add_node(node_b->get_node_base_interface());
executor.add_node(node_c->get_node_base_interface());
Expand Down Expand Up @@ -1047,7 +1047,7 @@ TEST(rclcpp_cascade_lifecycle_no_duplicates, activations_managing_late_joining_w
"test_ns",
options);

rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_a->get_node_base_interface());
executor.add_node(node_b->get_node_base_interface());

Expand Down Expand Up @@ -1122,7 +1122,7 @@ TEST(rclcpp_cascade_lifecycle_no_duplicates, activations_chained_with_namespace)
"test_ns",
options);

rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_a->get_node_base_interface());
executor.add_node(node_b->get_node_base_interface());

Expand Down Expand Up @@ -1236,7 +1236,7 @@ TEST(rclcpp_cascade_lifecycle_no_duplicates, multiple_activations_chained_with_n
"test_ns",
options);

rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_a->get_node_base_interface());
executor.add_node(node_b->get_node_base_interface());
executor.add_node(node_c->get_node_base_interface());
Expand Down Expand Up @@ -1428,7 +1428,7 @@ TEST(rclcpp_cascade_lifecycle_no_duplicates, fast_change_with_namespace)
"test_ns",
options);

rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_a->get_node_base_interface());
executor.add_node(node_b->get_node_base_interface());

Expand Down Expand Up @@ -1480,7 +1480,7 @@ TEST(rclcpp_cascade_lifecycle_no_duplicates, activators_disappearance_with_names
"test_ns",
options);

rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_a->get_node_base_interface());
executor.add_node(node_b->get_node_base_interface());

Expand Down Expand Up @@ -1553,7 +1553,7 @@ TEST(rclcpp_cascade_lifecycle_no_duplicates, activators_disappearance_inter_with
"test_ns",
options);

rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_a->get_node_base_interface());
executor.add_node(node_b->get_node_base_interface());
executor.add_node(node_c->get_node_base_interface());
Expand Down Expand Up @@ -1915,7 +1915,7 @@ TEST(rclcpp_cascade_lifecycle_no_duplicates, inheritance_with_namespace)
"test_ns",
options);

rclcpp::executors::SingleThreadedExecutor executor;
rclcpp::experimental::executors::EventsExecutor executor;
executor.add_node(node_1->get_node_base_interface());
executor.add_node(node_2->get_node_base_interface());

Expand Down

0 comments on commit 3ffd0bc

Please sign in to comment.