fix(tracegrind): stop auto-appending .msgpack.lz4 extension to output file

art049 · claude · art049 · commit 91d6e858e399 · 2026-02-07T17:05:48.000Z
The output file path is now used exactly as specified by --tracegrind-out-file.
The default format includes the extension so the default behavior is unchanged.

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/tracegrind/clo.c b/tracegrind/clo.c
@@ -505,7 +505,7 @@ void TG_(print_usage)(void)
 {
    VG_(printf)(
 "\n   output options:\n"
-"    --tracegrind-out-file=<f>  Output file name [tracegrind.out.%%p]\n"
+"    --tracegrind-out-file=<f>  Output file name [tracegrind.out.%%p.msgpack.lz4]\n"
 
 "\n   data collection options:\n"
 "    --instr-atstart=no|yes    Do instrumentation at tracegrind start [yes]\n"
diff --git a/tracegrind/docs/tracegrind-msgpack-format.md b/tracegrind/docs/tracegrind-msgpack-format.md
@@ -2,7 +2,7 @@
 
 ## Overview
 
-Tracegrind produces a binary trace file combining MsgPack serialization with LZ4 block compression. Files use the `.msgpack.lz4` extension.
+Tracegrind produces a binary trace file combining MsgPack serialization with LZ4 block compression. The default output file name is `tracegrind.out.<pid>.msgpack.lz4`.
 
 ## File Structure
 
diff --git a/tracegrind/dump.c b/tracegrind/dump.c
@@ -406,13 +406,6 @@ void TG_(trace_open_output)(void)
     filename[sizeof(filename) - 1] = '\0';
     VG_(free)(expanded);
 
-    /* Append .msgpack.lz4 suffix */
-    SizeT len = VG_(strlen)(filename);
-    if (len + 12 < sizeof(filename)) {
-        VG_(strncpy)(filename + len, ".msgpack.lz4", sizeof(filename) - len - 1);
-        filename[sizeof(filename) - 1] = '\0';
-    }
-
     res = VG_(open)(filename,
                     VKI_O_CREAT|VKI_O_WRONLY|VKI_O_TRUNC,
                     VKI_S_IRUSR|VKI_S_IWUSR);
diff --git a/tracegrind/global.h b/tracegrind/global.h
@@ -67,7 +67,7 @@
 /*--- Command line options                                 ---*/
 /*------------------------------------------------------------*/
 
-#define DEFAULT_OUTFORMAT   "tracegrind.out.%p"
+#define DEFAULT_OUTFORMAT   "tracegrind.out.%p.msgpack.lz4"
 
 /* If and how to collect syscall time.
    systime_no : do not collect systime
diff --git a/tracegrind/tests/test_basic.vgtest b/tracegrind/tests/test_basic.vgtest
@@ -1,5 +1,5 @@
 prereq: ../../tracegrind/scripts/tracegrind-analyzer --help 2>/dev/null
 prog: test_basic.bin
-vgopts: --tracegrind-out-file=tracegrind.out.test_basic
+vgopts: --tracegrind-out-file=tracegrind.out.test_basic.msgpack.lz4
 post: ../../tracegrind/scripts/tracegrind-analyzer tracegrind.out.test_basic.msgpack.lz4 --stats | ./filter_trace
 cleanup: rm -f tracegrind.out.test_basic.msgpack.lz4
diff --git a/tracegrind/tests/test_enter_inlined.vgtest b/tracegrind/tests/test_enter_inlined.vgtest
@@ -1,5 +1,5 @@
 prereq: ../../tracegrind/scripts/tracegrind-analyzer --help 2>/dev/null
 prog: test_enter_inlined.bin
-vgopts: --tracegrind-out-file=tracegrind.out.test_enter_inlined --instr-atstart=no --read-inline-info=yes
+vgopts: --tracegrind-out-file=tracegrind.out.test_enter_inlined.msgpack.lz4 --instr-atstart=no --read-inline-info=yes
 post: ../../tracegrind/scripts/tracegrind-analyzer tracegrind.out.test_enter_inlined.msgpack.lz4 | ./filter_trace
 cleanup: rm -f tracegrind.out.test_enter_inlined.msgpack.lz4
diff --git a/tracegrind/tests/test_exception.vgtest b/tracegrind/tests/test_exception.vgtest
@@ -1,5 +1,5 @@
 prereq: ../../tracegrind/scripts/tracegrind-analyzer --help 2>/dev/null
 prog: test_exception.bin
-vgopts: --tracegrind-out-file=tracegrind.out.test_exception --instr-atstart=no
+vgopts: --tracegrind-out-file=tracegrind.out.test_exception.msgpack.lz4 --instr-atstart=no
 post: ../../tracegrind/scripts/tracegrind-analyzer tracegrind.out.test_exception.msgpack.lz4 | ./filter_trace | grep -E '(Format |Schema |Event Schemas|Showing |MARKER|fn=catcher|fn=thrower|fn=do_throw)'
 cleanup: rm -f tracegrind.out.test_exception.msgpack.lz4
diff --git a/tracegrind/tests/test_foo_bar_baz.vgtest b/tracegrind/tests/test_foo_bar_baz.vgtest
@@ -1,5 +1,5 @@
 prereq: ../../tracegrind/scripts/tracegrind-analyzer --help 2>/dev/null
 prog: test_foo_bar_baz.bin
-vgopts: --tracegrind-out-file=tracegrind.out.test_foo_bar_baz --instr-atstart=no
+vgopts: --tracegrind-out-file=tracegrind.out.test_foo_bar_baz.msgpack.lz4 --instr-atstart=no
 post: ../../tracegrind/scripts/tracegrind-analyzer tracegrind.out.test_foo_bar_baz.msgpack.lz4 | ./filter_trace
 cleanup: rm -f tracegrind.out.test_foo_bar_baz.msgpack.lz4
diff --git a/tracegrind/tests/test_inline.vgtest b/tracegrind/tests/test_inline.vgtest
@@ -1,5 +1,5 @@
 prereq: ../../tracegrind/scripts/tracegrind-analyzer --help 2>/dev/null
 prog: test_inline.bin
-vgopts: --tracegrind-out-file=tracegrind.out.test_inline --instr-atstart=no
+vgopts: --tracegrind-out-file=tracegrind.out.test_inline.msgpack.lz4 --instr-atstart=no
 post: ../../tracegrind/scripts/tracegrind-analyzer tracegrind.out.test_inline.msgpack.lz4 | ./filter_trace
 cleanup: rm -f tracegrind.out.test_inline.msgpack.lz4
diff --git a/tracegrind/tests/test_instr_toggle.vgtest b/tracegrind/tests/test_instr_toggle.vgtest
@@ -1,5 +1,5 @@
 prereq: ../../tracegrind/scripts/tracegrind-analyzer --help 2>/dev/null
 prog: test_instr_toggle.bin
-vgopts: --tracegrind-out-file=tracegrind.out.test_instr_toggle --instr-atstart=no
+vgopts: --tracegrind-out-file=tracegrind.out.test_instr_toggle.msgpack.lz4 --instr-atstart=no
 post: ../../tracegrind/scripts/tracegrind-analyzer tracegrind.out.test_instr_toggle.msgpack.lz4 | ./filter_trace
 cleanup: rm -f tracegrind.out.test_instr_toggle.msgpack.lz4
diff --git a/tracegrind/tests/test_longjmp.vgtest b/tracegrind/tests/test_longjmp.vgtest
@@ -1,5 +1,5 @@
 prereq: ../../tracegrind/scripts/tracegrind-analyzer --help 2>/dev/null
 prog: test_longjmp.bin
-vgopts: --tracegrind-out-file=tracegrind.out.test_longjmp --instr-atstart=no
+vgopts: --tracegrind-out-file=tracegrind.out.test_longjmp.msgpack.lz4 --instr-atstart=no
 post: ../../tracegrind/scripts/tracegrind-analyzer tracegrind.out.test_longjmp.msgpack.lz4 | ./filter_trace | grep -E '(Format |Schema |Event Schemas|Showing |MARKER|fn=outer|fn=middle|fn=inner)'
 cleanup: rm -f tracegrind.out.test_longjmp.msgpack.lz4
diff --git a/tracegrind/tests/test_marker.vgtest b/tracegrind/tests/test_marker.vgtest
@@ -1,5 +1,5 @@
 prereq: ../../tracegrind/scripts/tracegrind-analyzer --help 2>/dev/null
 prog: test_marker.bin
-vgopts: --tracegrind-out-file=tracegrind.out.test_marker
+vgopts: --tracegrind-out-file=tracegrind.out.test_marker.msgpack.lz4
 post: ../../tracegrind/scripts/tracegrind-analyzer tracegrind.out.test_marker.msgpack.lz4 --event MARKER --raw | ./filter_trace
 cleanup: rm -f tracegrind.out.test_marker.msgpack.lz4
diff --git a/tracegrind/tests/test_nested_inlined.vgtest b/tracegrind/tests/test_nested_inlined.vgtest
@@ -1,5 +1,5 @@
 prereq: ../../tracegrind/scripts/tracegrind-analyzer --help 2>/dev/null
 prog: test_nested_inlined.bin
-vgopts: --tracegrind-out-file=tracegrind.out.test_nested_inlined --instr-atstart=no --read-inline-info=yes
+vgopts: --tracegrind-out-file=tracegrind.out.test_nested_inlined.msgpack.lz4 --instr-atstart=no --read-inline-info=yes
 post: ../../tracegrind/scripts/tracegrind-analyzer tracegrind.out.test_nested_inlined.msgpack.lz4 | ./filter_trace
 cleanup: rm -f tracegrind.out.test_nested_inlined.msgpack.lz4
diff --git a/tracegrind/tests/test_recursion.vgtest b/tracegrind/tests/test_recursion.vgtest
@@ -1,5 +1,5 @@
 prereq: ../../tracegrind/scripts/tracegrind-analyzer --help 2>/dev/null
 prog: test_recursion.bin
-vgopts: --tracegrind-out-file=tracegrind.out.test_recursion --instr-atstart=no
+vgopts: --tracegrind-out-file=tracegrind.out.test_recursion.msgpack.lz4 --instr-atstart=no
 post: ../../tracegrind/scripts/tracegrind-analyzer tracegrind.out.test_recursion.msgpack.lz4 | ./filter_trace | grep -E '(event=MARKER|fn=recurse)' | awk '/MARKER/{print} /ENTER_FN/{e++} /EXIT_FN/{x++} END{print "ENTER_FN count: "e; print "EXIT_FN count: "x}'
 cleanup: rm -f tracegrind.out.test_recursion.msgpack.lz4
diff --git a/tracegrind/tests/test_schema.vgtest b/tracegrind/tests/test_schema.vgtest
@@ -1,5 +1,5 @@
 prereq: ../../tracegrind/scripts/tracegrind-analyzer --help 2>/dev/null
 prog: test_basic.bin
-vgopts: --tracegrind-out-file=tracegrind.out.test_schema
+vgopts: --tracegrind-out-file=tracegrind.out.test_schema.msgpack.lz4
 post: ../../tracegrind/scripts/tracegrind-analyzer tracegrind.out.test_schema.msgpack.lz4 --schema | ./filter_trace
 cleanup: rm -f tracegrind.out.test_schema.msgpack.lz4
diff --git a/tracegrind/tests/test_signal.vgtest b/tracegrind/tests/test_signal.vgtest
@@ -1,5 +1,5 @@
 prereq: ../../tracegrind/scripts/tracegrind-analyzer --help 2>/dev/null
 prog: test_signal.bin
-vgopts: --tracegrind-out-file=tracegrind.out.test_signal --instr-atstart=no
+vgopts: --tracegrind-out-file=tracegrind.out.test_signal.msgpack.lz4 --instr-atstart=no
 post: ../../tracegrind/scripts/tracegrind-analyzer tracegrind.out.test_signal.msgpack.lz4 | ./filter_trace | grep -E '(Format |Schema |Event Schemas|Showing |MARKER|fn=caller|fn=handler_fn)'
 cleanup: rm -f tracegrind.out.test_signal.msgpack.lz4
diff --git a/tracegrind/tests/test_syscall.vgtest b/tracegrind/tests/test_syscall.vgtest
@@ -1,5 +1,5 @@
 prereq: ../../tracegrind/scripts/tracegrind-analyzer --help 2>/dev/null
 prog: test_syscall.bin
-vgopts: --tracegrind-out-file=tracegrind.out.test_syscall --instr-atstart=no --collect-systime=nsec
+vgopts: --tracegrind-out-file=tracegrind.out.test_syscall.msgpack.lz4 --instr-atstart=no --collect-systime=nsec
 post: ../../tracegrind/scripts/tracegrind-analyzer tracegrind.out.test_syscall.msgpack.lz4 | ./filter_trace | grep -E '(Format |Schema |Event Schemas|Counter Units:|Showing |\(|MARKER|fn=caller |fn=do_getpid |fn=do_write |fn=getpid |fn=write )'
 cleanup: rm -f tracegrind.out.test_syscall.msgpack.lz4
diff --git a/tracegrind/tests/test_tailcall.vgtest b/tracegrind/tests/test_tailcall.vgtest
@@ -1,5 +1,5 @@
 prereq: ../../tracegrind/scripts/tracegrind-analyzer --help 2>/dev/null
 prog: test_tailcall.bin
-vgopts: --tracegrind-out-file=tracegrind.out.test_tailcall --instr-atstart=no
+vgopts: --tracegrind-out-file=tracegrind.out.test_tailcall.msgpack.lz4 --instr-atstart=no
 post: ../../tracegrind/scripts/tracegrind-analyzer tracegrind.out.test_tailcall.msgpack.lz4 | ./filter_trace | grep -E '(Format |Schema |Event Schemas|Showing |MARKER|fn=chain_)'
 cleanup: rm -f tracegrind.out.test_tailcall.msgpack.lz4
diff --git a/tracegrind/tests/test_thread_create.vgtest b/tracegrind/tests/test_thread_create.vgtest
@@ -1,5 +1,5 @@
 prereq: ../../tracegrind/scripts/tracegrind-analyzer --help 2>/dev/null
 prog: test_thread_create.bin
-vgopts: --tracegrind-out-file=tracegrind.out.test_thread_create --instr-atstart=no
+vgopts: --tracegrind-out-file=tracegrind.out.test_thread_create.msgpack.lz4 --instr-atstart=no
 post: ../../tracegrind/scripts/tracegrind-analyzer tracegrind.out.test_thread_create.msgpack.lz4 | ./filter_trace | grep -E '(Format |Schema |Event Schemas|MARKER|THREAD_CREATE|FORK|thread_fn|Showing |\()' | sed 's/child_pid=[0-9]*/child_pid=N/'
 cleanup: rm -f tracegrind.out.test_thread_create.msgpack.lz4
diff --git a/tracegrind/tests/test_thread_interleave.vgtest b/tracegrind/tests/test_thread_interleave.vgtest
@@ -1,5 +1,5 @@
 prereq: ../../tracegrind/scripts/tracegrind-analyzer --help 2>/dev/null
 prog: test_thread_interleave.bin
-vgopts: --tracegrind-out-file=tracegrind.out.test_thread_interleave --instr-atstart=no
+vgopts: --tracegrind-out-file=tracegrind.out.test_thread_interleave.msgpack.lz4 --instr-atstart=no
 post: ../../tracegrind/scripts/tracegrind-analyzer tracegrind.out.test_thread_interleave.msgpack.lz4 | ./filter_trace | grep -E '(Format |Schema |Event Schemas|Showing |\(|MARKER|THREAD_CREATE|fn=work_a |fn=work_b |fn=work_c |fn=depth_a1 |fn=depth_a2 |fn=depth_b1 |fn=depth_c1 |fn=depth_c2 )' | sort -t'|' -k2,2 -s
 cleanup: rm -f tracegrind.out.test_thread_interleave.msgpack.lz4
diff --git a/tracegrind/tests/test_toggle_collect.vgtest b/tracegrind/tests/test_toggle_collect.vgtest
@@ -1,5 +1,5 @@
 prereq: ../../tracegrind/scripts/tracegrind-analyzer --help 2>/dev/null
 prog: test_toggle_collect.bin
-vgopts: --tracegrind-out-file=tracegrind.out.test_toggle_collect
+vgopts: --tracegrind-out-file=tracegrind.out.test_toggle_collect.msgpack.lz4
 post: ../../tracegrind/scripts/tracegrind-analyzer tracegrind.out.test_toggle_collect.msgpack.lz4 --stats | ./filter_trace
 cleanup: rm -f tracegrind.out.test_toggle_collect.msgpack.lz4

Original file line number	Diff line number	Diff line change
`@@ -505,7 +505,7 @@ void TG_(print_usage)(void)`
`505`	`505`	`{`
`506`	`506`	`VG_(printf)(`
`507`	`507`	`"\n output options:\n"`
`508`		`-" --tracegrind-out-file=<f> Output file name [tracegrind.out.%%p]\n"`
	`508`	`+" --tracegrind-out-file=<f> Output file name [tracegrind.out.%%p.msgpack.lz4]\n"`
`509`	`509`
`510`	`510`	`"\n data collection options:\n"`
`511`	`511`	`" --instr-atstart=no\|yes Do instrumentation at tracegrind start [yes]\n"`