|
 |
9ae3a8 |
From c319a5160a1b86c5cfa288cdf36e7473f8c38515 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
Date: Tue, 7 Oct 2014 14:06:52 +0200
|
|
|
9ae3a8 |
Subject: [PATCH 34/43] simpletrace: add support for trace record pid field
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Message-id: <1412690820-31016-4-git-send-email-stefanha@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 61608
|
|
|
9ae3a8 |
O-Subject: [RHEL7.1 qemu-kvm PATCH 03/11] simpletrace: add support for trace record pid field
|
|
|
9ae3a8 |
Bugzilla: 1088112
|
|
|
9ae3a8 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Extract the pid field from the trace record and print it.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Change the trace record tuple from:
|
|
|
9ae3a8 |
(event_num, timestamp, arg1, ..., arg6)
|
|
|
9ae3a8 |
to:
|
|
|
9ae3a8 |
(event_num, timestamp, pid, arg1, ..., arg6)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Trace event methods now support 3 prototypes:
|
|
|
9ae3a8 |
1. <event-name>(arg1, arg2, arg3)
|
|
|
9ae3a8 |
2. <event-name>(timestamp, arg1, arg2, arg3)
|
|
|
9ae3a8 |
3. <event-name>(timestamp, pid, arg1, arg2, arg3)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Existing script continue to work without changes, they only know about
|
|
|
9ae3a8 |
prototypes 1 and 2.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 80ff35cd3ff451e8f200413ddf27816058630c1f)
|
|
|
9ae3a8 |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
scripts/simpletrace.py | 26 +++++++++++++++-----------
|
|
|
9ae3a8 |
1 file changed, 15 insertions(+), 11 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/scripts/simpletrace.py b/scripts/simpletrace.py
|
|
|
9ae3a8 |
index 3cb2cf0..682ec66 100755
|
|
|
9ae3a8 |
--- a/scripts/simpletrace.py
|
|
|
9ae3a8 |
+++ b/scripts/simpletrace.py
|
|
|
9ae3a8 |
@@ -32,10 +32,10 @@ def read_header(fobj, hfmt):
|
|
|
9ae3a8 |
return struct.unpack(hfmt, hdr)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
def get_record(edict, rechdr, fobj):
|
|
|
9ae3a8 |
- """Deserialize a trace record from a file into a tuple (event_num, timestamp, arg1, ..., arg6)."""
|
|
|
9ae3a8 |
+ """Deserialize a trace record from a file into a tuple (event_num, timestamp, pid, arg1, ..., arg6)."""
|
|
|
9ae3a8 |
if rechdr is None:
|
|
|
9ae3a8 |
return None
|
|
|
9ae3a8 |
- rec = (rechdr[0], rechdr[1])
|
|
|
9ae3a8 |
+ rec = (rechdr[0], rechdr[1], rechdr[3])
|
|
|
9ae3a8 |
if rechdr[0] != dropped_event_id:
|
|
|
9ae3a8 |
event_id = rechdr[0]
|
|
|
9ae3a8 |
event = edict[event_id]
|
|
|
9ae3a8 |
@@ -55,12 +55,12 @@ def get_record(edict, rechdr, fobj):
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
def read_record(edict, fobj):
|
|
|
9ae3a8 |
- """Deserialize a trace record from a file into a tuple (event_num, timestamp, arg1, ..., arg6)."""
|
|
|
9ae3a8 |
+ """Deserialize a trace record from a file into a tuple (event_num, timestamp, pid, arg1, ..., arg6)."""
|
|
|
9ae3a8 |
rechdr = read_header(fobj, rec_header_fmt)
|
|
|
9ae3a8 |
return get_record(edict, rechdr, fobj) # return tuple of record elements
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
def read_trace_file(edict, fobj):
|
|
|
9ae3a8 |
- """Deserialize trace records from a file, yielding record tuples (event_num, timestamp, arg1, ..., arg6)."""
|
|
|
9ae3a8 |
+ """Deserialize trace records from a file, yielding record tuples (event_num, timestamp, pid, arg1, ..., arg6)."""
|
|
|
9ae3a8 |
header = read_header(fobj, log_header_fmt)
|
|
|
9ae3a8 |
if header is None or \
|
|
|
9ae3a8 |
header[0] != header_event_id or \
|
|
|
9ae3a8 |
@@ -132,10 +132,13 @@ def process(events, log, analyzer):
|
|
|
9ae3a8 |
fn_argcount = len(inspect.getargspec(fn)[0]) - 1
|
|
|
9ae3a8 |
if fn_argcount == event_argcount + 1:
|
|
|
9ae3a8 |
# Include timestamp as first argument
|
|
|
9ae3a8 |
- return lambda _, rec: fn(*rec[1:2 + event_argcount])
|
|
|
9ae3a8 |
+ return lambda _, rec: fn(*((rec[1:2],) + rec[3:3 + event_argcount]))
|
|
|
9ae3a8 |
+ elif fn_argcount == event_argcount + 2:
|
|
|
9ae3a8 |
+ # Include timestamp and pid
|
|
|
9ae3a8 |
+ return lambda _, rec: fn(*rec[1:3 + event_argcount])
|
|
|
9ae3a8 |
else:
|
|
|
9ae3a8 |
- # Just arguments, no timestamp
|
|
|
9ae3a8 |
- return lambda _, rec: fn(*rec[2:2 + event_argcount])
|
|
|
9ae3a8 |
+ # Just arguments, no timestamp or pid
|
|
|
9ae3a8 |
+ return lambda _, rec: fn(*rec[3:3 + event_argcount])
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
analyzer.begin()
|
|
|
9ae3a8 |
fn_cache = {}
|
|
|
9ae3a8 |
@@ -167,19 +170,20 @@ if __name__ == '__main__':
|
|
|
9ae3a8 |
self.last_timestamp = None
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
def catchall(self, event, rec):
|
|
|
9ae3a8 |
- i = 1
|
|
|
9ae3a8 |
timestamp = rec[1]
|
|
|
9ae3a8 |
if self.last_timestamp is None:
|
|
|
9ae3a8 |
self.last_timestamp = timestamp
|
|
|
9ae3a8 |
delta_ns = timestamp - self.last_timestamp
|
|
|
9ae3a8 |
self.last_timestamp = timestamp
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
- fields = [event.name, '%0.3f' % (delta_ns / 1000.0)]
|
|
|
9ae3a8 |
+ fields = [event.name, '%0.3f' % (delta_ns / 1000.0),
|
|
|
9ae3a8 |
+ 'pid=%d' % rec[2]]
|
|
|
9ae3a8 |
+ i = 3
|
|
|
9ae3a8 |
for type, name in event.args:
|
|
|
9ae3a8 |
if is_string(type):
|
|
|
9ae3a8 |
- fields.append('%s=%s' % (name, rec[i + 1]))
|
|
|
9ae3a8 |
+ fields.append('%s=%s' % (name, rec[i]))
|
|
|
9ae3a8 |
else:
|
|
|
9ae3a8 |
- fields.append('%s=0x%x' % (name, rec[i + 1]))
|
|
|
9ae3a8 |
+ fields.append('%s=0x%x' % (name, rec[i]))
|
|
|
9ae3a8 |
i += 1
|
|
|
9ae3a8 |
print ' '.join(fields)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|