vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

scripts/kvm/kvm_stat: Rename variables that redefine globals 

Filter, id and byte are builtin python modules which should not be
redefined by local variables.

Reviewed-by: Jason J. Herne <jjherne@linux.vnet.ibm.com>
Signed-off-by: Janosch Frank <frankja@linux.vnet.ibm.com>
Message-Id: <1452525484-32309-12-git-send-email-frankja@linux.vnet.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
master
Janosch Frank 2016-01-11 16:17:41 +01:00 committed by Paolo Bonzini
parent e02d896e45
commit a4b2be204b
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/kvm/kvm_stat
View File

@ -333,20 +333,21 @@ class Group(object):
self.events = [] self.events = []
self.group_leader = None self.group_leader = None
self.cpu = cpu self.cpu = cpu
def add_event(self, name, event_set, tracepoint, filter=None): def add_event(self, name, event_set, tracepoint, tracefilter=None):
self.events.append(Event(group=self, self.events.append(Event(group=self,
name=name, event_set=event_set, name=name, event_set=event_set,
tracepoint=tracepoint, filter=filter)) tracepoint=tracepoint,
tracefilter=tracefilter))
if len(self.events) == 1: if len(self.events) == 1:
self.file = os.fdopen(self.events[0].fd) self.file = os.fdopen(self.events[0].fd)
def read(self): def read(self):
bytes = 8 * (1 + len(self.events)) length = 8 * (1 + len(self.events))
fmt = 'xxxxxxxx' + 'q' * len(self.events) fmt = 'xxxxxxxx' + 'q' * len(self.events)
return dict(zip([event.name for event in self.events], return dict(zip([event.name for event in self.events],
struct.unpack(fmt, self.file.read(bytes)))) struct.unpack(fmt, self.file.read(length))))
class Event(object): class Event(object):
def __init__(self, group, name, event_set, tracepoint, filter=None): def __init__(self, group, name, event_set, tracepoint, tracefilter=None):
self.name = name self.name = name
attr = perf_event_attr() attr = perf_event_attr()
attr.type = PERF_TYPE_TRACEPOINT attr.type = PERF_TYPE_TRACEPOINT
@ -364,8 +365,8 @@ class Event(object):
if fd == -1: if fd == -1:
err = get_errno()[0] err = get_errno()[0]
raise Exception('perf_event_open failed, errno = ' + err.__str__()) raise Exception('perf_event_open failed, errno = ' + err.__str__())
if filter: if tracefilter:
fcntl.ioctl(fd, IOCTL_NUMBERS['SET_FILTER'], filter) fcntl.ioctl(fd, IOCTL_NUMBERS['SET_FILTER'], tracefilter)
self.fd = fd self.fd = fd
def enable(self): def enable(self):
fcntl.ioctl(self.fd, IOCTL_NUMBERS['ENABLE'], 0) fcntl.ioctl(self.fd, IOCTL_NUMBERS['ENABLE'], 0)
@ -415,15 +416,15 @@ class TracepointProvider(object):
group = Group(cpu) group = Group(cpu)
for name in _fields: for name in _fields:
tracepoint = name tracepoint = name
filter = None tracefilter = None
m = re.match(r'(.*)\((.*)\)', name) m = re.match(r'(.*)\((.*)\)', name)
if m: if m:
tracepoint, sub = m.groups() tracepoint, sub = m.groups()
filter = '%s==%d\0' % (filters[tracepoint][0], tracefilter = '%s==%d\0' % (filters[tracepoint][0],
filters[tracepoint][1][sub]) filters[tracepoint][1][sub])
event = group.add_event(name, event_set='kvm', event = group.add_event(name, event_set='kvm',
tracepoint=tracepoint, tracepoint=tracepoint,
filter=filter) tracefilter=tracefilter)
self.group_leaders.append(group) self.group_leaders.append(group)
def select(self, fields): def select(self, fields):
for group in self.group_leaders: for group in self.group_leaders: