From patchwork Sat May 22 21:08:21 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
X-Patchwork-Id: 101678
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4ML8hoE030929
	for <patchwork-kvm@patchwork.kernel.org>;
	Sat, 22 May 2010 21:08:43 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1758376Ab0EVVIi (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Sat, 22 May 2010 17:08:38 -0400
Received: from mtagate2.de.ibm.com ([195.212.17.162]:59994 "EHLO
	mtagate2.de.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1758082Ab0EVVIh (ORCPT <rfc822; kvm@vger.kernel.org>);
	Sat, 22 May 2010 17:08:37 -0400
Received: from d12nrmr1607.megacenter.de.ibm.com
	(d12nrmr1607.megacenter.de.ibm.com [9.149.167.49])
	by mtagate2.de.ibm.com (8.13.1/8.13.1) with ESMTP id o4ML8VUX024371
	for <kvm@vger.kernel.org>; Sat, 22 May 2010 21:08:31 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 o4ML8Vvh847912
	for <kvm@vger.kernel.org>; Sat, 22 May 2010 23:08:31 +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 o4ML8UFC021985
	for <kvm@vger.kernel.org>; Sat, 22 May 2010 23:08:31 +0200
Received: from stefan-thinkpad.ibm.com (sig-9-145-133-4.de.ibm.com
	[9.145.133.4])
	by d12av04.megacenter.de.ibm.com (8.12.11.20060308/8.12.11) with
	ESMTP id o4ML8SrR021941; Sat, 22 May 2010 23:08:30 +0200
From: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
To: <qemu-devel@nongnu.org>, <kvm@vger.kernel.org>
Cc: Jan Kiszka <jan.kiszka@siemens.com>,
	Prerna Saxena <prerna@linux.vnet.ibm.com>,
	Anthony Liguori <aliguori@us.ibm.com>,
	Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Subject: [PATCH 3/5] trace: Add LTTng Userspace Tracer backend
Date: Sat, 22 May 2010 22:08:21 +0100
Message-Id: <1274562503-10713-4-git-send-email-stefanha@linux.vnet.ibm.com>
X-Mailer: git-send-email 1.7.1
In-Reply-To: <1274562503-10713-1-git-send-email-stefanha@linux.vnet.ibm.com>
References: <1274562503-10713-1-git-send-email-stefanha@linux.vnet.ibm.com>
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Sat, 22 May 2010 21:08:43 +0000 (UTC)


diff --git a/configure b/configure
index d599879..307dbcb 100755
--- a/configure
+++ b/configure
@@ -829,7 +829,7 @@ echo "  --enable-docs            enable documentation build"
 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"
+echo "  --trace-backend=B        Trace backend nop simple ust"
 echo ""
 echo "NOTE: The object files are built at the place where configure is launched"
 exit 1
@@ -2302,6 +2302,9 @@ bsd)
 esac
 
 echo "TRACE_BACKEND=$trace_backend" >> $config_host_mak
+if test "$trace_backend" = "ust"; then
+  LIBS="-lust $LIBS"
+fi
 
 tools=
 if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then
diff --git a/tracetool b/tracetool
index bcd163e..72beb20 100755
--- a/tracetool
+++ b/tracetool
@@ -3,12 +3,13 @@
 usage()
 {
     cat >&2 <<EOF
-usage: $0 [--nop | --simple] [-h | -c | --py]
+usage: $0 [--nop | --simple | --ust] [-h | -c | --py]
 Generate tracing code for a file on stdin.
 
 Backends:
   --nop     Tracing disabled
   --simple  Simple built-in backend
+  --ust     LTTng User Space Tracing backend
 
 Output formats:
   -h    Generate .h file
@@ -220,6 +221,78 @@ linetopy_end_simple()
     echo "}"
 }
 
+linetoh_begin_ust()
+{
+    echo "#include <ust/tracepoint.h>"
+}
+
+linetoh_ust()
+{
+    local name args argnames
+    name=$(get_name "$1")
+    args=$(get_args "$1")
+    argnames=$(get_argnames "$1")
+
+    cat <<EOF
+DECLARE_TRACE(ust_$name, TPPROTO($args), TPARGS($argnames));
+#define trace_$name trace_ust_$name
+EOF
+}
+
+linetoh_end_ust()
+{
+    # Clean up after UST headers which pollute the namespace
+    cat <<EOF
+#undef mutex_lock
+#undef mutex_unlock
+EOF
+}
+
+linetoc_begin_ust()
+{
+    cat <<EOF
+#include <ust/marker.h>
+#include "trace.h"
+EOF
+}
+
+linetoc_ust()
+{
+    local name args argnames fmt
+    name=$(get_name "$1")
+    args=$(get_args "$1")
+    argnames=$(get_argnames "$1")
+    fmt=$(get_fmt "$1")
+
+    cat <<EOF
+DEFINE_TRACE(ust_$name);
+
+static void ust_${name}_probe($args)
+{
+    trace_mark(ust, $name, "$fmt", $argnames);
+}
+EOF
+
+    # Collect names for later
+    names="$names $name"
+}
+
+linetoc_end_ust()
+{
+    cat <<EOF
+static void __attribute__((constructor)) trace_init(void)
+{
+EOF
+
+    for name in $names; do
+        cat <<EOF
+    register_trace_ust_$name(ust_${name}_probe);
+EOF
+    done
+
+    echo "}"
+}
+
 # Process stdin by calling begin, line, and end functions for the backend
 convert()
 {
@@ -267,7 +340,7 @@ tracetopy()
 
 # Choose backend
 case "$1" in
-"--nop" | "--simple") backend="${1#--}" ;;
+"--nop" | "--simple" | "--ust") backend="${1#--}" ;;
 *) usage ;;
 esac
 shift