Fix clone3() syscall simplification

mgedmin · Apr 19, 2024 · f672c52 · f672c52
1 parent bb61f62
commit f672c52
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/strace_process_tree.py b/strace_process_tree.py
@@ -318,7 +318,7 @@ def simplify_syscall(event):
     # clone(child_stack=0x..., flags=FLAGS, parent_tidptr=..., tls=...,
     #       child_tidptr=...) => clone(FLAGS)
     if event.startswith(('clone(', 'clone3(')):
-        event = re.sub('[(].*, flags=([^,]*), .*[)]', r'(\1)', event)
+        event = re.sub('[(].*(?:, |{)flags=([^,]*), .*[)]', r'(\1)', event)
     return event.rstrip()
 
 

diff --git a/tests.py b/tests.py
@@ -295,6 +295,11 @@ def test_simplify_syscall():
     ) == (
         'clone(CLONE_VM|CLONE_FS|CLONE_FILES|CLONE_SIGHAND|CLONE_THREAD|CLONE_SYSVSEM|CLONE_SETTLS|CLONE_PARENT_SETTID|CLONE_CHILD_CLEARTID)'
     )
+    assert stp.simplify_syscall(
+        'clone3({flags=CLONE_VM|CLONE_FS|CLONE_FILES|CLONE_SIGHAND|CLONE_THREAD|CLONE_SYSVSEM|CLONE_SETTLS|CLONE_PARENT_SETTID|CLONE_CHILD_CLEARTID, child_tid=0x7f1e00bff910, parent_tid=0x7f1e00bff910, exit_signal=0, stack=0x7f1e003ff000, stack_size=0x7feb40, tls=0x7f1e00bff640} => {parent_tid=[1942]}, 88)'
+    ) == (
+        'clone3(CLONE_VM|CLONE_FS|CLONE_FILES|CLONE_SIGHAND|CLONE_THREAD|CLONE_SYSVSEM|CLONE_SETTLS|CLONE_PARENT_SETTID|CLONE_CHILD_CLEARTID)'
+    )
 
 
 def test_extract_command_line():