From owner-p4-projects@FreeBSD.ORG  Wed Jun 19 22:16:30 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 9F52CCA1; Wed, 19 Jun 2013 22:16:30 +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 62316C9F
 for <perforce@freebsd.org>; Wed, 19 Jun 2013 22:16:30 +0000 (UTC)
 (envelope-from jonathan@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks6.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 51FAA126E
 for <perforce@freebsd.org>; Wed, 19 Jun 2013 22:16:30 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r5JMGUg2091328
 for <perforce@freebsd.org>; Wed, 19 Jun 2013 22:16:30 GMT
 (envelope-from jonathan@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r5JMGUto091325
 for perforce@freebsd.org; Wed, 19 Jun 2013 22:16:30 GMT
 (envelope-from jonathan@freebsd.org)
Date: Wed, 19 Jun 2013 22:16:30 GMT
Message-Id: <201306192216.r5JMGUto091325@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 229975 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: Wed, 19 Jun 2013 22:16:30 -0000

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

Change 229975 by jonathan@jonathan-on-zenith on 2013/06/19 22:15:48

	Merge some upstream libtesla changes.

Affected files ...

.. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/tesla-macros.h#4 edit
.. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_class.c#5 edit

Differences ...

==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/tesla-macros.h#4 (text+ko) ====

@@ -67,7 +67,9 @@
 /** A strictly-ordered sequence of events. */
 #define	TSEQUENCE(...)		__tesla_sequence(__tesla_ignore, __VA_ARGS__)
 
-#define	called(...)		__tesla_call(__VA_ARGS__)
+// This can be removed once all users are converted to the new syntax for calls.
+#pragma clang diagnostic ignored "-Wunused"
+#define	called(...)		__tesla_call(((void)__VA_ARGS__, __tesla_ignore))
 #define	returned(...)		__tesla_return(__VA_ARGS__)
 
 #define	callee(...)		__tesla_callee(__tesla_ignore, __VA_ARGS__)

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

@@ -192,15 +192,4 @@
 
 	bzero(c->tc_instances, sizeof(c->tc_instances[0]) * c->tc_limit);
 	c->tc_free = c->tc_limit;
-
-	switch (c->tc_context) {
-	case TESLA_CONTEXT_GLOBAL:
-		return tesla_class_global_release(c);
-
-	case TESLA_CONTEXT_THREAD:
-		return tesla_class_perthread_release(c);
-
-	default:
-		assert(0 && "unhandled TESLA context");
-	}
 }