From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:34780) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qz2IO-0002eP-GO for qemu-devel@nongnu.org; Thu, 01 Sep 2011 04:06:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qz2IK-0007dO-B5 for qemu-devel@nongnu.org; Thu, 01 Sep 2011 04:06:44 -0400 Received: from mtagate2.uk.ibm.com ([194.196.100.162]:53897) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qz2IJ-0007az-VA for qemu-devel@nongnu.org; Thu, 01 Sep 2011 04:06:40 -0400 Received: from d06nrmr1507.portsmouth.uk.ibm.com (d06nrmr1507.portsmouth.uk.ibm.com [9.149.38.233]) by mtagate2.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p8186Y7t014583 for ; Thu, 1 Sep 2011 08:06:34 GMT Received: from d06av09.portsmouth.uk.ibm.com (d06av09.portsmouth.uk.ibm.com [9.149.37.250]) by d06nrmr1507.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p8186XhS2580726 for ; Thu, 1 Sep 2011 09:06:33 +0100 Received: from d06av09.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p8186WM1020277 for ; Thu, 1 Sep 2011 02:06:33 -0600 From: Stefan Hajnoczi Date: Thu, 1 Sep 2011 09:06:26 +0100 Message-Id: <1314864386-14202-16-git-send-email-stefanha@linux.vnet.ibm.com> In-Reply-To: <1314864386-14202-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1314864386-14202-1-git-send-email-stefanha@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 15/15] simpletrace: fix process() argument count List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Stefan Hajnoczi The simpletrace.process() function invokes analyzer methods with the wrong number of arguments if a timestamp should be included. This patch fixes the issue so that trace analysis scripts can make use of timestamps. Signed-off-by: Stefan Hajnoczi --- scripts/simpletrace.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/simpletrace.py b/scripts/simpletrace.py index 2ad5699..f55e5e6 100755 --- a/scripts/simpletrace.py +++ b/scripts/simpletrace.py @@ -102,10 +102,10 @@ 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 + fn_argcount]) + return lambda _, rec: fn(*rec[1:2 + event_argcount]) else: # Just arguments, no timestamp - return lambda _, rec: fn(*rec[2:2 + fn_argcount]) + return lambda _, rec: fn(*rec[2:2 + event_argcount]) analyzer.begin() fn_cache = {} -- 1.7.5.4