From patchwork Wed Mar 21 21:53:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Llu=C3=ADs_Vilanova?= X-Patchwork-Id: 148085 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 69439B6F98 for ; Thu, 22 Mar 2012 09:29:01 +1100 (EST) Received: from localhost ([::1]:35641 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SAU1b-0007lk-AZ for incoming@patchwork.ozlabs.org; Wed, 21 Mar 2012 18:28:59 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57835) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SATTr-0005Cp-Tg for qemu-devel@nongnu.org; Wed, 21 Mar 2012 17:54:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SATTq-0001kq-2s for qemu-devel@nongnu.org; Wed, 21 Mar 2012 17:54:07 -0400 Received: from roura.ac.upc.edu ([147.83.33.10]:42847 helo=roura.ac.upc.es) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SATTp-0001kF-OL for qemu-devel@nongnu.org; Wed, 21 Mar 2012 17:54:06 -0400 Received: from gw.ac.upc.edu (gw.ac.upc.es [147.83.30.3]) by roura.ac.upc.es (8.13.8/8.13.8) with ESMTP id q2LLs1o0002197; Wed, 21 Mar 2012 22:54:01 +0100 Received: from localhost (unknown [84.88.53.92]) by gw.ac.upc.edu (Postfix) with ESMTP id 44AE32D0018; Wed, 21 Mar 2012 22:54:00 +0100 (CET) From: =?utf-8?b?TGx1w61z?= Vilanova To: qemu-devel@nongnu.org Date: Wed, 21 Mar 2012 22:53:28 +0100 Message-Id: <20120321215328.3272.45749.stgit@ginnungagap.bsc.es> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <20120321215224.3272.37570.stgit@ginnungagap.bsc.es> References: <20120321215224.3272.37570.stgit@ginnungagap.bsc.es> User-Agent: StGit/0.16 MIME-Version: 1.0 X-MIME-Autoconverted: from 8bit to quoted-printable by roura.ac.upc.es id q2LLs1o0002197 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 147.83.33.10 Cc: stefanha@gmail.com, harsh@linux.vnet.ibm.com, aneesh.kumar@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH v7 11/11] trace: [tracetool] Add error-reporting functions 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 Unifies the print+exit sequence into a single 'error' call. Signed-off-by: Lluís Vilanova Signed-off-by: Harsh Prateek Bora --- scripts/tracetool.py | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) diff --git a/scripts/tracetool.py b/scripts/tracetool.py index bba4c54a..628cb75 100755 --- a/scripts/tracetool.py +++ b/scripts/tracetool.py @@ -39,6 +39,15 @@ Options: ''' sys.exit(1) + +def error_write(*lines): + sys.stderr.writelines(lines) + +def error(*lines): + error_write(*lines) + sys.exit(1) + + def trace_h_begin(events): print '''#ifndef TRACE_H #define TRACE_H @@ -419,7 +428,8 @@ def main(): opts, args = getopt.getopt(sys.argv[1:], short_options, long_options) except getopt.GetoptError, err: # print help information and exit: - print str(err) # will print something like "option -a not recognized" + # will print something like "option -a not recognized" + error_write(str(err) + "\n\n") usage() sys.exit(2) for opt, arg in opts: @@ -450,8 +460,7 @@ def main(): else: sys.exit(1) else: - #assert False, "unhandled option" - print "unhandled option: ", opt + error_write("unhandled option: ", opt, "\n\n") usage() if backend == "" or output == "": @@ -459,22 +468,17 @@ def main(): sys.exit(0) if backend != 'dtrace' and output == 'd': - print 'DTrace probe generator not applicable to %s backend' % backend - sys.exit(1) + error('DTrace probe generator not applicable to %s backend\n' % backend) if output == 'stap': if backend != "dtrace": - print 'SystemTAP tapset generator not applicable to %s backend' % backend - sys.exit(1) + error('SystemTAP tapset generator not applicable to %s backend\n' % backend) if binary == "": - print '--binary is required for SystemTAP tapset generator' - sys.exit(1) + error('--binary is required for SystemTAP tapset generator\n') if not probeprefix and not targettype: - print '--target-type is required for SystemTAP tapset generator' - sys.exit(1) + error('--target-type is required for SystemTAP tapset generator\n') if not probeprefix and not targetarch: - print '--target-arch is required for SystemTAP tapset generator' - sys.exit(1) + error('--target-arch is required for SystemTAP tapset generator\n') if probeprefix == "": probeprefix = 'qemu.' + targettype + '.' + targetarch