From patchwork Mon Jun 9 13:45:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 357467 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id DCB1F140078 for ; Mon, 9 Jun 2014 23:48:13 +1000 (EST) Received: from localhost ([::1]:33105 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wtzvn-0001P4-3e for incoming@patchwork.ozlabs.org; Mon, 09 Jun 2014 09:48:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33456) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WtztN-0006kM-Q5 for qemu-devel@nongnu.org; Mon, 09 Jun 2014 09:45:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WtztG-00043a-RK for qemu-devel@nongnu.org; Mon, 09 Jun 2014 09:45:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59558) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WtztG-00043F-9s for qemu-devel@nongnu.org; Mon, 09 Jun 2014 09:45:34 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s59DjW8d008156 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 9 Jun 2014 09:45:32 -0400 Received: from localhost (ovpn-112-36.ams2.redhat.com [10.36.112.36]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s59DjV6H006048; Mon, 9 Jun 2014 09:45:31 -0400 From: Stefan Hajnoczi To: Date: Mon, 9 Jun 2014 15:45:11 +0200 Message-Id: <1402321522-18408-4-git-send-email-stefanha@redhat.com> In-Reply-To: <1402321522-18408-1-git-send-email-stefanha@redhat.com> References: <1402321522-18408-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Peter Maydell , Stefan Hajnoczi Subject: [Qemu-devel] [PULL 2/5] simpletrace: add support for trace record pid field X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Extract the pid field from the trace record and print it. Change the trace record tuple from: (event_num, timestamp, arg1, ..., arg6) to: (event_num, timestamp, pid, arg1, ..., arg6) Trace event methods now support 3 prototypes: 1. (arg1, arg2, arg3) 2. (timestamp, arg1, arg2, arg3) 3. (timestamp, pid, arg1, arg2, arg3) Existing script continue to work without changes, they only know about prototypes 1 and 2. Signed-off-by: Stefan Hajnoczi --- scripts/simpletrace.py | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/scripts/simpletrace.py b/scripts/simpletrace.py index 800835a..1aa9460 100755 --- a/scripts/simpletrace.py +++ b/scripts/simpletrace.py @@ -31,10 +31,10 @@ def read_header(fobj, hfmt): return struct.unpack(hfmt, hdr) def get_record(edict, rechdr, fobj): - """Deserialize a trace record from a file into a tuple (event_num, timestamp, arg1, ..., arg6).""" + """Deserialize a trace record from a file into a tuple (event_num, timestamp, pid, arg1, ..., arg6).""" if rechdr is None: return None - rec = (rechdr[0], rechdr[1]) + rec = (rechdr[0], rechdr[1], rechdr[3]) if rechdr[0] != dropped_event_id: event_id = rechdr[0] event = edict[event_id] @@ -54,12 +54,12 @@ def get_record(edict, rechdr, fobj): def read_record(edict, fobj): - """Deserialize a trace record from a file into a tuple (event_num, timestamp, arg1, ..., arg6).""" + """Deserialize a trace record from a file into a tuple (event_num, timestamp, pid, arg1, ..., arg6).""" rechdr = read_header(fobj, rec_header_fmt) return get_record(edict, rechdr, fobj) # return tuple of record elements def read_trace_file(edict, fobj): - """Deserialize trace records from a file, yielding record tuples (event_num, timestamp, arg1, ..., arg6).""" + """Deserialize trace records from a file, yielding record tuples (event_num, timestamp, pid, arg1, ..., arg6).""" header = read_header(fobj, log_header_fmt) if header is None or \ header[0] != header_event_id or \ @@ -127,10 +127,13 @@ def process(events, log, analyzer): fn_argcount = len(inspect.getargspec(fn)[0]) - 1 if fn_argcount == event_argcount + 1: # Include timestamp as first argument - return lambda _, rec: fn(*rec[1:2 + event_argcount]) + return lambda _, rec: fn(*((rec[1:2],) + rec[3:3 + event_argcount])) + elif fn_argcount == event_argcount + 2: + # Include timestamp and pid + return lambda _, rec: fn(*rec[1:3 + event_argcount]) else: - # Just arguments, no timestamp - return lambda _, rec: fn(*rec[2:2 + event_argcount]) + # Just arguments, no timestamp or pid + return lambda _, rec: fn(*rec[3:3 + event_argcount]) analyzer.begin() fn_cache = {} @@ -162,19 +165,20 @@ if __name__ == '__main__': self.last_timestamp = None def catchall(self, event, rec): - i = 1 timestamp = rec[1] if self.last_timestamp is None: self.last_timestamp = timestamp delta_ns = timestamp - self.last_timestamp self.last_timestamp = timestamp - fields = [event.name, '%0.3f' % (delta_ns / 1000.0)] + fields = [event.name, '%0.3f' % (delta_ns / 1000.0), + 'pid=%d' % rec[2]] + i = 3 for type, name in event.args: if is_string(type): - fields.append('%s=%s' % (name, rec[i + 1])) + fields.append('%s=%s' % (name, rec[i])) else: - fields.append('%s=0x%x' % (name, rec[i + 1])) + fields.append('%s=0x%x' % (name, rec[i])) i += 1 print ' '.join(fields)