kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

trace2: cleanup column alignment in perf target format 

Truncate/elide very long "filename:linenumber" field.
Truncate region and data "category" field if necessary.
Adjust overall column widths.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff Hostetler 2019-07-31 13:04:28 -07:00 committed by Junio C Hamano
parent 51cf315870
commit 371df1bea9
1 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
trace2/tr2_tgt_perf.c
View File

@ -21,10 +21,10 @@ static struct tr2_dst tr2dst_perf = { TR2_SYSENV_PERF, 0, 0, 0 };
*/ */
static int tr2env_perf_be_brief; static int tr2env_perf_be_brief;


#define TR2FMT_PERF_FL_WIDTH (50) #define TR2FMT_PERF_FL_WIDTH (28)
#define TR2FMT_PERF_MAX_EVENT_NAME (12) #define TR2FMT_PERF_MAX_EVENT_NAME (12)
#define TR2FMT_PERF_REPO_WIDTH (4) #define TR2FMT_PERF_REPO_WIDTH (3)
#define TR2FMT_PERF_CATEGORY_WIDTH (10) #define TR2FMT_PERF_CATEGORY_WIDTH (12)


#define TR2_DOTS_BUFFER_SIZE (100) #define TR2_DOTS_BUFFER_SIZE (100)
#define TR2_INDENT (2) #define TR2_INDENT (2)
@ -79,17 +79,36 @@ static void perf_fmt_prepare(const char *event_name,


if (!tr2env_perf_be_brief) { if (!tr2env_perf_be_brief) {
struct tr2_tbuf tb_now; struct tr2_tbuf tb_now;
size_t fl_end_col;


tr2_tbuf_local_time(&tb_now); tr2_tbuf_local_time(&tb_now);
strbuf_addstr(buf, tb_now.buf); strbuf_addstr(buf, tb_now.buf);
strbuf_addch(buf, ' '); strbuf_addch(buf, ' ');


if (file && *file) fl_end_col = buf->len + TR2FMT_PERF_FL_WIDTH;
strbuf_addf(buf, "%s:%d ", file, line);
while (buf->len < TR2FMT_PERF_FL_WIDTH) if (file && *file) {
struct strbuf buf_fl = STRBUF_INIT;

strbuf_addf(&buf_fl, "%s:%d", file, line);

if (buf_fl.len <= TR2FMT_PERF_FL_WIDTH)
strbuf_addbuf(buf, &buf_fl);
else {
size_t avail = TR2FMT_PERF_FL_WIDTH - 3;
strbuf_addstr(buf, "...");
strbuf_add(buf,
&buf_fl.buf[buf_fl.len - avail],
avail);
}

strbuf_release(&buf_fl);
}

while (buf->len < fl_end_col)
strbuf_addch(buf, ' '); strbuf_addch(buf, ' ');


strbuf_addstr(buf, "| "); strbuf_addstr(buf, " | ");
} }


strbuf_addf(buf, "d%d | ", tr2_sid_depth()); strbuf_addf(buf, "d%d | ", tr2_sid_depth());
@ -102,7 +121,7 @@ static void perf_fmt_prepare(const char *event_name,
strbuf_addf(buf, "r%d ", repo->trace2_repo_id); strbuf_addf(buf, "r%d ", repo->trace2_repo_id);
while (buf->len < len) while (buf->len < len)
strbuf_addch(buf, ' '); strbuf_addch(buf, ' ');
strbuf_addstr(buf, "| "); strbuf_addstr(buf, " | ");


if (p_us_elapsed_absolute) if (p_us_elapsed_absolute)
strbuf_addf(buf, "%9.6f | ", strbuf_addf(buf, "%9.6f | ",
@ -116,8 +135,8 @@ static void perf_fmt_prepare(const char *event_name,
else else
strbuf_addf(buf, "%9s | ", " "); strbuf_addf(buf, "%9s | ", " ");


strbuf_addf(buf, "%-*s | ", TR2FMT_PERF_CATEGORY_WIDTH, strbuf_addf(buf, "%-*.*s | ", TR2FMT_PERF_CATEGORY_WIDTH,
(category ? category : "")); TR2FMT_PERF_CATEGORY_WIDTH, (category ? category : ""));


if (ctx->nr_open_regions > 0) { if (ctx->nr_open_regions > 0) {
int len_indent = TR2_INDENT_LENGTH(ctx); int len_indent = TR2_INDENT_LENGTH(ctx);