From owner-svn-src-user@FreeBSD.ORG Mon Jan 18 14:31:10 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id BEA37106566B;
Mon, 18 Jan 2010 14:31:10 +0000 (UTC)
(envelope-from luigi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id ADCAA8FC19;
Mon, 18 Jan 2010 14:31:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0IEVADs089627;
Mon, 18 Jan 2010 14:31:10 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0IEVAes089625;
Mon, 18 Jan 2010 14:31:10 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <201001181431.o0IEVAes089625@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Mon, 18 Jan 2010 14:31:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r202574 - user/luigi/ipfw3-head/sys/netinet/ipfw
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Jan 2010 14:31:10 -0000
Author: luigi
Date: Mon Jan 18 14:31:10 2010
New Revision: 202574
URL: http://svn.freebsd.org/changeset/base/202574
Log:
remove testing code
Modified:
user/luigi/ipfw3-head/sys/netinet/ipfw/dn_heap.c
Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/dn_heap.c
==============================================================================
--- user/luigi/ipfw3-head/sys/netinet/ipfw/dn_heap.c Mon Jan 18 14:07:41 2010 (r202573)
+++ user/luigi/ipfw3-head/sys/netinet/ipfw/dn_heap.c Mon Jan 18 14:31:10 2010 (r202574)
@@ -449,128 +449,3 @@ dn_ht_scan(struct dn_ht *ht, int (*fn)(v
}
return found;
}
-
-#ifndef _KERNEL
-/*
- * testing code for the heap and hash table
- */
-#include <string.h>
-
-struct x {
- struct x *ht_link;
- char buf[0];
-};
-
-int hf(uintptr_t key, int flags, void *arg)
-{
- return (flags & DNHT_KEY_IS_OBJ) ?
- ((struct x *)key)->buf[0] : *(char *)key;
-}
-
-int matchf(void *obj, uintptr_t key, int flags, void *arg)
-{
- char *s = (flags & DNHT_KEY_IS_OBJ) ?
- ((struct x *)key)->buf : (char *)key;
- return (strcmp(((struct x *)obj)->buf, s) == 0);
-}
-
-void *newfn(uintptr_t key, int flags, void *arg)
-{
- char *s = (char *)key;
- struct x *p = malloc(sizeof(*p) + 1 + strlen(s), M_DN_HEAP, 0);
- if (p)
- strcpy(p->buf, s);
- return p;
-}
-
-char *strings[] = {
- "undici", "unico", "doppio", "devoto",
- "uno", "due", "tre", "quattro", "cinque", "sei",
- "uno", "due", "tre", "quattro", "cinque", "sei",
- NULL,
-};
-
-int doprint(void *_x, void *arg)
-{
- struct x *x = _x;
- printf("found element <%s>\n", x->buf);
- return (int)arg;
-}
-
-static void
-test_hash()
-{
- char **p;
- struct dn_ht *h;
- uintptr_t x = 0;
- uintptr_t x1 = 0;
-
- /* first, find and allocate */
- h = dn_ht_init(NULL, 10, 0, hf, matchf, newfn, 0);
-
- for (p = strings; *p; p++) {
- dn_ht_find(h, (uintptr_t)*p, DNHT_INSERT);
- }
- dn_ht_scan(h, doprint, 0);
- printf("/* second -- find without allocate */\n");
- h = dn_ht_init(NULL, 10, 0, hf, matchf, NULL, 0);
- for (p = strings; *p; p++) {
- void **y = newfn((uintptr_t)*p, 0, NULL);
- if (x == 0)
- x = (uintptr_t)y;
- else {
- if (x1 == 0)
- x1 = (uintptr_t)*p;
- }
- dn_ht_find(h, (uintptr_t)y, DNHT_INSERT | DNHT_KEY_IS_OBJ);
- }
- dn_ht_scan(h, doprint, 0);
- printf("remove %p gives %p\n", (void *)x,
- dn_ht_find(h, x, DNHT_KEY_IS_OBJ | DNHT_REMOVE));
- printf("remove %p gives %p\n", (void *)x,
- dn_ht_find(h, x, DNHT_KEY_IS_OBJ | DNHT_REMOVE));
- printf("remove %p gives %p\n", (void *)x,
- dn_ht_find(h, x1, DNHT_REMOVE));
- printf("remove %p gives %p\n", (void *)x,
- dn_ht_find(h, x1, DNHT_REMOVE));
- dn_ht_scan(h, doprint, 0);
-}
-
-int
-main(int argc, char *argv[])
-{
- struct dn_heap h;
- int i, n, n2, n3;
-
- test_hash();
- return 0;
-
- /* n = elements, n2 = cycles */
- n = (argc > 1) ? atoi(argv[1]) : 0;
- if (n <= 0 || n > 1000000)
- n = 100;
- n2 = (argc > 2) ? atoi(argv[2]) : 0;
- if (n2 <= 0)
- n = 1000000;
- n3 = (argc > 3) ? atoi(argv[3]) : 0;
- bzero(&h, sizeof(h));
- heap_init(&h, n, -1);
- while (n2-- > 0) {
- uint64_t prevk = 0;
- for (i=0; i < n; i++)
- heap_insert(&h, n3 ? n-i: random(), (void *)(100+i));
-
- for (i=0; h.elements > 0; i++) {
- uint64_t k = h.p[0].key;
- if (k < prevk)
- panic("wrong sequence\n");
- prevk = k;
- if (0)
- printf("%d key %llu, val %p\n",
- i, h.p[0].key, h.p[0].object);
- heap_extract(&h, NULL);
- }
- }
- return 0;
-}
-#endif