switch (config->aggr_mode) {
case AGGR_CORE:
fprintf(config->output, "S%d-D%d-C%*d%s%*d%s",
- cpu_map__id_to_socket(id.id),
- cpu_map__id_to_die(id.id),
+ id.socket,
+ id.die,
config->csv_output ? 0 : -8,
- cpu_map__id_to_cpu(id.id),
+ id.core,
config->csv_sep,
config->csv_output ? 0 : 4,
nr,
break;
case AGGR_DIE:
fprintf(config->output, "S%d-D%*d%s%*d%s",
- cpu_map__id_to_socket(id.id << 16),
+ id.socket,
config->csv_output ? 0 : -8,
- cpu_map__id_to_die(id.id << 16),
+ id.die,
config->csv_sep,
config->csv_output ? 0 : 4,
nr,
case AGGR_SOCKET:
fprintf(config->output, "S%*d%s%*d%s",
config->csv_output ? 0 : -5,
- id.id,
+ id.socket,
config->csv_sep,
config->csv_output ? 0 : 4,
nr,
case AGGR_NONE:
if (evsel->percore && !config->percore_show_thread) {
fprintf(config->output, "S%d-D%d-C%*d%s",
- cpu_map__id_to_socket(id.id),
- cpu_map__id_to_die(id.id),
+ id.socket,
+ id.die,
config->csv_output ? 0 : -3,
- cpu_map__id_to_cpu(id.id), config->csv_sep);
- } else if (id.id > -1) {
+ id.core, config->csv_sep);
+ } else if (id.core > -1) {
fprintf(config->output, "CPU%*d%s",
config->csv_output ? 0 : -7,
- evsel__cpus(evsel)->map[id.id],
+ evsel__cpus(evsel)->map[id.core],
config->csv_sep);
}
break;
int i;
if (config->aggr_mode == AGGR_NONE)
- return id.id;
+ return id.core;
if (!config->aggr_get_id)
return 0;
uval = val * counter->scale;
if (cpu != -1) {
id = cpu_map__empty_aggr_cpu_id();
- id.id = cpu;
+ id.core = cpu;
}
printout(config, id, nr, counter, uval,
prefix, run, ena, 1.0, &rt_stat);
uval = val * counter->scale;
id = cpu_map__empty_aggr_cpu_id();
- id.id = cpu;
+ id.core = cpu;
printout(config, id, 0, counter, uval, prefix,
run, ena, 1.0, &rt_stat);
fputs(prefix, config->output);
evlist__for_each_entry(evlist, counter) {
id = cpu_map__empty_aggr_cpu_id();
- id.id = cpu;
+ id.core = cpu;
if (first) {
aggr_printout(config, counter, id, 0);
first = false;