From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: =?utf-8?b?TGx1w61z?= Vilanova Date: Wed, 21 Mar 2012 22:53:28 +0100 Message-Id: <20120321215328.3272.45749.stgit@ginnungagap.bsc.es> In-Reply-To: <20120321215224.3272.37570.stgit@ginnungagap.bsc.es> References: <20120321215224.3272.37570.stgit@ginnungagap.bsc.es> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v7 11/11] trace: [tracetool] Add error-reporting functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: stefanha@gmail.com, harsh@linux.vnet.ibm.com, aneesh.kumar@linux.vnet.ibm.com Unifies the print+exit sequence into a single 'error' call. Signed-off-by: Llu=C3=ADs 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) =20 + +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 =3D getopt.getopt(sys.argv[1:], short_options, long_o= ptions) except getopt.GetoptError, err: # print help information and exit: - print str(err) # will print something like "option -a not recogn= ized" + # 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() =20 if backend =3D=3D "" or output =3D=3D "": @@ -459,22 +468,17 @@ def main(): sys.exit(0) =20 if backend !=3D 'dtrace' and output =3D=3D 'd': - print 'DTrace probe generator not applicable to %s backend' % ba= ckend - sys.exit(1) + error('DTrace probe generator not applicable to %s backend\n' % = backend) =20 if output =3D=3D 'stap': if backend !=3D "dtrace": - print 'SystemTAP tapset generator not applicable to %s backe= nd' % backend - sys.exit(1) + error('SystemTAP tapset generator not applicable to %s backe= nd\n' % backend) if binary =3D=3D "": - 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 genera= tor' - sys.exit(1) + error('--target-type is required for SystemTAP tapset genera= tor\n') if not probeprefix and not targetarch: - print '--target-arch is required for SystemTAP tapset genera= tor' - sys.exit(1) + error('--target-arch is required for SystemTAP tapset genera= tor\n') if probeprefix =3D=3D "": probeprefix =3D 'qemu.' + targettype + '.' + targetarch =20