From owner-p4-projects@FreeBSD.ORG Mon Mar 18 11:43:40 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75608A17; Mon, 18 Mar 2013 11:43:40 +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 32264A15 for ; Mon, 18 Mar 2013 11:43:40 +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 0425C2C3 for ; Mon, 18 Mar 2013 11:43:40 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r2IBhdeK085475 for ; Mon, 18 Mar 2013 11:43:39 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 r2IBhd9e085472 for perforce@freebsd.org; Mon, 18 Mar 2013 11:43:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 18 Mar 2013 11:43:39 GMT Message-Id: <201303181143.r2IBhd9e085472@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 Subject: PERFORCE change 223009 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: Mon, 18 Mar 2013 11:43:40 -0000 http://p4web.freebsd.org/@@223009?ac=10 Change 223009 by rwatson@rwatson_cinnamon on 2013/03/18 11:43:25 Merge previously omitted 2a0f9154 from libtesla to the kernel. Affected files ... .. //depot/projects/ctsrd/tesla/src/sys/libtesla/tesla.h#2 integrate Differences ... ==== //depot/projects/ctsrd/tesla/src/sys/libtesla/tesla.h#2 (text+ko) ==== @@ -38,7 +38,15 @@ /** A number of times to match an event: positive or "any number". */ typedef int __tesla_count; -/** Magic "function" representing a TESLA assertion. */ +/** + * Magic "function" representing a TESLA assertion. + * + * Its arguments are: + * * name of the file the assertion is located in (__FILE__) + * * the line the assertion is defined at (__LINE__) + * * a counter to ensure uniqueness (__COUNTER__) + * * the TESLA context (per-thread or global) + */ void __tesla_inline_assertion(const char *filename, int line, int count, __tesla_locality*, ...); @@ -66,6 +74,14 @@ /** Exiting a function (with optionally-specified arguments). */ struct __tesla_event* __tesla_return(void*, ...); + +/** Function events inside this predicate refer to the callee context. */ +struct __tesla_event* __tesla_callee(__tesla_event*, ...); + +/** Function events inside this predicate refer to the caller context. */ +struct __tesla_event* __tesla_caller(__tesla_event*, ...); + + /** Nothing to see here, move along... */ struct __tesla_event* __tesla_ignore; @@ -74,9 +90,6 @@ struct __tesla_event* __tesla_optional(__tesla_event*, ...); -/** A repetition of events — this allows globby "?", "*", "+", etc. */ -struct __tesla_event* __tesla_repeat(__tesla_count, __tesla_count, ...); - /** A value that could match a lot of function parameters. Maybe anything? */ void* __tesla_any_ptr(); int __tesla_any_int(); @@ -127,6 +140,15 @@ #define __tesla_struct_automaton(fn_name) #define __tesla_automaton(name, ...) +#define __tesla_call(...) 0 +#define __tesla_return(...) 0 + +#define __tesla_callee(...) 0 +#define __tesla_caller(...) 0 + +#define __tesla_optional(...) 0 +#define __tesla_any(...) 0 + #endif /* __TESLA_ANALYSER__ */ #endif /* TESLA_H */