| event.c (41c177cf354126a22443b5c80cec9fdd313e67e1) | event.c (42fd623b58dbcc48310705bbf3e3d4d7c1deec29) |
|---|---|
| 1#include <errno.h> 2#include <fcntl.h> 3#include <inttypes.h> 4#include <linux/kernel.h> 5#include <linux/types.h> 6#include <perf/cpumap.h> 7#include <sys/types.h> 8#include <sys/stat.h> --- 497 unchanged lines hidden (view full) --- 506 size_t ret; 507 bool old; 508 509 ret = fprintf(fp, " %" PRI_lx64 " ", tp->addr); 510 if (machine) { 511 struct addr_location al; 512 513 addr_location__init(&al); | 1#include <errno.h> 2#include <fcntl.h> 3#include <inttypes.h> 4#include <linux/kernel.h> 5#include <linux/types.h> 6#include <perf/cpumap.h> 7#include <sys/types.h> 8#include <sys/stat.h> --- 497 unchanged lines hidden (view full) --- 506 size_t ret; 507 bool old; 508 509 ret = fprintf(fp, " %" PRI_lx64 " ", tp->addr); 510 if (machine) { 511 struct addr_location al; 512 513 addr_location__init(&al); |
| 514 al.map = map__get(maps__find(machine__kernel_maps(machine), tp->addr)); | 514 al.map = maps__find(machine__kernel_maps(machine), tp->addr); |
| 515 if (al.map && map__load(al.map) >= 0) { 516 al.addr = map__map_ip(al.map, tp->addr); 517 al.sym = map__find_symbol(al.map, al.addr); 518 if (al.sym) 519 ret += symbol__fprintf_symname_offs(al.sym, &al, fp); 520 } 521 addr_location__exit(&al); 522 } --- 113 unchanged lines hidden (view full) --- 636 if ((cpumode == PERF_RECORD_MISC_USER || 637 cpumode == PERF_RECORD_MISC_KERNEL) && 638 !perf_host) 639 al->filtered |= (1 << HIST_FILTER__HOST); 640 641 return NULL; 642 } 643 al->maps = maps__get(maps); | 515 if (al.map && map__load(al.map) >= 0) { 516 al.addr = map__map_ip(al.map, tp->addr); 517 al.sym = map__find_symbol(al.map, al.addr); 518 if (al.sym) 519 ret += symbol__fprintf_symname_offs(al.sym, &al, fp); 520 } 521 addr_location__exit(&al); 522 } --- 113 unchanged lines hidden (view full) --- 636 if ((cpumode == PERF_RECORD_MISC_USER || 637 cpumode == PERF_RECORD_MISC_KERNEL) && 638 !perf_host) 639 al->filtered |= (1 << HIST_FILTER__HOST); 640 641 return NULL; 642 } 643 al->maps = maps__get(maps); |
| 644 al->map = map__get(maps__find(maps, al->addr)); | 644 al->map = maps__find(maps, al->addr); |
| 645 if (al->map != NULL) { 646 /* 647 * Kernel maps might be changed when loading symbols so loading 648 * must be done prior to using kernel maps. 649 */ 650 if (load_map) 651 map__load(al->map); 652 al->addr = map__map_ip(al->map, al->addr); --- 177 unchanged lines hidden --- | 645 if (al->map != NULL) { 646 /* 647 * Kernel maps might be changed when loading symbols so loading 648 * must be done prior to using kernel maps. 649 */ 650 if (load_map) 651 map__load(al->map); 652 al->addr = map__map_ip(al->map, al->addr); --- 177 unchanged lines hidden --- |