From owner-p4-projects@FreeBSD.ORG  Mon Mar 18 22:06:02 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 9B86CA9D; Mon, 18 Mar 2013 22:06:02 +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 44D9F9DB
 for <perforce@freebsd.org>; Mon, 18 Mar 2013 22:06:02 +0000 (UTC)
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 19548FDD
 for <perforce@freebsd.org>; Mon, 18 Mar 2013 22:06:02 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r2IM61oW045674
 for <perforce@freebsd.org>; Mon, 18 Mar 2013 22:06:01 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r2IM617E045671
 for perforce@freebsd.org; Mon, 18 Mar 2013 22:06:01 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 18 Mar 2013 22:06:01 GMT
Message-Id: <201303182206.r2IM617E045671@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 223025 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: Mon, 18 Mar 2013 22:06:03 -0000

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

Change 223025 by rwatson@rwatson_cinnamon on 2013/03/18 22:05:51

	Properly merge userspace libtesla DTrace changes; I have clearly
	wielded P4 incorrectly when looping back changes.

Affected files ...

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

Differences ...

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

@@ -43,39 +43,66 @@
     "struct tesla_instance *");
 SDT_PROBE_DEFINE2(tesla, kernel, assert, pass, pass, "struct tesla_class *",
     "struct tesla_instance *");
-#endif
 
-/*
- * XXXRW: Several of these functions might want additional state-related
- * arguments -- e.g., next-state for transition, etc.
- */
 void
 tesla_state_transition_dtrace(struct tesla_class *tcp,
-    struct tesla_instance *tip)
+    struct tesla_instance *tip,
+    __unused const struct tesla_transitions *transp,
+    __unused uint32_t transition_index)
 {
 
-#ifdef _KERNEL
 	SDT_PROBE(tesla, kernel, , state_transition, tcp, tip, 0, 0, 0);
-#else
-#endif
 }
 
 void
-tesla_assert_fail_dtrace(struct tesla_class *tcp, struct tesla_instance *tip)
+tesla_assert_fail_dtrace(struct tesla_class *tcp, struct tesla_instance *tip,
+    __unused const struct tesla_transitions *transp)
 {
 
-#ifdef _KERNEL
-	SDT_PROBE(tesla, kernel, assert, fail, tcp, tip, 0, 0, 0);
-#else
-#endif
+	if (tip)
+	    SDT_PROBE(tesla, kernel, assert, fail, tcp, tip, 0, 0, 0);
+
+	/* XXXRW:
+	 * 'tip' could be NULL if we failed to match any automaton instances
+	 * to go with a supplied key; perhaps a separate probe?
+	 */
 }
 
 void
 tesla_assert_pass_dtrace(struct tesla_class *tcp, struct tesla_instance *tip)
 {
 
-#ifdef _KERNEL
 	SDT_PROBE(tesla, kernel, assert, pass, tcp, tip, 0, 0, 0);
-#else
-#endif
+}
+
+#else /* !_KERNEL */
+
+void
+tesla_state_transition_dtrace(__unused struct tesla_class *tcp,
+    __unused struct tesla_instance *tip,
+    __unused const struct tesla_transitions *transp,
+    __unused uint32_t transition_index)
+{
+
+	assert(0 && "DTrace not implemented in userspace");
+}
+
+void
+tesla_assert_fail_dtrace(__unused struct tesla_class *tcp,
+    __unused struct tesla_instance *tip,
+    __unused const struct tesla_transitions *transp)
+{
+
+	assert(0 && "DTrace not implemented in userspace");
+}
+
+void
+tesla_assert_pass_dtrace(__unused struct tesla_class *tcp,
+    __unused struct tesla_instance *tip)
+{
+
+	assert(0 && "DTrace not implemented in userspace");
 }
+
+#endif /* _KERNEL */
+