• Adrian Hunter's avatar
    perf script: Fix ip display when type != attr->type · ff6f41fb
    Adrian Hunter authored
    set_print_ip_opts() was not being called when type != attr->type
    because there is not a one-to-one relationship between output types
    and attr->type. That resulted in ip not printing.
    
    The attr_type() function is removed, and the match of attr->type to
    output type is corrected.
    
    Example on ADL using taskset to select an atom cpu:
    
     # perf record -e cpu_atom/cpu-cycles/ taskset 0x1000 uname
     Linux
     [ perf record: Woken up 1 times to write data ]
     [ perf record: Captured and wrote 0.003 MB perf.data (7 samples) ]
    
     Before:
    
      # perf script | head
             taskset   428 [-01] 10394.179041:          1 cpu_atom/cpu-cycles/:
             taskset   428 [-01] 10394.179043:          1 cpu_atom/cpu-cycles/:
             taskset   428 [-01] 10394.179044:         11 cpu_atom/cpu-cycles/:
             taskset   428 [-01] 10394.179045:        407 cpu_atom/cpu-cycles/:
             taskset   428 [-01] 10394.179046:      16789 cpu_atom/cpu-cycles/:
             taskset   428 [-01] 10394.179052:     676300 cpu_atom/cpu-cycles/:
               uname   428 [-01] 10394.179278:    4079859 cpu_atom/cpu-cycles/:
    
     After:
    
      # perf script | head
             taskset   428 10394.179041:          1 cpu_atom/cpu-cycles/:  ffffffff95a0bb97 __intel_pmu_enable_all.constprop.48+0x47 ([kernel.kallsyms])
             taskset   428 10394.179043:          1 cpu_atom/cpu-cycles/:  ffffffff95a0bb97 __intel_pmu_enable_all.constprop.48+0x47 ([kernel.kallsyms])
             taskset   428 10394.179044:         11 cpu_atom/cpu-cycles/:  ffffffff95a0bb97 __intel_pmu_enable_all.constprop.48+0x47 ([kernel.kallsyms])
             taskset   428 10394.179045:        407 cpu_atom/cpu-cycles/:  ffffffff95a0bb97 __intel_pmu_enable_all.constprop.48+0x47 ([kernel.kallsyms])
             taskset   428 10394.179046:      16789 cpu_atom/cpu-cycles/:  ffffffff95a0bb97 __intel_pmu_enable_all.constprop.48+0x47 ([kernel.kallsyms])
             taskset   428 10394.179052:     676300 cpu_atom/cpu-cycles/:      7f829ef73800 cfree+0x0 (/lib/libc-2.32.so)
               uname   428 10394.179278:    4079859 cpu_atom/cpu-cycles/:  ffffffff95bae912 vma_interval_tree_remove+0x1f2 ([kernel.kallsyms])
    Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
    Reviewed-by: default avatarKan Liang <kan.liang@linux.intel.com>
    Cc: Jin Yao <yao.jin@linux.intel.com>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Link: http://lore.kernel.org/lkml/20210911133053.15682-1-adrian.hunter@intel.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
    ff6f41fb
builtin-script.c 109 KB