Merge branch 'master' into add-trace-action-session-timestamp

This commit is contained in:
Christophe Bedard 2019-08-05 09:48:39 +02:00
commit a1eae49279
4 changed files with 111 additions and 108 deletions

View file

@ -20,12 +20,12 @@ from typing import List
from typing import Union
import unittest
from tracetools_read.utils import DictEvent
from tracetools_read.utils import get_event_name
from tracetools_read.utils import get_event_timestamp
from tracetools_read.utils import get_field
from tracetools_read.utils import get_procname
from tracetools_read.utils import get_trace_events
from tracetools_read import DictEvent
from tracetools_read import get_event_name
from tracetools_read import get_event_timestamp
from tracetools_read import get_field
from tracetools_read import get_procname
from tracetools_read import get_trace_events
from .utils import cleanup_trace
from .utils import get_event_names

View file

@ -24,8 +24,8 @@ from launch import LaunchService
from launch_ros import get_default_launch_description
from launch_ros.actions import Node
from tracetools_launch.action import Trace
from tracetools_read.utils import DictEvent
from tracetools_read.utils import get_event_name
from tracetools_read import DictEvent
from tracetools_read import get_event_name
from tracetools_trace.tools.path import append_timestamp