From a7951796d448a97f329349a3f6d1395bc05b5e85 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Sat, 3 Aug 2019 14:16:10 +0200 Subject: [PATCH] Update tracetools_read imports --- tracetools_analysis/tracetools_analysis/conversion/ctf.py | 7 ++++--- .../tracetools_analysis/processor/__init__.py | 6 +++--- .../tracetools_analysis/processor/cpu_time.py | 2 +- .../tracetools_analysis/processor/profile.py | 2 +- tracetools_analysis/tracetools_analysis/processor/ros2.py | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/tracetools_analysis/tracetools_analysis/conversion/ctf.py b/tracetools_analysis/tracetools_analysis/conversion/ctf.py index a81c523..a80202b 100644 --- a/tracetools_analysis/tracetools_analysis/conversion/ctf.py +++ b/tracetools_analysis/tracetools_analysis/conversion/ctf.py @@ -16,7 +16,8 @@ from pickle import Pickler -from tracetools_read import utils +from tracetools_read import _get_trace_ctf_events +from tracetools_read import event_to_dict def ctf_to_pickle(trace_directory: str, target: Pickler) -> int: @@ -27,7 +28,7 @@ def ctf_to_pickle(trace_directory: str, target: Pickler) -> int: :param target: the target pickle file to write to :return: the number of events written """ - ctf_events = utils._get_trace_ctf_events(trace_directory) + ctf_events = _get_trace_ctf_events(trace_directory) count = 0 count_written = 0 @@ -35,7 +36,7 @@ def ctf_to_pickle(trace_directory: str, target: Pickler) -> int: for event in ctf_events: count += 1 - pod = utils.event_to_dict(event) + pod = event_to_dict(event) target.dump(pod) count_written += 1 diff --git a/tracetools_analysis/tracetools_analysis/processor/__init__.py b/tracetools_analysis/tracetools_analysis/processor/__init__.py index b04ff0f..7214a5a 100644 --- a/tracetools_analysis/tracetools_analysis/processor/__init__.py +++ b/tracetools_analysis/tracetools_analysis/processor/__init__.py @@ -21,9 +21,9 @@ from typing import List from typing import Set from typing import Type -from tracetools_read.utils import DictEvent -from tracetools_read.utils import get_event_name -from tracetools_read.utils import get_field +from tracetools_read import DictEvent +from tracetools_read import get_event_name +from tracetools_read import get_field class EventMetadata(): diff --git a/tracetools_analysis/tracetools_analysis/processor/cpu_time.py b/tracetools_analysis/tracetools_analysis/processor/cpu_time.py index 0a97e3c..16fef0e 100644 --- a/tracetools_analysis/tracetools_analysis/processor/cpu_time.py +++ b/tracetools_analysis/tracetools_analysis/processor/cpu_time.py @@ -16,7 +16,7 @@ from typing import Dict -from tracetools_read.utils import get_field +from tracetools_read import get_field from . import EventHandler from . import EventMetadata diff --git a/tracetools_analysis/tracetools_analysis/processor/profile.py b/tracetools_analysis/tracetools_analysis/processor/profile.py index a98e43b..a221540 100644 --- a/tracetools_analysis/tracetools_analysis/processor/profile.py +++ b/tracetools_analysis/tracetools_analysis/processor/profile.py @@ -21,7 +21,7 @@ from typing import Tuple from typing import Type from typing import Union -from tracetools_read.utils import get_field +from tracetools_read import get_field from . import EventHandler from . import EventMetadata diff --git a/tracetools_analysis/tracetools_analysis/processor/ros2.py b/tracetools_analysis/tracetools_analysis/processor/ros2.py index 3a19238..ff5e407 100644 --- a/tracetools_analysis/tracetools_analysis/processor/ros2.py +++ b/tracetools_analysis/tracetools_analysis/processor/ros2.py @@ -16,7 +16,7 @@ from typing import Dict -from tracetools_read.utils import get_field +from tracetools_read import get_field from . import EventHandler from . import EventMetadata