niklas/tracetools_analysis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update get_callback_owner_info() util method

Browse source
This commit is contained in:
Christophe Bedard 2019-11-17 11:59:51 -08:00
parent fecdf3580c
commit 80b05dc5b5
1 changed files with 51 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

73
tracetools_analysis/tracetools_analysis/utils.py
View file

@ -346,29 +346,29 @@ class RosDataModelUtil(DataModelUtil):
:param callback_obj: the callback object value :param callback_obj: the callback object value
:return: information about the owner of the callback, or `None` if it fails :return: information about the owner of the callback, or `None` if it fails
""" """
# Get handle corresponding to callback object # Get reference corresponding to callback object
handle = self.data.callback_objects.loc[ reference = self.data.callback_objects.loc[
self.data.callback_objects['callback_object'] == callback_obj self.data.callback_objects['callback_object'] == callback_obj
].index.values.astype(int)[0] ].index.values.astype(int)[0]
type_name = None type_name = None
info = None info = None
# Check if it's a timer first (since it's slightly different than the others) # Check if it's a timer first (since it's slightly different than the others)
if handle in self.data.timers.index: if reference in self.data.timers.index:
type_name = 'Timer' type_name = 'Timer'
info = self.get_timer_handle_info(handle) info = self.get_timer_handle_info(reference)
elif handle in self.data.publishers.index: elif reference in self.data.publishers.index:
type_name = 'Publisher' type_name = 'Publisher'
info = self.get_publisher_handle_info(handle) info = self.get_publisher_handle_info(reference)
elif handle in self.data.subscriptions.index: elif reference in self.data.subscription_objects.index:
type_name = 'Subscription' type_name = 'Subscription'
info = self.get_subscription_handle_info(handle) info = self.get_subscription_reference_info(reference)
elif handle in self.data.services.index: elif reference in self.data.services.index:
type_name = 'Service' type_name = 'Service'
info = self.get_service_handle_info(handle) info = self.get_service_handle_info(reference)
elif handle in self.data.clients.index: elif reference in self.data.clients.index:
type_name = 'Client' type_name = 'Client'
info = self.get_client_handle_info(handle) info = self.get_client_handle_info(reference)
if info is not None: if info is not None:
info = f'{type_name} -- {self.format_info_dict(info)}' info = f'{type_name} -- {self.format_info_dict(info)}'
@ -410,25 +410,54 @@ class RosDataModelUtil(DataModelUtil):
publisher_info = {'topic': topic_name} publisher_info = {'topic': topic_name}
return {**node_handle_info, **publisher_info} return {**node_handle_info, **publisher_info}
def get_subscription_handle_info( def get_subscription_reference_info(
self, subscription_handle: int, self, subscription_reference: int,
) -> Union[Mapping[str, Any], None]: ) -> Union[Mapping[str, Any], None]:
""" """
Get information about a subscription handle. Get information about a subscription handle.
:param subscription_handle: the subscription handle value :param subscription_reference: the subscription reference value
:return: a dictionary with name:value info, or `None` if it fails :return: a dictionary with name:value info, or `None` if it fails
""" """
subscriptions_info = self.data.subscriptions.merge( # First check that the subscription reference exists
self.data.nodes, if subscription_reference not in self.data.subscription_objects.index:
left_on='node_handle',
right_index=True)
if subscription_handle not in self.data.subscriptions.index:
return None return None
node_handle = subscriptions_info.loc[subscription_handle, 'node_handle'] # To get information about a subscription reference, we need 3 dataframes
# * subscription_objects
# * subscription (reference) <--> subscription_handle
# * subscriptions
# * subscription_handle <--> topic_name
# * subscription_handle <--> node_handle
# * nodes
# * node_handle <--> (node info)
# First, drop unnecessary common columns for debugging simplicity
subscription_objects_simple = self.data.subscription_objects.drop(
columns=['timestamp'],
axis=1,
)
subscriptions_simple = self.data.subscriptions.drop(
columns=['timestamp', 'rmw_handle'],
inplace=False,
)
nodes_simple = self.data.nodes.drop(
columns=['timestamp', 'rmw_handle'],
inplace=False,
)
# Then merge the 3 dataframes
subscriptions_info = subscription_objects_simple.merge(
subscriptions_simple,
left_on='subscription_handle',
right_index=True,
).merge(
nodes_simple,
left_on='node_handle',
right_index=True,
)
node_handle = subscriptions_info.loc[subscription_reference, 'node_handle']
node_handle_info = self.get_node_handle_info(node_handle) node_handle_info = self.get_node_handle_info(node_handle)
topic_name = subscriptions_info.loc[subscription_handle, 'topic_name'] topic_name = subscriptions_info.loc[subscription_reference, 'topic_name']
subscription_info = {'topic': topic_name} subscription_info = {'topic': topic_name}
return {**node_handle_info, **subscription_info} return {**node_handle_info, **subscription_info}