Skip to content

Commit da4589c

Browse files
jeffhostetlergitster
authored andcommitted
trace2: trim whitespace in region messages in perf target format
Avoid unecessary trailing whitespace in "region_enter" and "region_leave" messages in perf target format. Signed-off-by: Jeff Hostetler <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 371df1b commit da4589c

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

trace2/tr2_tgt_perf.c

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -452,8 +452,11 @@ static void fn_region_enter_printf_va_fl(const char *file, int line,
452452
struct strbuf buf_payload = STRBUF_INIT;
453453

454454
if (label)
455-
strbuf_addf(&buf_payload, "label:%s ", label);
456-
maybe_append_string_va(&buf_payload, fmt, ap);
455+
strbuf_addf(&buf_payload, "label:%s", label);
456+
if (fmt && *fmt) {
457+
strbuf_addch(&buf_payload, ' ');
458+
maybe_append_string_va(&buf_payload, fmt, ap);
459+
}
457460

458461
perf_io_write_fl(file, line, event_name, repo, &us_elapsed_absolute,
459462
NULL, category, &buf_payload);
@@ -469,8 +472,11 @@ static void fn_region_leave_printf_va_fl(
469472
struct strbuf buf_payload = STRBUF_INIT;
470473

471474
if (label)
472-
strbuf_addf(&buf_payload, "label:%s ", label);
473-
maybe_append_string_va(&buf_payload, fmt, ap);
475+
strbuf_addf(&buf_payload, "label:%s", label);
476+
if (fmt && *fmt) {
477+
strbuf_addch(&buf_payload, ' ' );
478+
maybe_append_string_va(&buf_payload, fmt, ap);
479+
}
474480

475481
perf_io_write_fl(file, line, event_name, repo, &us_elapsed_absolute,
476482
&us_elapsed_region, category, &buf_payload);

0 commit comments

Comments
 (0)