From owner-p4-projects@FreeBSD.ORG Tue Jun 18 14:20:12 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E719C8EC; Tue, 18 Jun 2013 14:20:11 +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 A9E178EA for ; Tue, 18 Jun 2013 14:20:11 +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 80AD91C68 for ; Tue, 18 Jun 2013 14:20:11 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r5IEKBiN018501 for ; Tue, 18 Jun 2013 14:20:11 GMT (envelope-from jonathan@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r5IEKBLx018498 for perforce@freebsd.org; Tue, 18 Jun 2013 14:20:11 GMT (envelope-from jonathan@freebsd.org) Date: Tue, 18 Jun 2013 14:20:11 GMT Message-Id: <201306181420.r5IEKBLx018498@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jonathan@freebsd.org using -f From: Jonathan Anderson Subject: PERFORCE change 229889 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, 18 Jun 2013 14:20:12 -0000 http://p4web.freebsd.org/@@229889?ac=10 Change 229889 by jonathan@jonathan-on-joe on 2013/06/18 14:19:21 Now that we have an alternate error handling path, we mightn't need these asserts (that do not appear in the upstream TESLA repository). Affected files ... .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_class.c#4 edit .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_key.c#4 edit .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_notification.c#10 edit .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_store.c#4 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_class.c#4 (text+ko) ==== @@ -138,12 +138,7 @@ // A new instance must not look inactive. if ((state == 0) && (name->tk_mask == 0)) -#ifdef _KERNEL - tesla_panic("inactive-looking new instance: state %d, mask 0x%x", - state, name->tk_mask); -#else return (TESLA_ERROR_EINVAL); -#endif if (tclass->tc_free == 0) return (TESLA_ERROR_ENOMEM); ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_key.c#4 (text+ko) ==== @@ -72,10 +72,6 @@ if (IS_SET(source->tk_mask, i)) { if (IS_SET(dest->tk_mask, i)) { if (dest->tk_keys[i] != source->tk_keys[i]) -#ifdef _KERNEL - tesla_panic("dest key %d (0x%x) != source (0x%x)", - i, dest->tk_keys[i], source->tk_keys[i]); -#endif return (TESLA_ERROR_EINVAL); } else { dest->tk_keys[i] = source->tk_keys[i]; ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_notification.c#10 (text+ko) ==== @@ -236,7 +236,7 @@ next = sprint_transitions(next, end, transp); assert(next > buffer); - DEBUG(libtesla.instance.fail, "%s", buffer); + error("%s", buffer); } static void @@ -262,7 +262,7 @@ next = sprint_transitions(next, end, transp); assert(next > buffer); - DEBUG(libtesla.instance.fail, "%s", buffer); + error("%s", buffer); } static void ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_store.c#4 (text+ko) ==== @@ -96,11 +96,7 @@ } default: -#ifdef _KERNEL - tesla_panic("invliad TESLA_CONTEXT %d", context); -#else return (TESLA_ERROR_EINVAL); -#endif } if (store->length == 0) { @@ -163,11 +159,7 @@ assert(tclassp != NULL); if (id >= store->length) -#ifdef _KERNEL - tesla_panic("requested class id %d > store length (%d)", id, store->length); -#else return (TESLA_ERROR_EINVAL); -#endif tesla_class *tclass = &store->classes[id]; assert(tclass != NULL);