From d39ffc11f358635b5c5783eed9470ef20d4faf07 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Thu, 27 Jun 2019 15:01:44 +0200 Subject: [PATCH] Remove merge between timer and nodes --- .../tracetools_analysis/analysis/utils.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tracetools_analysis/tracetools_analysis/analysis/utils.py b/tracetools_analysis/tracetools_analysis/analysis/utils.py index 15ec3c8..e0d3a8c 100644 --- a/tracetools_analysis/tracetools_analysis/analysis/utils.py +++ b/tracetools_analysis/tracetools_analysis/analysis/utils.py @@ -111,14 +111,14 @@ class DataModelUtil(): :param timer_handle: the timer handle value :return: a dictionary with name:value info, or `None` if it fails """ - timers_info = self._data.timers.merge(self._data.nodes, on='tid', right_index=True) - if timer_handle not in timers_info.index: + # TODO find a way to link a timer to a specific node + if timer_handle not in self._data.timers.index: return None - tid = timers_info.loc[timer_handle, 'tid'] - period_ns = timers_info.loc[timer_handle, 'period'] + tid = self._data.timers.loc[timer_handle, 'tid'] + period_ns = self._data.timers.loc[timer_handle, 'period'] period_ms = period_ns / 1000000.0 - return {'tid': tid, 'period': f'{period_ms} ms'} + return {'tid': tid, 'period': f'{period_ms:.0f} ms'} def get_publisher_handle_info(self, publisher_handle: int) -> Union[Mapping[str, Any], None]: """