From owner-svn-src-head@FreeBSD.ORG Tue Nov 5 01:06:22 2013 Return-Path: Delivered-To: svn-src-head@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 BD62B143; Tue, 5 Nov 2013 01:06:22 +0000 (UTC) (envelope-from luigi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (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 9A158209B; Tue, 5 Nov 2013 01:06:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA516MvF022504; Tue, 5 Nov 2013 01:06:22 GMT (envelope-from luigi@svn.freebsd.org) Received: (from luigi@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA516M9W022503; Tue, 5 Nov 2013 01:06:22 GMT (envelope-from luigi@svn.freebsd.org) Message-Id: <201311050106.rA516M9W022503@svn.freebsd.org> From: Luigi Rizzo Date: Tue, 5 Nov 2013 01:06:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r257666 - head/sys/dev/netmap X-SVN-Group: head 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.14 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: Tue, 05 Nov 2013 01:06:22 -0000 Author: luigi Date: Tue Nov 5 01:06:22 2013 New Revision: 257666 URL: http://svnweb.freebsd.org/changeset/base/257666 Log: remove some test code. Modified: head/sys/dev/netmap/netmap.c Modified: head/sys/dev/netmap/netmap.c ============================================================================== --- head/sys/dev/netmap/netmap.c Tue Nov 5 00:56:07 2013 (r257665) +++ head/sys/dev/netmap/netmap.c Tue Nov 5 01:06:22 2013 (r257666) @@ -24,10 +24,6 @@ */ -#ifdef __FreeBSD__ -#define TEST_STUFF // test code, does not compile yet on linux -#endif /* __FreeBSD__ */ - /* * This module supports memory mapped access to network devices, * see netmap(4). @@ -700,112 +696,6 @@ pkt_copy(void *_src, void *_dst, int l) } -#ifdef TEST_STUFF -struct xxx { - char *name; - void (*fn)(uint32_t); -}; - - -static void -nm_test_defmtx(uint32_t n) -{ - uint32_t i; - struct mtx m; - mtx_init(&m, "test", NULL, MTX_DEF); - for (i = 0; i < n; i++) { mtx_lock(&m); mtx_unlock(&m); } - mtx_destroy(&m); - return; -} - -static void -nm_test_spinmtx(uint32_t n) -{ - uint32_t i; - struct mtx m; - mtx_init(&m, "test", NULL, MTX_SPIN); - for (i = 0; i < n; i++) { mtx_lock(&m); mtx_unlock(&m); } - mtx_destroy(&m); - return; -} - -static void -nm_test_rlock(uint32_t n) -{ - uint32_t i; - struct rwlock m; - rw_init(&m, "test"); - for (i = 0; i < n; i++) { rw_rlock(&m); rw_runlock(&m); } - rw_destroy(&m); - return; -} - -static void -nm_test_wlock(uint32_t n) -{ - uint32_t i; - struct rwlock m; - rw_init(&m, "test"); - for (i = 0; i < n; i++) { rw_wlock(&m); rw_wunlock(&m); } - rw_destroy(&m); - return; -} - -static void -nm_test_slock(uint32_t n) -{ - uint32_t i; - struct sx m; - sx_init(&m, "test"); - for (i = 0; i < n; i++) { sx_slock(&m); sx_sunlock(&m); } - sx_destroy(&m); - return; -} - -static void -nm_test_xlock(uint32_t n) -{ - uint32_t i; - struct sx m; - sx_init(&m, "test"); - for (i = 0; i < n; i++) { sx_xlock(&m); sx_xunlock(&m); } - sx_destroy(&m); - return; -} - - -struct xxx nm_tests[] = { - { "defmtx", nm_test_defmtx }, - { "spinmtx", nm_test_spinmtx }, - { "rlock", nm_test_rlock }, - { "wlock", nm_test_wlock }, - { "slock", nm_test_slock }, - { "xlock", nm_test_xlock }, -}; - -static int -nm_test(struct nmreq *nmr) -{ - uint32_t scale, n, test; - static int old_test = -1; - - test = nmr->nr_cmd; - scale = nmr->nr_offset; - n = sizeof(nm_tests) / sizeof(struct xxx) - 1; - if (test > n) { - D("test index too high, max %d", n); - return 0; - } - - if (old_test != test) { - D("test %s scale %d", nm_tests[test].name, scale); - old_test = test; - } - nm_tests[test].fn(scale); - return 0; -} -#endif /* TEST_STUFF */ - /* * locate a bridge among the existing ones. * MUST BE CALLED WITH NMG_LOCK() @@ -2444,13 +2334,6 @@ netmap_ioctl(struct cdev *dev, u_long cm switch (cmd) { case NIOCGINFO: /* return capabilities etc */ if (nmr->nr_version != NETMAP_API) { -#ifdef TEST_STUFF - /* some test code for locks etc */ - if (nmr->nr_version == 666) { - error = nm_test(nmr); - break; - } -#endif /* TEST_STUFF */ D("API mismatch got %d have %d", nmr->nr_version, NETMAP_API); nmr->nr_version = NETMAP_API;