3c3
< # Copyright (c) 2012 ARM Limited
---
> # Copyright (c) 2012, 2014 ARM Limited
145c145
< if config.has_section("system.cpu"):
---
> if config.has_section("system.cluster.cpu"):
149c149
< while config.has_section("system.cpu" + str(num_cpus)):
---
> while config.has_section("system.cluster.cpu" + str(num_cpus)):
152c152
< if config.has_section("system.l2"):
---
> if config.has_section("system.cluster.l2_cache"):
156c156
< while config.has_section("system.l2" + str(num_l2)):
---
> while config.has_section("system.cluster.l2_cache" + str(num_l2)):
716c716
< def __init__(self, name, group, group_index, per_cpu, per_switchcpu, key):
---
> def __init__(self, name, group, group_index, per_cpu, key):
739d738
< self.per_switchcpu = per_switchcpu
764,766c763,764
< # Resuming from checkpoints results in using "switch_cpus"
< if per_switchcpu:
< per_cpu_name = "system.switch_cpus"
---
> if num_cpus > 1:
> per_cpu_name = re.sub("#", str(i), self.name)
768c766
< per_cpu_name = "system.cpu"
---
> per_cpu_name = re.sub("#", "", self.name)
770,773d767
< # No CPU number appends if num_cpus == 1
< if num_cpus > 1:
< per_cpu_name += str(i)
< per_cpu_name += "." + self.name
798c792
< def register(self, name, group, group_index, per_cpu, per_switchcpu):
---
> def register(self, name, group, group_index, per_cpu):
801c795
< per_switchcpu, self.next_key))
---
> self.next_key))
839c833
< stats.register(item, group, i, True, False)
---
> stats.register(item, group, i, True)
842,851d835
< per_cpu_stat_groups = config.options('PER_SWITCHCPU_STATS')
< for group in per_cpu_stat_groups:
< i = 0
< per_cpu_stats_list = \
< config.get('PER_SWITCHCPU_STATS', group).split('\n')
< for item in per_cpu_stats_list:
< if item:
< stats.register(item, group, i, True, True)
< i += 1
<
859,860d842
< name = item
< prefix = "system.l2"
862,865c844,847
< prefix += str(l2)
< prefix += "."
< name = prefix + name
< stats.register(name, group, i, False, False)
---
> name = re.sub("#", str(l2), item)
> else:
> name = re.sub("#", "", item)
> stats.register(name, group, i, False)
874c856
< stats.register(item, group, i, False, False)
---
> stats.register(item, group, i, False)
1048a1031
> stat_name = re.sub("#", "", stat_name)