From owner-p4-projects@FreeBSD.ORG  Fri Jul 19 10:31:17 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 79F07DC7; Fri, 19 Jul 2013 10:31:17 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 136F0DC5
 for <perforce@freebsd.org>; Fri, 19 Jul 2013 10:31:17 +0000 (UTC)
 (envelope-from jonathan@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74])
 by mx1.freebsd.org (Postfix) with ESMTP id 03811F45
 for <perforce@freebsd.org>; Fri, 19 Jul 2013 10:31:17 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6JAVGlA029750
 for <perforce@freebsd.org>; Fri, 19 Jul 2013 10:31:16 GMT
 (envelope-from jonathan@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6JAVGHt029747
 for perforce@freebsd.org; Fri, 19 Jul 2013 10:31:16 GMT
 (envelope-from jonathan@freebsd.org)
Date: Fri, 19 Jul 2013 10:31:16 GMT
Message-Id: <201307191031.r6JAVGHt029747@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jonathan@freebsd.org using -f
From: Jonathan Anderson <jonathan@FreeBSD.org>
Subject: PERFORCE change 231278 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 19 Jul 2013 10:31:17 -0000

http://p4web.freebsd.org/@@231278?ac=10

Change 231278 by jonathan@jonathan-on-zenith on 2013/07/19 10:30:17

	Pull in DTrace improvements from GitHub.

Affected files ...

.. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/libtesla.h#11 edit
.. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_dtrace.c#8 edit

Differences ...

==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/libtesla.h#11 (text+ko) ====

@@ -168,6 +168,9 @@
 
 	/** Possible transitions: exactly one must be taken. */
 	struct tesla_transition	*transitions;
+
+	/** A human-readable description for debugging purposes. */
+	const char		*description;
 };
 
 #define	TESLA_KEY_SIZE		4

==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_dtrace.c#8 (text+ko) ====

@@ -47,7 +47,7 @@
     "struct tesla_class *", "struct tesla_instance *",
     "struct tesla_instance *", "struct tesla_transition *");
 SDT_PROBE_DEFINE3(tesla, automata, fail, no_instance, no-instance-match,
-    "struct tesla_class *", "struct tesla_key *",
+    "struct tesla_class *", "const char *",
     "struct tesla_transitions *");
 SDT_PROBE_DEFINE3(tesla, automata, fail, bad_transition, bad-transition,
     "struct tesla_class *", "struct tesla_instance *",
@@ -87,8 +87,10 @@
 no_instance(struct tesla_class *tcp, const struct tesla_key *tkp,
     const struct tesla_transitions *ttp)
 {
+	char keybuf[20];
+	key_string(keybuf, keybuf + sizeof(keybuf), tkp);
 
-	SDT_PROBE(tesla, automata, fail, no_instance, tcp, tkp, ttp, 0, 0);
+	SDT_PROBE(tesla, automata, fail, no_instance, tcp, keybuf, ttp, 0, 0);
 }
 
 static void