From owner-p4-projects@FreeBSD.ORG Wed Oct 9 21:34:34 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C4B15DF2; Wed, 9 Oct 2013 21:34:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 7150CDF0 for ; Wed, 9 Oct 2013 21:34:34 +0000 (UTC) (envelope-from jonathan@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5D4C327EF for ; Wed, 9 Oct 2013 21:34:34 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r99LYYFT004864 for ; Wed, 9 Oct 2013 21:34:34 GMT (envelope-from jonathan@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r99LYY6f004861 for perforce@freebsd.org; Wed, 9 Oct 2013 21:34:34 GMT (envelope-from jonathan@freebsd.org) Date: Wed, 9 Oct 2013 21:34:34 GMT Message-Id: <201310092134.r99LYY6f004861@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jonathan@freebsd.org using -f From: Jonathan Anderson Subject: PERFORCE change 1024152 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: Wed, 09 Oct 2013 21:34:35 -0000 http://p4web.freebsd.org/@@1024152?ac=10 Change 1024152 by jonathan@jonathan-on-zenith on 2013/10/09 21:34:22 Fix some compile errors introduced into P4 branch by last GitHub sync. It looks like I previously fixed these things in P4, copied them to my zenith Git repo but failed to push them upstream. Consequently, on the next sync I clobbered them. Affected files ... .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_class.c#11 edit .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_debug.c#9 edit .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_dtrace.c#12 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_class.c#11 (text+ko) ==== @@ -151,7 +151,7 @@ return (TESLA_SUCCESS); } - tesla_assert(0 && ("no free instances but tc_free was > 0")); + tesla_assert(0, ("no free instances but tc_free was > 0")); return (TESLA_ERROR_ENOMEM); } ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_debug.c#9 (text+ko) ==== @@ -208,7 +208,7 @@ tesla_assert(instance_belongs_to_class, ("tesla_instance %x not of class '%s'", - instance, tclass->tc_name) + instance, tclass->tc_automaton->ta_name) ); } ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_dtrace.c#12 (text+ko) ==== @@ -47,18 +47,17 @@ "struct tesla_class *", "struct tesla_instance *", "struct tesla_instance *", "struct tesla_transition *"); SDT_PROBE_DEFINE4(tesla, automata, fail, no_instance, no-instance-match, - "struct tesla_class *", "const char *", "const char *", + "struct tesla_class *", "const char *", "int32_t", "struct tesla_transitions *"); SDT_PROBE_DEFINE3(tesla, automata, fail, bad_transition, bad-transition, "struct tesla_class *", "struct tesla_instance *", - "struct tesla_transitions *"); -SDT_PROBE_DEFINE3(tesla, automata, fail, other_err, other-error, - "struct tesla_class *", "int", "const char *"); + "int32_t"); +SDT_PROBE_DEFINE4(tesla, automata, fail, other_err, other-error, + "struct tesla_class *", "int32_t", "int", "const char *"); SDT_PROBE_DEFINE2(tesla, automata, success, accept, accept, "struct tesla_class *", "struct tesla_instance *"); SDT_PROBE_DEFINE3(tesla, automata, event, ignored, ignored-event, - "struct tesla_class *", "struct tesla_key *", - "struct tesla_transitions *"); + "struct tesla_class *", "int32_t", "struct tesla_key *"); static void new_instance(struct tesla_class *tcp, struct tesla_instance *tip) @@ -84,8 +83,8 @@ } static void -no_instance(struct tesla_class *tcp, const struct tesla_key *tkp, - const struct tesla_transitions *ttp) +no_instance(struct tesla_class *tcp, int32_t symbol, + const struct tesla_key *tkp) { char instbuf[200]; char *c = instbuf; @@ -108,22 +107,25 @@ key_string(keybuf, keybuf + sizeof(keybuf), tkp); SDT_PROBE(tesla, automata, fail, no_instance, - tcp, instbuf, keybuf, ttp, 0); + tcp, instbuf, symbol, keybuf, 0); } static void bad_transition(struct tesla_class *tcp, struct tesla_instance *tip, - const struct tesla_transitions *ttp) + int32_t symbol) { - SDT_PROBE(tesla, automata, fail, bad_transition, tcp, tip, ttp, 0, 0); + SDT_PROBE(tesla, automata, fail, bad_transition, tcp, tip, symbol, + 0, 0); } static void -err(struct tesla_class *tcp, int errnum, const char *message) +err(const struct tesla_automaton *tap, int32_t symbol, int32_t errnum, + const char *message) { - SDT_PROBE(tesla, automata, fail, other_err, tcp, errnum, message, 0, 0); + SDT_PROBE(tesla, automata, fail, other_err, + tap, symbol, errnum, message, 0); } static void @@ -134,11 +136,11 @@ } static void -ignored(const struct tesla_class *tcp, const struct tesla_key *tkp, - const struct tesla_transitions *ttp) +ignored(const struct tesla_class *tcp, int32_t symbol, + const struct tesla_key *tkp) { - SDT_PROBE(tesla, automata, event, ignored, tcp, tkp, ttp, 0, 0); + SDT_PROBE(tesla, automata, event, ignored, tcp, symbol, tkp, 0, 0); } const struct tesla_event_handlers dtrace_handlers = {