Skip to content

Conversation

@atsushi421
Copy link
Collaborator

Description

This removes the redundant @Waitable from callback_group_id preserving backward compatibility.

Related links

How was this PR tested?

prerun

The redundant @Waitables are not outputed.

callback_groups:
  - id: /sample_node@Subscription(/parameter_events)@Service(/sample_node/get_parameters)@Service(/sample_node/get_parameter_types)@Service(/sample_node/set_parameters)@Service(/sample_node/set_parameters_atomically)@Service(/sample_node/describe_parameters)@Service(/sample_node/list_parameters)
    affinity: ~
    policy: SCHED_OTHER
    priority: 0

  - id: /sample_node@Subscription(/topic_in)
    affinity: ~
    policy: SCHED_OTHER
    priority: 0

run

Even if the old-version config is specified, the thread configurator works correctly.

$ ros2 run cie_thread_configurator thread_configurator_node --config-file template_old.yaml 
callback_groups:
  - id: /sample_node@Subscription(/parameter_events)@Service(/sample_node/get_parameters)@Service(/sample_node/get_parameter_types)@Service(/sample_node/set_parameters)@Service(/sample_node/set_parameters_atomically)@Service(/sample_node/describe_parameters)@Service(/sample_node/list_parameters)@Waitable@Waitable@Waitable@Waitable
    affinity: ~
    policy: SCHED_OTHER
    priority: 0
  - id: /sample_node@Subscription(/topic_in)@Waitable
    affinity: ~
    policy: SCHED_OTHER
    priority: 0
  - id: /sample_node@Timer(1333000000)
    affinity: ~
    policy: SCHED_OTHER
    priority: 0
  - id: /sample_node@Timer(3000000000)
    affinity: ~
    policy: SCHED_OTHER
    priority: 0
[INFO] [1761249572.556376986] [thread_configurator_node]: Received CallbackGroupInfo: tid=2553028 | /sample_node@Subscription(/parameter_events)@Service(/sample_node/get_parameters)@Service(/sample_node/get_parameter_types)@Service(/sample_node/set_parameters)@Service(/sample_node/set_parameters_atomically)@Service(/sample_node/describe_parameters)@Service(/sample_node/list_parameters)
[INFO] [1761249572.556554787] [thread_configurator_node]: Received CallbackGroupInfo: tid=2553030 | /sample_node@Timer(1333000000)
[INFO] [1761249572.556586398] [thread_configurator_node]: Received CallbackGroupInfo: tid=2553031 | /sample_node@Subscription(/topic_in)
[INFO] [1761249572.556606673] [thread_configurator_node]: Received CallbackGroupInfo: tid=2553029 | /sample_node@Timer(3000000000)

Notes for reviewers

Signed-off-by: atsushi421 <atsushi.yano.2@tier4.jp>
@sykwer
Copy link
Member

sykwer commented Nov 9, 2025

LGTM

@atsushi421
Could you please update this doc to conform to the changes in this PR? Of course, in another PR.

@atsushi421 atsushi421 merged commit e71ef83 into main Nov 9, 2025
3 checks passed
@atsushi421 atsushi421 deleted the remove_waitable_str branch November 9, 2025 13:48
@atsushi421 atsushi421 mentioned this pull request Nov 9, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants