From owner-p4-projects@FreeBSD.ORG Tue Apr 25 18:33:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC60916A406; Tue, 25 Apr 2006 18:33:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6E68916A401 for ; Tue, 25 Apr 2006 18:33:03 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA57643D55 for ; Tue, 25 Apr 2006 18:33:02 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3PIX2XU084668 for ; Tue, 25 Apr 2006 18:33:02 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3PIX2fD084660 for perforce@freebsd.org; Tue, 25 Apr 2006 18:33:02 GMT (envelope-from jhb@freebsd.org) Date: Tue, 25 Apr 2006 18:33:02 GMT Message-Id: <200604251833.k3PIX2fD084660@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 96081 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Apr 2006 18:33:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=96081 Change 96081 by jhb@jhb_slimer on 2006/04/25 18:32:24 Bring in up/downgrade tests from jhb_lock. Affected files ... .. //depot/projects/smpng/sys/modules/crash2/crash2.c#9 integrate Differences ... ==== //depot/projects/smpng/sys/modules/crash2/crash2.c#9 (text+ko) ==== @@ -97,6 +97,59 @@ /* Events. */ static void +foo_grades(void) +{ + + switch (arc4random() % 10) { + case 0: + rw_wlock(&foo); + DELAY(30); + rw_wunlock(&foo); + break; + case 1: + case 2: + rw_rlock(&foo); + DELAY(40); + if (!rw_try_upgrade(&foo)) { + rw_runlock(&foo); + rw_wlock(&foo); + DELAY(40); + } + DELAY(10); + rw_wunlock(&foo); + break; + case 3: + case 4: + case 5: + case 6: + rw_wlock(&foo); + DELAY(30); + rw_downgrade(&foo); + DELAY(20); + rw_runlock(&foo); + break; + default: + rw_rlock(&foo); + DELAY(50); + rw_runlock(&foo); + } +} + +static void +foo_grades_lots(void) +{ + int i; + + for (i = 0; i < 50000; i++) + foo_grades(); +} + +CRASH2_EVENT("lots of foo up/downgrades", foo_grades_lots, foo_grades_lots, + foo_grades_lots, foo_grades_lots); +CRASH2_EVENT("foo up/downgrades", foo_grades, foo_grades, foo_grades, + foo_grades); + +static void bar_sleep(void) {