From owner-svn-src-head@freebsd.org Sun Jul 15 00:31:18 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E50BD1044C01; Sun, 15 Jul 2018 00:31:17 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8FB728F521; Sun, 15 Jul 2018 00:31:17 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 70F7126436; Sun, 15 Jul 2018 00:31:17 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6F0VHsV068018; Sun, 15 Jul 2018 00:31:17 GMT (envelope-from mmacy@FreeBSD.org) Received: (from mmacy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6F0VHUT068017; Sun, 15 Jul 2018 00:31:17 GMT (envelope-from mmacy@FreeBSD.org) Message-Id: <201807150031.w6F0VHUT068017@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmacy set sender to mmacy@FreeBSD.org using -f From: Matt Macy Date: Sun, 15 Jul 2018 00:31:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336300 - head/sys/tests/epoch X-SVN-Group: head X-SVN-Commit-Author: mmacy X-SVN-Commit-Paths: head/sys/tests/epoch X-SVN-Commit-Revision: 336300 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Jul 2018 00:31:18 -0000 Author: mmacy Date: Sun Jul 15 00:31:17 2018 New Revision: 336300 URL: https://svnweb.freebsd.org/changeset/base/336300 Log: epoch_test: fix compile - update to new interface Reported by: manu Modified: head/sys/tests/epoch/epoch_test.c Modified: head/sys/tests/epoch/epoch_test.c ============================================================================== --- head/sys/tests/epoch/epoch_test.c Sun Jul 15 00:23:10 2018 (r336299) +++ head/sys/tests/epoch/epoch_test.c Sun Jul 15 00:31:17 2018 (r336300) @@ -67,6 +67,7 @@ epoch_testcase1(struct epoch_test_instance *eti) { int i, startticks; struct mtx *mtxp; + struct epoch_tracker et; startticks = ticks; i = 0; @@ -76,11 +77,11 @@ epoch_testcase1(struct epoch_test_instance *eti) mtxp = &mutexB; while (i < iterations) { - epoch_enter_preempt(test_epoch); + epoch_enter_preempt(test_epoch, &et); mtx_lock(mtxp); i++; mtx_unlock(mtxp); - epoch_exit_preempt(test_epoch); + epoch_exit_preempt(test_epoch, &et); epoch_wait_preempt(test_epoch); } printf("test1: thread: %d took %d ticks to complete %d iterations\n", @@ -92,18 +93,19 @@ epoch_testcase2(struct epoch_test_instance *eti) { int i, startticks; struct mtx *mtxp; + struct epoch_tracker et; startticks = ticks; i = 0; mtxp = &mutexA; while (i < iterations) { - epoch_enter_preempt(test_epoch); + epoch_enter_preempt(test_epoch, &et); mtx_lock(mtxp); DELAY(1); i++; mtx_unlock(mtxp); - epoch_exit_preempt(test_epoch); + epoch_exit_preempt(test_epoch, &et); epoch_wait_preempt(test_epoch); } printf("test2: thread: %d took %d ticks to complete %d iterations\n",