diff --git a/tracetools_analysis/analysis/callback_duration.ipynb b/tracetools_analysis/analysis/callback_duration.ipynb index 2138202..bdd6280 100644 --- a/tracetools_analysis/analysis/callback_duration.ipynb +++ b/tracetools_analysis/analysis/callback_duration.ipynb @@ -11,8 +11,8 @@ "# Get trace data using the provided launch file:\n", "# $ ros2 launch tracetools_analysis pingpong.launch.py\n", "# (wait a few seconds, then kill with Ctrl+C)\n", - "# AND\n", - "# Convert trace data:\n", + "#\n", + "# (optional) convert trace data:\n", "# $ ros2 run tracetools_analysis convert ~/.ros/tracing/pingpong/ust\n", "#\n", "# OR\n", @@ -27,8 +27,8 @@ "metadata": {}, "outputs": [], "source": [ - "converted_file_path = '~/.ros/tracing/pingpong/ust/converted'\n", - "#converted_file_path = 'sample_data/converted_pingpong'" + "path = '~/.ros/tracing/pingpong/ust'\n", + "#path = 'sample_data/converted_pingpong'" ] }, { @@ -67,7 +67,7 @@ "outputs": [], "source": [ "# Process\n", - "events = load_file(converted_file_path)\n", + "events = load_file(path)\n", "handler = Ros2Handler.process(events)\n", "#handler.data.print_data()" ] @@ -215,7 +215,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.6.8" + "version": "3.6.9" } }, "nbformat": 4, diff --git a/tracetools_analysis/analysis/memory_usage.ipynb b/tracetools_analysis/analysis/memory_usage.ipynb index 34fff64..0c8c260 100644 --- a/tracetools_analysis/analysis/memory_usage.ipynb +++ b/tracetools_analysis/analysis/memory_usage.ipynb @@ -11,8 +11,8 @@ "# Get trace data using the provided launch file:\n", "# $ ros2 launch tracetools_analysis memory_usage.launch.py\n", "# (wait a few seconds, then kill with Ctrl+C)\n", - "# AND\n", - "# Convert trace data:\n", + "#\n", + "# (optional) convert trace data:\n", "# $ ros2 trace-analysis convert ~/.ros/tracing/memory-usage" ] }, @@ -22,7 +22,7 @@ "metadata": {}, "outputs": [], "source": [ - "converted_file_path = '~/.ros/tracing/memory-usage/converted'" + "path = '~/.ros/tracing/memory-usage'" ] }, { @@ -65,7 +65,7 @@ "outputs": [], "source": [ "# Process\n", - "events = load_file(converted_file_path)\n", + "events = load_file(path)\n", "ust_memory_handler = UserspaceMemoryUsageHandler()\n", "kernel_memory_handler = KernelMemoryUsageHandler()\n", "ros2_handler = Ros2Handler()\n", diff --git a/tracetools_analysis/tracetools_analysis/loading/__init__.py b/tracetools_analysis/tracetools_analysis/loading/__init__.py index 257959a..1a74ee9 100644 --- a/tracetools_analysis/tracetools_analysis/loading/__init__.py +++ b/tracetools_analysis/tracetools_analysis/loading/__init__.py @@ -114,7 +114,7 @@ def convert_if_needed( def load_file( input_path: str, - do_convert_if_needed: bool = False, + do_convert_if_needed: bool = True, force_conversion: bool = False, ) -> List[Dict]: """ diff --git a/tracetools_analysis/tracetools_analysis/scripts/memory_usage.py b/tracetools_analysis/tracetools_analysis/scripts/memory_usage.py index 50e6801..bf2ffec 100644 --- a/tracetools_analysis/tracetools_analysis/scripts/memory_usage.py +++ b/tracetools_analysis/tracetools_analysis/scripts/memory_usage.py @@ -26,7 +26,7 @@ from . import get_input_path def main(): input_path = get_input_path() - events = load_file(input_path, do_convert_if_needed=True) + events = load_file(input_path) ust_memory_handler = UserspaceMemoryUsageHandler() kernel_memory_handler = KernelMemoryUsageHandler() ros2_handler = Ros2Handler()