PERFORCE change 231157 for review

[Robert Watson]

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

Change 231157 by rwatson at 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);
 }