From owner-p4-projects@FreeBSD.ORG  Sun Jul 14 22:11:28 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id BAD1B103; Sun, 14 Jul 2013 22:11:27 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 57C9C101
 for <perforce@freebsd.org>; Sun, 14 Jul 2013 22:11:27 +0000 (UTC)
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74])
 by mx1.freebsd.org (Postfix) with ESMTP id 38897249
 for <perforce@freebsd.org>; Sun, 14 Jul 2013 22:11:27 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6EMBQwk028155
 for <perforce@freebsd.org>; Sun, 14 Jul 2013 22:11:26 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6EMBQac028152
 for perforce@freebsd.org; Sun, 14 Jul 2013 22:11:26 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 14 Jul 2013 22:11:26 GMT
Message-Id: <201307142211.r6EMBQac028152@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 231157 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: Sun, 14 Jul 2013 22:11:28 -0000

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

Change 231157 by rwatson@rwatson_cinnamon on 2013/07/14 22:11:02

	Use called() syntax rather than bare functions in previously() and
	eventually(); unfortunately, the TESLA analyser does not yet warn (or
	perhaps error out) if this mistake is made.
	
	Mark a function as __noinline in the hopes that this allows it to be
	instrumented.

Affected files ...

.. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/test/tesla_test.c#2 edit

Differences ...

==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/test/tesla_test.c#2 (text+ko) ====

@@ -50,7 +50,7 @@
 /*
  * To avoid a no-op function.
  */
-static void
+static void __noinline
 debug_tesla_func(void)
 {
 
@@ -62,7 +62,7 @@
 {
 	int error;
 
-	TESLA_SYSCALL(eventually(debug_tesla_func()));
+	TESLA_SYSCALL(eventually(called(debug_tesla_func())));
 	error = sysctl_handle_int(oidp, &debug_tesla_func_counter, 0, req);
 	if (error)
 		return (error);
@@ -80,7 +80,7 @@
 {
 	int error;
 
-	TESLA_SYSCALL(eventually(debug_tesla_func()));
+	TESLA_SYSCALL(eventually(called(debug_tesla_func())));
 	error = sysctl_handle_int(oidp, &debug_tesla_func_counter, 0, req);
 	if (error)
 		return (error);
@@ -102,7 +102,7 @@
 	if (error)
 		return (error);
 
-	TESLA_SYSCALL(previously(debug_tesla_func()));
+	TESLA_SYSCALL(previously(called(debug_tesla_func())));
 	return (0);
 }
 
@@ -119,7 +119,7 @@
 	if (error)
 		return (error);
 
-	TESLA_SYSCALL(previously(debug_tesla_func()));
+	TESLA_SYSCALL(previously(called(debug_tesla_func())));
 	return (0);
 }