• Stephane Eranian's avatar
    perf stat: Fix CSV mode column output for non-cgroup events · bc4da38a
    Stephane Eranian authored
    When using the -x option, perf stat prints CSV-style output with one
    event per line.  For each event, it prints the count, the unit, the
    event name, the cgroup, and a bunch of other event specific fields (such
    as insn per cycles).
    
    When you use CSV-style mode, you expect a normalized output where each
    event is printed with the same number of fields regardless of what it is
    so it can easily be imported into a spreadsheet or parsed.
    
    For instance, if an event does not have a unit, then print an empty
    field for it.
    
    Although this approach was implemented for the unit, it was not for the
    cgroup.
    
    When mixing cgroup and non-cgroup events, then non-cgroup events would
    not show an empty field, instead the next field was printed, make
    columns not line up correctly.
    
    This patch fixes the cgroup output issues by forcing an empty field
    for non-cgroup events as soon as one event has cgroup.
    
    Before:
    
      <not counted> @ @cycles @foo    @ 0    @100.00@@
      2531614       @ @cycles @6420922@100.00@    @
    
    foo cgroup lines up with time_running!
    
    After:
    
      <not counted> @ @cycles @foo @0       @100.00@@
      2594834       @ @cycles @    @5287372 @100.00@@
    
    Fields line up.
    Signed-off-by: default avatarStephane Eranian <eranian@google.com>
    Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Link: http://lkml.kernel.org/r/1541587845-9150-1-git-send-email-eranian@google.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
    bc4da38a
stat-display.c 28.4 KB