From patchwork Tue Jul 13 08:26:32 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 58716 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3B09FB6EEE for ; Tue, 13 Jul 2010 18:29:19 +1000 (EST) Received: from localhost ([127.0.0.1]:52228 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYarZ-00069d-MJ for incoming@patchwork.ozlabs.org; Tue, 13 Jul 2010 04:29:13 -0400 Received: from [140.186.70.92] (port=52985 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYapb-0005At-RC for qemu-devel@nongnu.org; Tue, 13 Jul 2010 04:27:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OYapX-0000bm-5P for qemu-devel@nongnu.org; Tue, 13 Jul 2010 04:27:11 -0400 Received: from mtagate4.de.ibm.com ([195.212.17.164]:46306) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OYapW-0000XE-RW for qemu-devel@nongnu.org; Tue, 13 Jul 2010 04:27:07 -0400 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate4.de.ibm.com (8.13.1/8.13.1) with ESMTP id o6D8Qkk9000863 for ; Tue, 13 Jul 2010 08:26:46 GMT Received: from d12av04.megacenter.de.ibm.com (d12av04.megacenter.de.ibm.com [9.149.165.229]) by d12nrmr1607.megacenter.de.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o6D8QgZp1794158 for ; Tue, 13 Jul 2010 10:26:46 +0200 Received: from d12av04.megacenter.de.ibm.com (loopback [127.0.0.1]) by d12av04.megacenter.de.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id o6D8QgbL003090 for ; Tue, 13 Jul 2010 10:26:42 +0200 Received: from stefan-thinkpad.manchester-maybrook.uk.ibm.com (dyn-9-174-219-26.manchester-maybrook.uk.ibm.com [9.174.219.26]) by d12av04.megacenter.de.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id o6D8QgPK003079; Tue, 13 Jul 2010 10:26:42 +0200 From: Stefan Hajnoczi To: Date: Tue, 13 Jul 2010 09:26:32 +0100 Message-Id: <1279009593-2562-1-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: Prerna Saxena Subject: [Qemu-devel] [PATCH 1/2][Tracing] Specify trace file name X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Prerna Saxena Allow users to specify a file for trace-outputs at configuration. Also, allow trace files to be annotated by so each qemu instance has unique traces. The trace file name can be passed as a config option: --trace-file=/path/to/file (Default : /tmp/trace ) At runtime, the pid of the qemu process is appended to the filename so that mutiple qemu instances do not have overlapping logs. Eg : /tmp/trace-1234 for qemu launched with pid 1234. I have yet to test this on windows. getpid() is used at many places in code(including vnc.c), so I'm hoping this would be okay too. Edited-by: Stefan Hajnoczi --- Prerna, I have modified this patch that you wrote and together with patch 2/2 it provides control over the trace file. The changes include: * Set trace_file earlier in ./configure so $trace_file- displays correctly. * Introduce open_trace_file() helper function to handle file naming. configure | 13 +++++++++++++ simpletrace.c | 16 ++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 02bf602..fe1b027 100755 --- a/configure +++ b/configure @@ -313,6 +313,7 @@ check_utests="no" user_pie="no" zero_malloc="" trace_backend="nop" +trace_file="/tmp/trace" # OS specific if check_define __linux__ ; then @@ -470,6 +471,7 @@ if test "$mingw32" = "yes" ; then bindir="\${prefix}" sysconfdir="\${prefix}" confsuffix="" + trace_file="trace" fi # find source path @@ -517,6 +519,8 @@ for opt do ;; --trace-backend=*) trace_backend="$optarg" ;; + --trace-file=*) trace_file="$optarg" + ;; --enable-gprof) gprof="yes" ;; --static) @@ -876,6 +880,9 @@ echo " --disable-docs disable documentation build" echo " --disable-vhost-net disable vhost-net acceleration support" echo " --enable-vhost-net enable vhost-net acceleration support" echo " --trace-backend=B Trace backend nop simple ust" +echo " --trace-file=NAME Full PATH,NAME of file to store traces" +echo " Default:/tmp/trace-" +echo " Default:trace- on Windows" echo "" echo "NOTE: The object files are built at the place where configure is launched" exit 1 @@ -2132,6 +2139,7 @@ echo "fdatasync $fdatasync" echo "uuid support $uuid" echo "vhost-net support $vhost_net" echo "Trace backend $trace_backend" +echo "Trace output file $trace_file-" if test $sdl_too_old = "yes"; then echo "-> Your SDL version is too old - please upgrade to have SDL support" @@ -2387,6 +2395,11 @@ fi if test "$trace_backend" = "ust"; then LIBS="-lust $LIBS" fi +# Set the appropriate trace file. +if test "$trace_backend" = "simple"; then + trace_file="\"$trace_file-%u\"" +fi +echo "CONFIG_TRACE_FILE=$trace_file" >> $config_host_mak echo "TOOLS=$tools" >> $config_host_mak echo "ROMS=$roms" >> $config_host_mak echo "MAKE=$make" >> $config_host_mak diff --git a/simpletrace.c b/simpletrace.c index ed20d36..29fd6a9 100644 --- a/simpletrace.c +++ b/simpletrace.c @@ -21,11 +21,23 @@ static TraceRecord trace_buf[TRACE_BUF_LEN]; static unsigned int trace_idx; static FILE *trace_fp; +static bool open_trace_file(void) +{ + char *filename; + + if (asprintf(&filename, CONFIG_TRACE_FILE, getpid()) < 0) { + return false; + } + + trace_fp = fopen(filename, "w"); + free(filename); + return trace_fp != NULL; +} + static void flush_trace_buffer(void) { if (!trace_fp) { - trace_fp = fopen("/tmp/trace.log", "w"); - if (trace_fp) { + if (open_trace_file()) { atexit(flush_trace_buffer); } }