Module Name: src
Committed By: joerg
Date: Thu Jan 31 16:32:02 UTC 2013
Modified Files:
src/usr.bin/nbperf: nbperf-bdz.c nbperf.1 nbperf.c nbperf.h
Log Message:
bdz -> bpz to match the initials of the authors.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/nbperf/nbperf-bdz.c
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/nbperf/nbperf.1
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/nbperf/nbperf.c
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/nbperf/nbperf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/nbperf/nbperf-bdz.c
diff -u src/usr.bin/nbperf/nbperf-bdz.c:1.6 src/usr.bin/nbperf/nbperf-bdz.c:1.7
--- src/usr.bin/nbperf/nbperf-bdz.c:1.6 Fri Nov 23 02:57:57 2012
+++ src/usr.bin/nbperf/nbperf-bdz.c Thu Jan 31 16:32:02 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nbperf-bdz.c,v 1.6 2012/11/23 02:57:57 joerg Exp $ */
+/* $NetBSD: nbperf-bdz.c,v 1.7 2013/01/31 16:32:02 joerg Exp $ */
/*-
* Copyright (c) 2009, 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -36,7 +36,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: nbperf-bdz.c,v 1.6 2012/11/23 02:57:57 joerg Exp $");
+__RCSID("$NetBSD: nbperf-bdz.c,v 1.7 2013/01/31 16:32:02 joerg Exp $");
#include <err.h>
#include <inttypes.h>
@@ -253,7 +253,7 @@ print_hash(struct nbperf *nbperf, struct
}
int
-bdz_compute(struct nbperf *nbperf)
+bpz_compute(struct nbperf *nbperf)
{
struct state state;
int retval = -1;
Index: src/usr.bin/nbperf/nbperf.1
diff -u src/usr.bin/nbperf/nbperf.1:1.5 src/usr.bin/nbperf/nbperf.1:1.6
--- src/usr.bin/nbperf/nbperf.1:1.5 Tue Sep 25 20:53:46 2012
+++ src/usr.bin/nbperf/nbperf.1 Thu Jan 31 16:32:02 2013
@@ -1,4 +1,4 @@
-.\" $NetBSD: nbperf.1,v 1.5 2012/09/25 20:53:46 joerg Exp $
+.\" $NetBSD: nbperf.1,v 1.6 2013/01/31 16:32:02 joerg Exp $
.\"
.\" Copyright (c) 2009 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -88,7 +88,7 @@ This makes the output for
.Ar chm3
noticable smaller than the output for
.Ar chm .
-.It Sy bdz
+.It Sy bpz
This results in a non-order preserving minimal perfect hash function.
Output size is approximately 2.79 bit per key for the default value of
.Ar utilisation ,
Index: src/usr.bin/nbperf/nbperf.c
diff -u src/usr.bin/nbperf/nbperf.c:1.4 src/usr.bin/nbperf/nbperf.c:1.5
--- src/usr.bin/nbperf/nbperf.c:1.4 Fri Oct 21 23:47:11 2011
+++ src/usr.bin/nbperf/nbperf.c Thu Jan 31 16:32:02 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nbperf.c,v 1.4 2011/10/21 23:47:11 joerg Exp $ */
+/* $NetBSD: nbperf.c,v 1.5 2013/01/31 16:32:02 joerg Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -36,7 +36,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: nbperf.c,v 1.4 2011/10/21 23:47:11 joerg Exp $");
+__RCSID("$NetBSD: nbperf.c,v 1.5 2013/01/31 16:32:02 joerg Exp $");
#include <sys/endian.h>
#include <err.h>
@@ -135,12 +135,14 @@ main(int argc, char **argv)
while ((ch = getopt(argc, argv, "a:c:h:i:m:n:o:ps")) != -1) {
switch (ch) {
case 'a':
+ /* Accept bdz as alias for netbsd-6 compat. */
if (strcmp(optarg, "chm") == 0)
build_hash = chm_compute;
else if (strcmp(optarg, "chm3") == 0)
build_hash = chm3_compute;
- else if (strcmp(optarg, "bdz") == 0)
- build_hash = bdz_compute;
+ else if (strcmp(optarg, "bpz") == 0 ||
+ strcmp(optarg, "bdz") == 0)
+ build_hash = bpz_compute;
else
errx(1, "Unsupport algorithm: %s", optarg);
break;
Index: src/usr.bin/nbperf/nbperf.h
diff -u src/usr.bin/nbperf/nbperf.h:1.3 src/usr.bin/nbperf/nbperf.h:1.4
--- src/usr.bin/nbperf/nbperf.h:1.3 Wed Mar 3 01:55:04 2010
+++ src/usr.bin/nbperf/nbperf.h Thu Jan 31 16:32:02 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nbperf.h,v 1.3 2010/03/03 01:55:04 joerg Exp $ */
+/* $NetBSD: nbperf.h,v 1.4 2013/01/31 16:32:02 joerg Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -56,4 +56,4 @@ struct nbperf {
int chm_compute(struct nbperf *);
int chm3_compute(struct nbperf *);
-int bdz_compute(struct nbperf *);
+int bpz_compute(struct nbperf *);
