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 <jeffhost@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff Hostetler committed
Aug 8, 2019 at 07:19 UTC
da4589ce7ecb84b51b2819542f9555848dccf726
1 file changed
+10
-4
trace2/tr2_tgt_perf.c
+10
-4
@@ -452,8 +452,11 @@ static void fn_region_enter_printf_va_fl(const char *file, int line,
452
struct strbuf buf_payload = STRBUF_INIT;
453
454
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
+ }
460
461
perf_io_write_fl(file, line, event_name, repo, &us_elapsed_absolute,
462
NULL, category, &buf_payload);
@@ -469,8 +472,11 @@ static void fn_region_leave_printf_va_fl(
472
struct strbuf buf_payload = STRBUF_INIT;
473
474
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
+ }
480
481
perf_io_write_fl(file, line, event_name, repo, &us_elapsed_absolute,
482
&us_elapsed_region, category, &buf_payload);