perf script: Print "cgroup" field on the same line as "comm"

[thirdparty/kernel/stable.git] / tools / perf / builtin-script.c

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 200b3e7ea8dad518b81121d908a58c7ba1cfe3d6..517bf25750c8bbdabea265936a29abf3d8190d99 100644 (file)
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -2199,6 +2199,17 @@ static void process_event(struct perf_script *script,
        if (PRINT_FIELD(RETIRE_LAT))
                fprintf(fp, "%16" PRIu16, sample->retire_lat);
 
+       if (PRINT_FIELD(CGROUP)) {
+               const char *cgrp_name;
+               struct cgroup *cgrp = cgroup__find(machine->env,
+                                                  sample->cgroup);
+               if (cgrp != NULL)
+                       cgrp_name = cgrp->name;
+               else
+                       cgrp_name = "unknown";
+               fprintf(fp, " %s", cgrp_name);
+       }
+
        if (PRINT_FIELD(IP)) {
                struct callchain_cursor *cursor = NULL;
 
@@ -2243,17 +2254,6 @@ static void process_event(struct perf_script *script,
        if (PRINT_FIELD(CODE_PAGE_SIZE))
                fprintf(fp, " %s", get_page_size_name(sample->code_page_size, str));
 
-       if (PRINT_FIELD(CGROUP)) {
-               const char *cgrp_name;
-               struct cgroup *cgrp = cgroup__find(machine->env,
-                                                  sample->cgroup);
-               if (cgrp != NULL)
-                       cgrp_name = cgrp->name;
-               else
-                       cgrp_name = "unknown";
-               fprintf(fp, " %s", cgrp_name);
-       }
-
        perf_sample__fprintf_ipc(sample, attr, fp);
 
        fprintf(fp, "\n");