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

Make callback objects dataframe generic

Browse source
This commit is contained in:
Christophe Bedard 2019-06-13 14:47:45 +02:00
parent 80a62cd591
commit 4efa003be0
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tracetools_analysis/analysis/data_model.py
View file

@ -22,8 +22,6 @@ class DataModel():
self._publishers.set_index(['publisher_handle'], inplace=True, drop=True) self._publishers.set_index(['publisher_handle'], inplace=True, drop=True)
self._subscriptions = pd.DataFrame(columns=['subscription_handle', 'timestamp', 'node_handle', 'rmw_handle', 'topic_name', 'depth']) self._subscriptions = pd.DataFrame(columns=['subscription_handle', 'timestamp', 'node_handle', 'rmw_handle', 'topic_name', 'depth'])
self._subscriptions.set_index(['subscription_handle'], inplace=True, drop=True) self._subscriptions.set_index(['subscription_handle'], inplace=True, drop=True)
self._subscription_callback_objects = pd.DataFrame(columns=['subscription_handle', 'timestamp', 'callback_object'])
self._subscription_callback_objects.set_index(['subscription_handle'], inplace=True, drop=True)
self._callbacks = pd.DataFrame(columns=['callback_object', 'timestamp', 'symbol']) self._callbacks = pd.DataFrame(columns=['callback_object', 'timestamp', 'symbol'])
self._callbacks.set_index(['callback_object'], inplace=True, drop=True) self._callbacks.set_index(['callback_object'], inplace=True, drop=True)
@ -31,6 +29,9 @@ class DataModel():
self._clients = pd.DataFrame(columns=[]) self._clients = pd.DataFrame(columns=[])
self._timers = pd.DataFrame(columns=[]) self._timers = pd.DataFrame(columns=[])
self._callback_objects = pd.DataFrame(columns=['handle', 'timestamp', 'callback_object'])
self._callback_objects.set_index(['handle'], inplace=True, drop=True)
# Events (multiple instances, may not have a meaningful index) # Events (multiple instances, may not have a meaningful index)
self._subscription_callbacks = pd.DataFrame(columns=['callback_object', 'timestamp', 'duration', 'intra_process']) self._subscription_callbacks = pd.DataFrame(columns=['callback_object', 'timestamp', 'duration', 'intra_process'])
@ -47,7 +48,7 @@ class DataModel():
self._subscriptions.loc[subscription_handle] = [timestamp, node_handle, rmw_handle, topic_name, depth] self._subscriptions.loc[subscription_handle] = [timestamp, node_handle, rmw_handle, topic_name, depth]
def add_subscription_callback_object(self, subscription_handle, timestamp, callback_object): def add_subscription_callback_object(self, subscription_handle, timestamp, callback_object):
self._subscription_callback_objects.loc[subscription_handle] = [timestamp, callback_object] self._callback_objects.loc[subscription_handle] = [timestamp, callback_object]
def add_callback(self, callback_object, timestamp, symbol): def add_callback(self, callback_object, timestamp, symbol):
self._callbacks.loc[callback_object] = [timestamp, symbol] self._callbacks.loc[callback_object] = [timestamp, symbol]
@ -66,8 +67,6 @@ class DataModel():
print() print()
print(f'Subscriptions:\n{self._subscriptions.to_string()}') print(f'Subscriptions:\n{self._subscriptions.to_string()}')
print() print()
print(f'Subscription callbacks:\n{self._subscription_callback_objects.to_string()}')
print()
print(f'Subscription callback instances:\n{self._subscription_callbacks.to_string()}') print(f'Subscription callback instances:\n{self._subscription_callbacks.to_string()}')
print() print()
print(f'Services:\n{self._services.to_string()}') print(f'Services:\n{self._services.to_string()}')
@ -76,5 +75,7 @@ class DataModel():
print() print()
print(f'Timers:\n{self._timers.to_string()}') print(f'Timers:\n{self._timers.to_string()}')
print() print()
print(f'Callback objects:\n{self._callback_objects.to_string()}')
print()
print(f'Callbacks:\n{self._callbacks.to_string()}') print(f'Callbacks:\n{self._callbacks.to_string()}')
print('==================================================') print('==================================================')