From owner-p4-projects@FreeBSD.ORG Tue Jun 11 09:54:35 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4477D88; Tue, 11 Jun 2013 09:54:35 +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 7B133D86 for ; Tue, 11 Jun 2013 09:54:35 +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 5D395191B for ; Tue, 11 Jun 2013 09:54:35 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r5B9sZhq019672 for ; Tue, 11 Jun 2013 09:54:35 GMT (envelope-from jonathan@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r5B9sZ3O019669 for perforce@freebsd.org; Tue, 11 Jun 2013 09:54:35 GMT (envelope-from jonathan@freebsd.org) Date: Tue, 11 Jun 2013 09:54:35 GMT Message-Id: <201306110954.r5B9sZ3O019669@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jonathan@freebsd.org using -f From: Jonathan Anderson Subject: PERFORCE change 229579 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Jun 2013 09:54:36 -0000 http://p4web.freebsd.org/@@229579?ac=10 Change 229579 by jonathan@jonathan-on-joe on 2013/06/11 09:54:15 Update sys/contrib/tesla with latest libtesla parts. Affected files ... .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/libtesla.h#3 edit .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/tesla-macros.h#3 edit .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/tesla.h#2 edit .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_class_perthread.c#3 edit .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_internal.h#3 edit .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_util.c#2 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/libtesla.h#3 (text+ko) ==== @@ -163,7 +163,7 @@ -#define TESLA_KEY_SIZE 8 +#define TESLA_KEY_SIZE 4 /** * A TESLA instance can be identified by a @ref tesla_class and a ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/tesla-macros.h#3 (text+ko) ==== @@ -52,10 +52,10 @@ ) /** An inline assertion. */ -#define TESLA_ASSERT(locality, start, end, predicate) \ +#define TESLA_ASSERT(locality, start, end, expression) \ __tesla_inline_assertion( \ __FILE__, __LINE__, __COUNTER__, \ - locality, start, end, predicate \ + locality, start, end, expression \ ) /** An assertion in the global TESLA context. */ @@ -82,7 +82,7 @@ #define automaton(name, ...) __tesla_automaton(name, __VA_ARGS__) -#define tdone return (__tesla_automaton_done()) +#define tesla_done return (__tesla_automaton_done()) #define optional(...) __tesla_optional(__tesla_ignore, __VA_ARGS__) #define ANY_REP INT_MAX ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/tesla.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ /** - * @mainpage TESLA API documentation + * @mainpage API documentation * * This is the API documentation for TESLA's programmer interface * (@ref ConsumerAPI), runtime support library (@ref libtesla) and ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_class_perthread.c#3 (text+ko) ==== @@ -75,6 +75,7 @@ store = td->td_tesla; td->td_tesla = NULL; tesla_store_free(store); + tesla_free(store); } static void ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_internal.h#3 (text+ko) ==== @@ -73,7 +73,7 @@ /** * Call this if things go catastrophically, unrecoverably wrong. */ -void tesla_die(const char *event) __attribute__((noreturn)); +void tesla_die(int32_t errno, const char *event) __attribute__((noreturn)); /** * Clean up a @ref tesla_class. ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_util.c#2 (text+ko) ==== @@ -35,9 +35,11 @@ void -tesla_die(const char *event) +tesla_die(int32_t code, const char *event) { - tesla_panic("tesla_die: fatal error in event '%s'\n", event); + + tesla_panic("tesla_die: fatal error in event '%s'; %s\n", + event, tesla_strerror(code)); } const char *