Skip to content

Commit

Permalink
ros2: allow using different tracepoint provider name
Browse files Browse the repository at this point in the history 
This allows extending the event layout class for a set of tracepoints
that uses a different provider name.

Signed-off-by: Christophe Bedard <bedard.christophe@gmail.com>
Signed-off-by: Christophe Bedard <christophe.bedard@apex.ai>
Change-Id: Ia2fb381ec74774ad6e86ddc95db57b08fcae54be
Reviewed-on: https://git.eclipse.org/r/c/tracecompass.incubator/org.eclipse.tracecompass.incubator/+/202318
Tested-by: Trace Compass Bot <tracecompass-bot@eclipse.org>
Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
  • Loading branch information
@christophebedard
christophebedard committed Jun 2, 2023
1 parent 8a17e8b commit 301824e
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 61 deletions.
7 changes: 7 additions & 0 deletions .../org/eclipse/tracecompass/incubator/internal/ros2/core/trace/layout/IRos2EventLayout.java
View file
Expand Up @@ -46,6 +46,13 @@ public static IRos2EventLayout getDefault() {
return Ros2RollingEventLayout.getInstance();
}

/**
* @return the provider name (ending with a colon)
*/
public default String getProviderName() {
return PROVIDER_NAME;
}

/**
* Get all event names defined here
*
Expand Down
122 changes: 61 additions & 61 deletions ...clipse/tracecompass/incubator/internal/ros2/core/trace/layout/Ros2RollingEventLayout.java
View file
Expand Up @@ -23,37 +23,37 @@
public class Ros2RollingEventLayout implements IRos2EventLayout {

/** Event names */
private static final String RCL_INIT = "ros2:rcl_init";
private static final String RCL_NODE_INIT = "ros2:rcl_node_init";
private static final String RMW_PUBLISHER_INIT = "ros2:rmw_publisher_init";
private static final String RCL_PUBLISHER_INIT = "ros2:rcl_publisher_init";
private static final String RCLCPP_PUBLISH = "ros2:rclcpp_publish";
private static final String RCL_PUBLISH = "ros2:rcl_publish";
private static final String RMW_PUBLISH = "ros2:rmw_publish";
private static final String RMW_SUBSCRIPTION_INIT = "ros2:rmw_subscription_init";
private static final String RCL_SUBSCRIPTION_INIT = "ros2:rcl_subscription_init";
private static final String RCLCPP_SUBSCRIPTION_INIT = "ros2:rclcpp_subscription_init";
private static final String RCLCPP_SUBSCRIPTION_CALLBACK_ADDED = "ros2:rclcpp_subscription_callback_added";
private static final String RMW_TAKE = "ros2:rmw_take";
private static final String RCL_TAKE = "ros2:rcl_take";
private static final String RCLCPP_TAKE = "ros2:rclcpp_take";
private static final String RCL_SERVICE_INIT = "ros2:rcl_service_init";
private static final String RCLCPP_SERVICE_CALLBACK_ADDED = "ros2:rclcpp_service_callback_added";
private static final String RCL_CLIENT_INIT = "ros2:rcl_client_init";
private static final String RCL_TIMER_INIT = "ros2:rcl_timer_init";
private static final String RCLCPP_TIMER_CALLBACK_ADDED = "ros2:rclcpp_timer_callback_added";
private static final String RCLCPP_TIMER_LINK_NODE = "ros2:rclcpp_timer_link_node";
private static final String RCLCPP_CALLBACK_REGISTER = "ros2:rclcpp_callback_register";
private static final String CALLBACK_START = "ros2:callback_start";
private static final String CALLBACK_END = "ros2:callback_end";
private static final String RCL_LIFECYCLE_STATE_MACHINE_INIT = "ros2:rcl_lifecycle_state_machine_init";
private static final String RCL_LIFECYCLE_TRANSITION = "ros2:rcl_lifecycle_transition";
private static final String RCLCPP_EXECUTOR_GET_NEXT_READY = "ros2:rclcpp_executor_get_next_ready";
private static final String RCLCPP_EXECUTOR_WAIT_FOR_WORK = "ros2:rclcpp_executor_wait_for_work";
private static final String RCLCPP_EXECUTOR_EXECUTE = "ros2:rclcpp_executor_execute";

private static final String MESSAGE_LINK_PERIODIC_ASYNC = "ros2:message_link_periodic_async";
private static final String MESSAGE_LINK_PARTIAL_SYNC = "ros2:message_link_partial_sync";
private static final String RCL_INIT = "rcl_init";
private static final String RCL_NODE_INIT = "rcl_node_init";
private static final String RMW_PUBLISHER_INIT = "rmw_publisher_init";
private static final String RCL_PUBLISHER_INIT = "rcl_publisher_init";
private static final String RCLCPP_PUBLISH = "rclcpp_publish";
private static final String RCL_PUBLISH = "rcl_publish";
private static final String RMW_PUBLISH = "rmw_publish";
private static final String RMW_SUBSCRIPTION_INIT = "rmw_subscription_init";
private static final String RCL_SUBSCRIPTION_INIT = "rcl_subscription_init";
private static final String RCLCPP_SUBSCRIPTION_INIT = "rclcpp_subscription_init";
private static final String RCLCPP_SUBSCRIPTION_CALLBACK_ADDED = "rclcpp_subscription_callback_added";
private static final String RMW_TAKE = "rmw_take";
private static final String RCL_TAKE = "rcl_take";
private static final String RCLCPP_TAKE = "rclcpp_take";
private static final String RCL_SERVICE_INIT = "rcl_service_init";
private static final String RCLCPP_SERVICE_CALLBACK_ADDED = "rclcpp_service_callback_added";
private static final String RCL_CLIENT_INIT = "rcl_client_init";
private static final String RCL_TIMER_INIT = "rcl_timer_init";
private static final String RCLCPP_TIMER_CALLBACK_ADDED = "rclcpp_timer_callback_added";
private static final String RCLCPP_TIMER_LINK_NODE = "rclcpp_timer_link_node";
private static final String RCLCPP_CALLBACK_REGISTER = "rclcpp_callback_register";
private static final String CALLBACK_START = "callback_start";
private static final String CALLBACK_END = "callback_end";
private static final String RCL_LIFECYCLE_STATE_MACHINE_INIT = "rcl_lifecycle_state_machine_init";
private static final String RCL_LIFECYCLE_TRANSITION = "rcl_lifecycle_transition";
private static final String RCLCPP_EXECUTOR_GET_NEXT_READY = "rclcpp_executor_get_next_ready";
private static final String RCLCPP_EXECUTOR_WAIT_FOR_WORK = "rclcpp_executor_wait_for_work";
private static final String RCLCPP_EXECUTOR_EXECUTE = "rclcpp_executor_execute";

private static final String MESSAGE_LINK_PERIODIC_ASYNC = "message_link_periodic_async";
private static final String MESSAGE_LINK_PARTIAL_SYNC = "message_link_partial_sync";

private static final String DDS_CREATE_WRITER = "dds:create_writer";
private static final String DDS_WRITE_PRE = "dds:write_pre";
Expand Down Expand Up @@ -137,196 +137,196 @@ public static Ros2RollingEventLayout getInstance() {

@Override
public String eventRclInit() {
return RCL_INIT;
return getProviderName() + RCL_INIT;
}

// rcl_node_init

@Override
public String eventRclNodeInit() {
return RCL_NODE_INIT;
return getProviderName() + RCL_NODE_INIT;
}

// rmw_publisher_init

@Override
public String eventRmwPublisherInit() {
return RMW_PUBLISHER_INIT;
return getProviderName() + RMW_PUBLISHER_INIT;
}

// rcl_publisher_init

@Override
public String eventRclPublisherInit() {
return RCL_PUBLISHER_INIT;
return getProviderName() + RCL_PUBLISHER_INIT;
}

// rclcpp_publish

@Override
public String eventRclcppPublish() {
return RCLCPP_PUBLISH;
return getProviderName() + RCLCPP_PUBLISH;
}

// rcl_publish

@Override
public String eventRclPublish() {
return RCL_PUBLISH;
return getProviderName() + RCL_PUBLISH;
}

// rmw_publish

@Override
public String eventRmwPublish() {
return RMW_PUBLISH;
return getProviderName() + RMW_PUBLISH;
}

// rmw_subscription_init

@Override
public String eventRmwSubscriptionInit() {
return RMW_SUBSCRIPTION_INIT;
return getProviderName() + RMW_SUBSCRIPTION_INIT;
}

// rcl_subscription_init

@Override
public String eventRclSubscriptionInit() {
return RCL_SUBSCRIPTION_INIT;
return getProviderName() + RCL_SUBSCRIPTION_INIT;
}

// rclcpp_subscription_init

@Override
public String eventRclcppSubscriptionInit() {
return RCLCPP_SUBSCRIPTION_INIT;
return getProviderName() + RCLCPP_SUBSCRIPTION_INIT;
}

// rclcpp_subscription_callback_added

@Override
public String eventRclcppSubscriptionCallbackAdded() {
return RCLCPP_SUBSCRIPTION_CALLBACK_ADDED;
return getProviderName() + RCLCPP_SUBSCRIPTION_CALLBACK_ADDED;
}

// rmw_take

@Override
public String eventRmwTake() {
return RMW_TAKE;
return getProviderName() + RMW_TAKE;
}

// rcl_take

@Override
public String eventRclTake() {
return RCL_TAKE;
return getProviderName() + RCL_TAKE;
}

// rclcpp_take

@Override
public String eventRclcppTake() {
return RCLCPP_TAKE;
return getProviderName() + RCLCPP_TAKE;
}

// rcl_service_init

@Override
public String eventRclServiceInit() {
return RCL_SERVICE_INIT;
return getProviderName() + RCL_SERVICE_INIT;
}

// rclcpp_service_callback_added

@Override
public String eventRclcppServiceCallbackAdded() {
return RCLCPP_SERVICE_CALLBACK_ADDED;
return getProviderName() + RCLCPP_SERVICE_CALLBACK_ADDED;
}

// rcl_client_init

@Override
public String eventRclClientInit() {
return RCL_CLIENT_INIT;
return getProviderName() + RCL_CLIENT_INIT;
}

// rcl_timer_init

@Override
public String eventRclTimerInit() {
return RCL_TIMER_INIT;
return getProviderName() + RCL_TIMER_INIT;
}

// rclcpp_timer_callback_added

@Override
public String eventRclcppTimerCallbackAdded() {
return RCLCPP_TIMER_CALLBACK_ADDED;
return getProviderName() + RCLCPP_TIMER_CALLBACK_ADDED;
}

// rclcpp_timer_link_node

@Override
public String eventRclcppTimerLinkNode() {
return RCLCPP_TIMER_LINK_NODE;
return getProviderName() + RCLCPP_TIMER_LINK_NODE;
}

// rclcpp_callback_register

@Override
public String eventRclcppCallbackRegister() {
return RCLCPP_CALLBACK_REGISTER;
return getProviderName() + RCLCPP_CALLBACK_REGISTER;
}

// callback_start

@Override
public String eventCallbackStart() {
return CALLBACK_START;
return getProviderName() + CALLBACK_START;
}

// callback_end

@Override
public String eventCallbackEnd() {
return CALLBACK_END;
return getProviderName() + CALLBACK_END;
}

// rcl_lifecycle_state_machine_init

@Override
public String eventRclLifecycleStateMachineInit() {
return RCL_LIFECYCLE_STATE_MACHINE_INIT;
return getProviderName() + RCL_LIFECYCLE_STATE_MACHINE_INIT;
}

// rcl_lifecycle_transition

@Override
public String eventRclLifecycleTransition() {
return RCL_LIFECYCLE_TRANSITION;
return getProviderName() + RCL_LIFECYCLE_TRANSITION;
}

// rclcpp_executor_get_next_ready

@Override
public String eventRclcppExecutorGetNextReady() {
return RCLCPP_EXECUTOR_GET_NEXT_READY;
return getProviderName() + RCLCPP_EXECUTOR_GET_NEXT_READY;
}

// rclcpp_executor_wait_for_work

@Override
public String eventRclcppExecutorWaitForWork() {
return RCLCPP_EXECUTOR_WAIT_FOR_WORK;
return getProviderName() + RCLCPP_EXECUTOR_WAIT_FOR_WORK;
}

// rclcpp_executor_execute

@Override
public String eventRclcppExecutorExecute() {
return RCLCPP_EXECUTOR_EXECUTE;
return getProviderName() + RCLCPP_EXECUTOR_EXECUTE;
}

// Message causal links
Expand All @@ -335,14 +335,14 @@ public String eventRclcppExecutorExecute() {

@Override
public String eventMessageLinkPeriodicAsync() {
return MESSAGE_LINK_PERIODIC_ASYNC;
return getProviderName() + MESSAGE_LINK_PERIODIC_ASYNC;
}

// message_link_partial_sync

@Override
public String eventMessageLinkPartialSync() {
return MESSAGE_LINK_PARTIAL_SYNC;
return getProviderName() + MESSAGE_LINK_PARTIAL_SYNC;
}

// DDS
Expand Down

0 comments on commit 301824e

Please sign in to comment.