|
@@ -350,9 +350,9 @@ static int hist_entry__period_snprintf(struct perf_hpp *hpp,
|
|
|
}
|
|
|
|
|
|
static int hist_entry__fprintf(struct hist_entry *he, size_t size,
|
|
|
- struct hists *hists, FILE *fp)
|
|
|
+ struct hists *hists,
|
|
|
+ char *bf, size_t bfsz, FILE *fp)
|
|
|
{
|
|
|
- char bf[512];
|
|
|
int ret;
|
|
|
struct perf_hpp hpp = {
|
|
|
.buf = bf,
|
|
@@ -360,8 +360,8 @@ static int hist_entry__fprintf(struct hist_entry *he, size_t size,
|
|
|
};
|
|
|
bool color = !symbol_conf.field_sep;
|
|
|
|
|
|
- if (size == 0 || size > sizeof(bf))
|
|
|
- size = hpp.size = sizeof(bf);
|
|
|
+ if (size == 0 || size > bfsz)
|
|
|
+ size = hpp.size = bfsz;
|
|
|
|
|
|
ret = hist_entry__period_snprintf(&hpp, he, color);
|
|
|
hist_entry__sort_snprintf(he, bf + ret, size - ret, hists);
|
|
@@ -392,6 +392,8 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows,
|
|
|
.ptr = hists_to_evsel(hists),
|
|
|
};
|
|
|
bool first = true;
|
|
|
+ size_t linesz;
|
|
|
+ char *line = NULL;
|
|
|
|
|
|
init_rem_hits();
|
|
|
|
|
@@ -479,6 +481,13 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows,
|
|
|
goto out;
|
|
|
|
|
|
print_entries:
|
|
|
+ linesz = hists__sort_list_width(hists) + 3 + 1;
|
|
|
+ line = malloc(linesz);
|
|
|
+ if (line == NULL) {
|
|
|
+ ret = -1;
|
|
|
+ goto out;
|
|
|
+ }
|
|
|
+
|
|
|
for (nd = rb_first(&hists->entries); nd; nd = rb_next(nd)) {
|
|
|
struct hist_entry *h = rb_entry(nd, struct hist_entry, rb_node);
|
|
|
float percent = h->stat.period * 100.0 /
|
|
@@ -490,10 +499,10 @@ print_entries:
|
|
|
if (percent < min_pcnt)
|
|
|
continue;
|
|
|
|
|
|
- ret += hist_entry__fprintf(h, max_cols, hists, fp);
|
|
|
+ ret += hist_entry__fprintf(h, max_cols, hists, line, linesz, fp);
|
|
|
|
|
|
if (max_rows && ++nr_rows >= max_rows)
|
|
|
- goto out;
|
|
|
+ break;
|
|
|
|
|
|
if (h->ms.map == NULL && verbose > 1) {
|
|
|
__map_groups__fprintf_maps(&h->thread->mg,
|
|
@@ -501,6 +510,8 @@ print_entries:
|
|
|
fprintf(fp, "%.10s end\n", graph_dotted_line);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ free(line);
|
|
|
out:
|
|
|
free(rem_sq_bracket);
|
|
|
|