Make do_convert_if_needed True by default

This commit is contained in:
Christophe Bedard 2019-12-29 14:25:08 -05:00
parent 9c629e8bf7
commit 73b5ed547d
4 changed files with 12 additions and 12 deletions

View file

@ -11,8 +11,8 @@
"# Get trace data using the provided launch file:\n", "# Get trace data using the provided launch file:\n",
"# $ ros2 launch tracetools_analysis pingpong.launch.py\n", "# $ ros2 launch tracetools_analysis pingpong.launch.py\n",
"# (wait a few seconds, then kill with Ctrl+C)\n", "# (wait a few seconds, then kill with Ctrl+C)\n",
"# AND\n", "#\n",
"# Convert trace data:\n", "# (optional) convert trace data:\n",
"# $ ros2 run tracetools_analysis convert ~/.ros/tracing/pingpong/ust\n", "# $ ros2 run tracetools_analysis convert ~/.ros/tracing/pingpong/ust\n",
"#\n", "#\n",
"# OR\n", "# OR\n",
@ -27,8 +27,8 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"converted_file_path = '~/.ros/tracing/pingpong/ust/converted'\n", "path = '~/.ros/tracing/pingpong/ust'\n",
"#converted_file_path = 'sample_data/converted_pingpong'" "#path = 'sample_data/converted_pingpong'"
] ]
}, },
{ {
@ -67,7 +67,7 @@
"outputs": [], "outputs": [],
"source": [ "source": [
"# Process\n", "# Process\n",
"events = load_file(converted_file_path)\n", "events = load_file(path)\n",
"handler = Ros2Handler.process(events)\n", "handler = Ros2Handler.process(events)\n",
"#handler.data.print_data()" "#handler.data.print_data()"
] ]
@ -215,7 +215,7 @@
"name": "python", "name": "python",
"nbconvert_exporter": "python", "nbconvert_exporter": "python",
"pygments_lexer": "ipython3", "pygments_lexer": "ipython3",
"version": "3.6.8" "version": "3.6.9"
} }
}, },
"nbformat": 4, "nbformat": 4,

View file

@ -11,8 +11,8 @@
"# Get trace data using the provided launch file:\n", "# Get trace data using the provided launch file:\n",
"# $ ros2 launch tracetools_analysis memory_usage.launch.py\n", "# $ ros2 launch tracetools_analysis memory_usage.launch.py\n",
"# (wait a few seconds, then kill with Ctrl+C)\n", "# (wait a few seconds, then kill with Ctrl+C)\n",
"# AND\n", "#\n",
"# Convert trace data:\n", "# (optional) convert trace data:\n",
"# $ ros2 trace-analysis convert ~/.ros/tracing/memory-usage" "# $ ros2 trace-analysis convert ~/.ros/tracing/memory-usage"
] ]
}, },
@ -22,7 +22,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"converted_file_path = '~/.ros/tracing/memory-usage/converted'" "path = '~/.ros/tracing/memory-usage'"
] ]
}, },
{ {
@ -65,7 +65,7 @@
"outputs": [], "outputs": [],
"source": [ "source": [
"# Process\n", "# Process\n",
"events = load_file(converted_file_path)\n", "events = load_file(path)\n",
"ust_memory_handler = UserspaceMemoryUsageHandler()\n", "ust_memory_handler = UserspaceMemoryUsageHandler()\n",
"kernel_memory_handler = KernelMemoryUsageHandler()\n", "kernel_memory_handler = KernelMemoryUsageHandler()\n",
"ros2_handler = Ros2Handler()\n", "ros2_handler = Ros2Handler()\n",

View file

@ -114,7 +114,7 @@ def convert_if_needed(
def load_file( def load_file(
input_path: str, input_path: str,
do_convert_if_needed: bool = False, do_convert_if_needed: bool = True,
force_conversion: bool = False, force_conversion: bool = False,
) -> List[Dict]: ) -> List[Dict]:
""" """

View file

@ -26,7 +26,7 @@ from . import get_input_path
def main(): def main():
input_path = get_input_path() input_path = get_input_path()
events = load_file(input_path, do_convert_if_needed=True) events = load_file(input_path)
ust_memory_handler = UserspaceMemoryUsageHandler() ust_memory_handler = UserspaceMemoryUsageHandler()
kernel_memory_handler = KernelMemoryUsageHandler() kernel_memory_handler = KernelMemoryUsageHandler()
ros2_handler = Ros2Handler() ros2_handler = Ros2Handler()