perf tools: Add 'cgroup_id' sort order keyword

[mirror_ubuntu-artful-kernel.git] / tools / perf / util / hist.c

diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index eaf72a938fb423ed4ba46982c69324d2341839bc..e3b38f629504097a8d3d2aedcdbd5a815dba6eaa 100644 (file)
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -3,6 +3,7 @@
 #include "hist.h"
 #include "map.h"
 #include "session.h"
+#include "namespaces.h"
 #include "sort.h"
 #include "evlist.h"
 #include "evsel.h"
@@ -169,6 +170,7 @@ void hists__calc_col_len(struct hists *hists, struct hist_entry *h)
                hists__set_unres_dso_col_len(hists, HISTC_MEM_DADDR_DSO);
        }
 
+       hists__new_col_len(hists, HISTC_CGROUP_ID, 20);
        hists__new_col_len(hists, HISTC_CPU, 3);
        hists__new_col_len(hists, HISTC_SOCKET, 6);
        hists__new_col_len(hists, HISTC_MEM_LOCKED, 6);
@@ -574,9 +576,14 @@ __hists__add_entry(struct hists *hists,
                   bool sample_self,
                   struct hist_entry_ops *ops)
 {
+       struct namespaces *ns = thread__namespaces(al->thread);
        struct hist_entry entry = {
                .thread = al->thread,
                .comm = thread__comm(al->thread),
+               .cgroup_id = {
+                       .dev = ns ? ns->link_info[CGROUP_NS_INDEX].dev : 0,
+                       .ino = ns ? ns->link_info[CGROUP_NS_INDEX].ino : 0,
+               },
                .ms = {
                        .map    = al->map,
                        .sym    = al->sym,