7 files changed, 628 insertions, 2 deletions

diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index dea2d633c374..02f0a4dd1a80 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -399,6 +399,7 @@ LIB_OBJS += $(OUTPUT)tests/pmu.o
 LIB_OBJS += $(OUTPUT)tests/hists_common.o
 LIB_OBJS += $(OUTPUT)tests/hists_link.o
 LIB_OBJS += $(OUTPUT)tests/hists_filter.o
+LIB_OBJS += $(OUTPUT)tests/hists_output.o
 LIB_OBJS += $(OUTPUT)tests/python-use.o
 LIB_OBJS += $(OUTPUT)tests/bp_signal.o
 LIB_OBJS += $(OUTPUT)tests/bp_signal_overflow.o
diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
index 5e0764b09317..831f52cae197 100644
--- a/tools/perf/tests/builtin-test.c
+++ b/tools/perf/tests/builtin-test.c
@@ -136,6 +136,10 @@ static struct test {
                 .func = test__thread_mg_share,
         },
         {
+                .desc = "Test output sorting of hist entries",
+                .func = test__hists_output,
+        },
+        {
                 .func = NULL,
         },
 };
diff --git a/tools/perf/tests/hists_common.c b/tools/perf/tests/hists_common.c
index 040a85b17aee..e4e01aadc3be 100644
--- a/tools/perf/tests/hists_common.c
+++ b/tools/perf/tests/hists_common.c
@@ -193,8 +193,8 @@ void print_hists_out(struct hists *hists)
                 he = rb_entry(node, struct hist_entry, rb_node);
 
                 if (!he->filtered) {
-                        pr_info("%2d: entry: %-8s [%-8s] %20s: period = %"PRIu64"\n",
-                                i, thread__comm_str(he->thread),
+                        pr_info("%2d: entry: %8s:%5d [%-8s] %20s: period = %"PRIu64"\n",
+                                i, thread__comm_str(he->thread), he->thread->tid,
                                 he->ms.map->dso->short_name,
                                 he->ms.sym->name, he->stat.period);
                 }
diff --git a/tools/perf/tests/hists_filter.c b/tools/perf/tests/hists_filter.c
index 13c8cf49225e..c5ba924a3581 100644
--- a/tools/perf/tests/hists_filter.c
+++ b/tools/perf/tests/hists_filter.c
@@ -283,6 +283,7 @@ int test__hists_filter(void)
 out:
         /* tear down everything */
         perf_evlist__delete(evlist);
+        reset_output_field();
         machines__exit(&machines);
 
         return err;
diff --git a/tools/perf/tests/hists_link.c b/tools/perf/tests/hists_link.c
index 4e783db60bba..5ffa2c3eb77d 100644
--- a/tools/perf/tests/hists_link.c
+++ b/tools/perf/tests/hists_link.c
@@ -332,6 +332,7 @@ int test__hists_link(void)
 out:
         /* tear down everything */
         perf_evlist__delete(evlist);
+        reset_output_field();
         machines__exit(&machines);
 
         return err;
diff --git a/tools/perf/tests/hists_output.c b/tools/perf/tests/hists_output.c
new file mode 100644
index 000000000000..a16850551797
--- /dev/null
+++ b/tools/perf/tests/hists_output.c
@@ -0,0 +1,618 @@
+#include "perf.h"
+#include "util/debug.h"
+#include "util/symbol.h"
+#include "util/sort.h"
+#include "util/evsel.h"
+#include "util/evlist.h"
+#include "util/machine.h"
+#include "util/thread.h"
+#include "util/parse-events.h"
+#include "tests/tests.h"
+#include "tests/hists_common.h"
+
+struct sample {
+        u32 cpu;
+        u32 pid;
+        u64 ip;
+        struct thread *thread;
+        struct map *map;
+        struct symbol *sym;
+};
+
+/* For the numbers, see hists_common.c */
+static struct sample fake_samples[] = {
+        /* perf [kernel] schedule() */
+        { .cpu = 0, .pid = 100, .ip = 0xf0000 + 700, },
+        /* perf [perf]   main() */
+        { .cpu = 1, .pid = 100, .ip = 0x40000 + 700, },
+        /* perf [perf]   cmd_record() */
+        { .cpu = 1, .pid = 100, .ip = 0x40000 + 900, },
+        /* perf [libc]   malloc() */
+        { .cpu = 1, .pid = 100, .ip = 0x50000 + 700, },
+        /* perf [libc]   free() */
+        { .cpu = 2, .pid = 100, .ip = 0x50000 + 800, },
+        /* perf [perf]   main() */
+        { .cpu = 2, .pid = 200, .ip = 0x40000 + 700, },
+        /* perf [kernel] page_fault() */
+        { .cpu = 2, .pid = 200, .ip = 0xf0000 + 800, },
+        /* bash [bash]   main() */
+        { .cpu = 3, .pid = 300, .ip = 0x40000 + 700, },
+        /* bash [bash]   xmalloc() */
+        { .cpu = 0, .pid = 300, .ip = 0x40000 + 800, },
+        /* bash [kernel] page_fault() */
+        { .cpu = 1, .pid = 300, .ip = 0xf0000 + 800, },
+};
+
+static int add_hist_entries(struct hists *hists, struct machine *machine)
+{
+        struct addr_location al;
+        struct hist_entry *he;
+        struct perf_sample sample = { .period = 100, };
+        size_t i;
+
+        for (i = 0; i < ARRAY_SIZE(fake_samples); i++) {
+                const union perf_event event = {
+                        .header = {
+                                .misc = PERF_RECORD_MISC_USER,
+                        },
+                };
+
+                sample.cpu = fake_samples[i].cpu;
+                sample.pid = fake_samples[i].pid;
+                sample.tid = fake_samples[i].pid;
+                sample.ip = fake_samples[i].ip;
+
+                if (perf_event__preprocess_sample(&event, machine, &al,
+                                                  &sample) < 0)
+                        goto out;
+
+                he = __hists__add_entry(hists, &al, NULL, NULL, NULL,
+                                        sample.period, 1, 0);
+                if (he == NULL)
+                        goto out;
+
+                fake_samples[i].thread = al.thread;
+                fake_samples[i].map = al.map;
+                fake_samples[i].sym = al.sym;
+        }
+
+        return TEST_OK;
+
+out:
+        pr_debug("Not enough memory for adding a hist entry\n");
+        return TEST_FAIL;
+}
+
+static void del_hist_entries(struct hists *hists)
+{
+        struct hist_entry *he;
+        struct rb_root *root_in;
+        struct rb_root *root_out;
+        struct rb_node *node;
+
+        if (sort__need_collapse)
+                root_in = &hists->entries_collapsed;
+        else
+                root_in = hists->entries_in;
+
+        root_out = &hists->entries;
+
+        while (!RB_EMPTY_ROOT(root_out)) {
+                node = rb_first(root_out);
+
+                he = rb_entry(node, struct hist_entry, rb_node);
+                rb_erase(node, root_out);
+                rb_erase(&he->rb_node_in, root_in);
+                hist_entry__free(he);
+        }
+}
+
+typedef int (*test_fn_t)(struct perf_evsel *, struct machine *);
+
+#define COMM(he)  (thread__comm_str(he->thread))
+#define DSO(he)   (he->ms.map->dso->short_name)
+#define SYM(he)   (he->ms.sym->name)
+#define CPU(he)   (he->cpu)
+#define PID(he)   (he->thread->tid)
+
+/* default sort keys (no field) */
+static int test1(struct perf_evsel *evsel, struct machine *machine)
+{
+        i