From owner-p4-projects@FreeBSD.ORG  Fri Jul 19 11:53:47 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id E96E6298; Fri, 19 Jul 2013 11:53:46 +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 A72D0296
 for <perforce@freebsd.org>; Fri, 19 Jul 2013 11:53:46 +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 985A430E
 for <perforce@freebsd.org>; Fri, 19 Jul 2013 11:53:46 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6JBrk7x041297
 for <perforce@freebsd.org>; Fri, 19 Jul 2013 11:53:46 GMT
 (envelope-from jonathan@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6JBrkQu041294
 for perforce@freebsd.org; Fri, 19 Jul 2013 11:53:46 GMT
 (envelope-from jonathan@freebsd.org)
Date: Fri, 19 Jul 2013 11:53:46 GMT
Message-Id: <201307191153.r6JBrkQu041294@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 231279 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 11:53:47 -0000

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

Change 231279 by jonathan@jonathan-on-zenith on 2013/07/19 11:53:30

	Pull in TESLA DTrace parts from commit 219d22.

Affected files ...

.. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_dtrace.c#9 edit

Differences ...

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

@@ -46,8 +46,8 @@
 SDT_PROBE_DEFINE4(tesla, automata, instance, clone, clone,
     "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 *", "const char *",
+SDT_PROBE_DEFINE4(tesla, automata, fail, no_instance, no-instance-match,
+    "struct tesla_class *", "const char *", "const char *",
     "struct tesla_transitions *");
 SDT_PROBE_DEFINE3(tesla, automata, fail, bad_transition, bad-transition,
     "struct tesla_class *", "struct tesla_instance *",
@@ -87,10 +87,28 @@
 no_instance(struct tesla_class *tcp, const struct tesla_key *tkp,
     const struct tesla_transitions *ttp)
 {
+	char instbuf[200];
+	char *c = instbuf;
+	const char *end = instbuf + sizeof(instbuf);
+
+	SAFE_SPRINTF(c, end, "%d/%d instances\n",
+		tcp->tc_limit - tcp->tc_free, tcp->tc_limit);
+
+	for (uint32_t i = 0; i < tcp->tc_limit; i++) {
+		const struct tesla_instance *inst = tcp->tc_instances + i;
+		if (!tesla_instance_active(inst))
+			continue;
+
+		SAFE_SPRINTF(c, end, "    %2u: state %d, ", i, inst->ti_state);
+		c = key_string(c, end, &inst->ti_key);
+		SAFE_SPRINTF(c, end, "\n");
+	}
+
 	char keybuf[20];
 	key_string(keybuf, keybuf + sizeof(keybuf), tkp);
 
-	SDT_PROBE(tesla, automata, fail, no_instance, tcp, keybuf, ttp, 0, 0);
+	SDT_PROBE(tesla, automata, fail, no_instance,
+		tcp, instbuf, keybuf, ttp, 0);
 }
 
 static void