From owner-svn-soc-all@FreeBSD.ORG Sat Aug 11 05:18:35 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id C5E54106566C for ; Sat, 11 Aug 2012 05:18:34 +0000 (UTC) (envelope-from gmiller@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Sat, 11 Aug 2012 05:18:34 +0000 Date: Sat, 11 Aug 2012 05:18:34 +0000 From: gmiller@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120811051834.C5E54106566C@hub.freebsd.org> Cc: Subject: socsvn commit: r240264 - in soc2012/gmiller/locking-head: . tools/regression/lib/libwitness X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Aug 2012 05:18:35 -0000 Author: gmiller Date: Sat Aug 11 05:18:33 2012 New Revision: 240264 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240264 Log: r240281@FreeBSD-dev: root | 2012-07-25 14:13:25 -0500 Add a test to verify that locks with the same name share data in libwitness. Added: soc2012/gmiller/locking-head/tools/regression/lib/libwitness/shared.c soc2012/gmiller/locking-head/tools/regression/lib/libwitness/shared.t - copied unchanged from r239709, soc2012/gmiller/locking-head/tools/regression/lib/libwitness/setorder.t Modified: soc2012/gmiller/locking-head/ (props changed) soc2012/gmiller/locking-head/tools/regression/lib/libwitness/Makefile Modified: soc2012/gmiller/locking-head/tools/regression/lib/libwitness/Makefile ============================================================================== --- soc2012/gmiller/locking-head/tools/regression/lib/libwitness/Makefile Sat Aug 11 00:06:56 2012 (r240263) +++ soc2012/gmiller/locking-head/tools/regression/lib/libwitness/Makefile Sat Aug 11 05:18:33 2012 (r240264) @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTS= lor-basic setorder bless setname graph +TESTS= lor-basic setorder bless setname graph shared CFLAGS+= -g -Wall -Wextra -Werror -lwitness -lpthread -static .PHONY: tests @@ -25,3 +25,6 @@ graph: graph.c check.c ${CC} -o graph graph.c check.c ${CFLAGS} + +shared: shared.c check.c + ${CC} -o shared shared.c check.c ${CFLAGS} Added: soc2012/gmiller/locking-head/tools/regression/lib/libwitness/shared.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/gmiller/locking-head/tools/regression/lib/libwitness/shared.c Sat Aug 11 05:18:33 2012 (r240264) @@ -0,0 +1,73 @@ +/*- + * Copyright (c) 2012 Greg Miller .. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ + +#include +#include + +#include "check.h" + +void +share_test(void) +{ + pthread_mutex_t mutex1 = PTHREAD_MUTEX_INITIALIZER; + pthread_mutex_t mutex2 = PTHREAD_MUTEX_INITIALIZER; + + pthread_setname_np(mutex1, "shared_mutex"); + pthread_setname_np(mutex2, "shared_mutex"); + + pthread_mutex_lock(&mutex1); + pthread_mutex_lock(&mutex2); + + pthread_mutex_unlock(&mutex2); + pthread_mutex_unlock(&mutex1); +} + +void +check_share(void) +{ + struct pthread_lockorder_np order; + int node_count = 0; + + pthread_lockorder_begin_np(&order); + while (pthread_lockorder_next_np(&order)) { + node_count++; + } + pthread_lockorder_end_np(&order); + + check(node_count == 0); +} + +int +main(void) +{ + share_test(); + check_share(); + + show_test_results(); + + return (0); +} Copied: soc2012/gmiller/locking-head/tools/regression/lib/libwitness/shared.t (from r239709, soc2012/gmiller/locking-head/tools/regression/lib/libwitness/setorder.t) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/gmiller/locking-head/tools/regression/lib/libwitness/shared.t Sat Aug 11 05:18:33 2012 (r240264, copy of r239709, soc2012/gmiller/locking-head/tools/regression/lib/libwitness/setorder.t) @@ -0,0 +1,10 @@ +#!/bin/sh +# $FreeBSD$ + +cd `dirname $0` + +executable=`basename $0 .t` + +make $executable 2>&1 > /dev/null + +exec ./$executable