View | Details | Raw Unified | Return to bug 235237 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-16 / +8 lines)
Lines 2-12 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	dnsperf
4
PORTNAME=	dnsperf
5
PORTVERSION=	2.1.0.0
5
PORTVERSION=	2.2.0
6
PORTREVISION=	2
6
DISTVERSIONPREFIX=v
7
CATEGORIES=	dns benchmarks net
7
CATEGORIES=	dns benchmarks net
8
MASTER_SITES=	ftp://ftp.nominum.com/pub/nominum/${PORTNAME}/${PORTVERSION}/
9
DISTNAME=	${PORTNAME}-src-${PORTVERSION}-1
10
8
11
MAINTAINER=	hrs@FreeBSD.org
9
MAINTAINER=	hrs@FreeBSD.org
12
COMMENT=	Performance measurement of Domain Name System (DNS) servers
10
COMMENT=	Performance measurement of Domain Name System (DNS) servers
Lines 15-24 Link Here
15
13
16
BUILD_DEPENDS=	isc-config.sh:dns/bind912
14
BUILD_DEPENDS=	isc-config.sh:dns/bind912
17
LIB_DEPENDS=	liblmdb.so:databases/lmdb \
15
LIB_DEPENDS=	liblmdb.so:databases/lmdb \
18
		libjson-c.so:devel/json-c
16
		libjson-c.so:devel/json-c \
17
		libxml2.so:textproc/libxml2
19
18
20
USES=		iconv ssl
19
USES=		autoreconf gnome iconv libtool ssl
21
USE_GNOME=	libxml2
20
USE_GITHUB=	yes
21
22
GH_ACCOUNT=	DNS-OARC
22
GNU_CONFIGURE=	yes
23
GNU_CONFIGURE=	yes
23
MAKE_ENV=	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
24
MAKE_ENV=	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
24
		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
25
		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
Lines 29-42 Link Here
29
		bin/resperf-report \
30
		bin/resperf-report \
30
		man/man1/dnsperf.1.gz \
31
		man/man1/dnsperf.1.gz \
31
		man/man1/resperf.1.gz
32
		man/man1/resperf.1.gz
32
PORTDOCS=	caching-dns-performance.pdf \
33
		dnsperf.pdf \
34
		resperf.pdf
35
33
36
OPTIONS_DEFINE=	DOCS
37
38
post-install-DOCS-on:
39
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
40
	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
41
42
.include <bsd.port.mk>
34
.include <bsd.port.mk>
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1524326968
1
TIMESTAMP = 1548578598
2
SHA256 (dnsperf-src-2.1.0.0-1.tar.gz) = 64b5f0a680e1ad60bca5fd709f1a9a8404ac2fd85af6138bd22ca9a28b616e0e
2
SHA256 (DNS-OARC-dnsperf-v2.2.0_GH0.tar.gz) = 5de04bc7b9c838746a4d8c3128eb96888d0fa890e391a1a8fe867e3e99350514
3
SIZE (dnsperf-src-2.1.0.0-1.tar.gz) = 561502
3
SIZE (DNS-OARC-dnsperf-v2.2.0_GH0.tar.gz) = 66535
(-)files/patch-Makefile.in (-24 lines)
Lines 1-24 Link Here
1
--- Makefile.in.orig	2015-12-16 00:46:49 UTC
2
+++ Makefile.in
3
@@ -7,8 +7,6 @@ mandir = @mandir@
4
 datarootdir = @datarootdir@
5
 
6
 INSTALL = @INSTALL@
7
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
8
-INSTALL_DATA = @INSTALL_DATA@ 
9
 RANLIB = @RANLIB@
10
 
11
 CC = @PTHREAD_CC@
12
@@ -41,9 +39,9 @@ installdirs:
13
 install: all installdirs
14
 	${INSTALL_PROGRAM} dnsperf ${DESTDIR}${bindir}
15
 	${INSTALL_PROGRAM} resperf ${DESTDIR}${bindir}
16
-	${INSTALL_PROGRAM} resperf-report ${DESTDIR}${bindir}
17
-	${INSTALL_DATA} dnsperf.1 ${DESTDIR}${mandir}/man1
18
-	${INSTALL_DATA} resperf.1 ${DESTDIR}${mandir}/man1
19
+	${INSTALL_SCRIPT} resperf-report ${DESTDIR}${bindir}
20
+	${INSTALL_MAN} dnsperf.1 ${DESTDIR}${mandir}/man1
21
+	${INSTALL_MAN} resperf.1 ${DESTDIR}${mandir}/man1
22
 
23
 clean:
24
 	rm -f *.o dnsperf resperf libperf.a
(-)files/patch-datafile.c (-12 lines)
Lines 1-12 Link Here
1
--- datafile.c.orig	2015-12-16 00:46:49 UTC
2
+++ datafile.c
3
@@ -23,7 +23,9 @@
4
 
5
 #define ISC_BUFFER_USEINLINE
6
 
7
+#include <isc/boolean.h>
8
 #include <isc/buffer.h>
9
+#include <isc/int.h>
10
 #include <isc/mem.h>
11
 
12
 #include "datafile.h"
(-)files/patch-dns.c (-14 lines)
Lines 1-14 Link Here
1
--- dns.c.orig	2015-12-16 00:46:50 UTC
2
+++ dns.c
3
@@ -41,9 +41,11 @@
4
 #define ISC_BUFFER_USEINLINE
5
 
6
 #include <isc/base64.h>
7
+#include <isc/boolean.h>
8
 #include <isc/buffer.h>
9
 #include <isc/hmacmd5.h>
10
 #include <isc/hmacsha.h>
11
+#include <isc/int.h>
12
 #include <isc/lex.h>
13
 #include <isc/mem.h>
14
 #include <isc/region.h>
(-)files/patch-dnsperf.c (-43 lines)
Lines 1-43 Link Here
1
--- dnsperf.c.orig	2015-12-16 00:46:49 UTC
2
+++ dnsperf.c
3
@@ -52,8 +52,10 @@
4
 
5
 #define ISC_BUFFER_USEINLINE
6
 
7
+#include <isc/boolean.h>
8
 #include <isc/buffer.h>
9
 #include <isc/file.h>
10
+#include <isc/int.h>
11
 #include <isc/list.h>
12
 #include <isc/mem.h>
13
 #include <isc/netaddr.h>
14
@@ -280,16 +282,16 @@ print_statistics(const config_t *config, const times_t
15
 
16
 	printf("Statistics:\n\n");
17
 
18
-	printf("  %s sent:         %" ISC_PRINT_QUADFORMAT "u\n",
19
+	printf("  %s sent:         %" PRIu64 "\n",
20
                units, stats->num_sent);
21
-	printf("  %s completed:    %" ISC_PRINT_QUADFORMAT "u (%.2lf%%)\n",
22
+	printf("  %s completed:    %" PRIu64 " (%.2lf%%)\n",
23
 	       units, stats->num_completed,
24
 	       SAFE_DIV(100.0 * stats->num_completed, stats->num_sent));
25
-	printf("  %s lost:         %" ISC_PRINT_QUADFORMAT "u (%.2lf%%)\n",
26
+	printf("  %s lost:         %" PRIu64 " (%.2lf%%)\n",
27
 	       units, stats->num_timedout,
28
 	       SAFE_DIV(100.0 * stats->num_timedout, stats->num_sent));
29
 	if (stats->num_interrupted > 0)
30
-		printf("  %s interrupted:  %" ISC_PRINT_QUADFORMAT "u "
31
+		printf("  %s interrupted:  %" PRIu64 " "
32
                        "(%.2lf%%)\n",
33
 		       units, stats->num_interrupted,
34
 		       SAFE_DIV(100.0 * stats->num_interrupted,
35
@@ -305,7 +307,7 @@ print_statistics(const config_t *config, const times_t
36
 			first_rcode = ISC_FALSE;
37
 		else
38
 			printf(", ");
39
-		printf("%s %" ISC_PRINT_QUADFORMAT "u (%.2lf%%)",
40
+		printf("%s %" PRIu64 " (%.2lf%%)",
41
 		       perf_dns_rcode_strings[i], stats->rcodecounts[i],
42
 		       (stats->rcodecounts[i] * 100.0) / stats->num_completed);
43
 	}
(-)files/patch-log.c (-11 lines)
Lines 1-11 Link Here
1
--- log.c.orig	2015-12-16 00:46:50 UTC
2
+++ log.c
3
@@ -20,6 +20,8 @@
4
 #include <stdio.h>
5
 #include <stdlib.h>
6
 
7
+#include <isc/int.h>
8
+
9
 #include "log.h"
10
 #include "util.h"
11
 
(-)files/patch-opt.c (-12 lines)
Lines 1-12 Link Here
1
--- opt.c.orig	2015-12-16 00:46:50 UTC
2
+++ opt.c
3
@@ -22,7 +22,9 @@
4
 
5
 #include <netinet/in.h>
6
 
7
+#include <isc/boolean.h>
8
 #include <isc/file.h>
9
+#include <isc/int.h>
10
 #include <isc/parseint.h>
11
 #include <isc/result.h>
12
 
(-)files/patch-os.c (-11 lines)
Lines 1-11 Link Here
1
--- os.c.orig	2015-12-16 00:46:49 UTC
2
+++ os.c
3
@@ -22,6 +22,8 @@
4
 
5
 #include <sys/select.h>
6
 
7
+#include <isc/boolean.h>
8
+#include <isc/int.h>
9
 #include <isc/result.h>
10
 #include <isc/types.h>
11
 
(-)files/patch-resperf.c (-37 lines)
Lines 1-37 Link Here
1
--- resperf.c.orig	2015-12-16 00:46:50 UTC
2
+++ resperf.c
3
@@ -46,8 +46,10 @@
4
 
5
 #include <sys/time.h>
6
 
7
+#include <isc/boolean.h>
8
 #include <isc/buffer.h>
9
 #include <isc/file.h>
10
+#include <isc/int.h>
11
 #include <isc/list.h>
12
 #include <isc/mem.h>
13
 #include <isc/print.h>
14
@@ -389,11 +391,11 @@ print_statistics(void) {
15
 
16
 	printf("\nStatistics:\n\n");
17
 
18
-	printf("  Queries sent:         %" ISC_PRINT_QUADFORMAT "u\n",
19
+	printf("  Queries sent:         %" PRIu64 "\n",
20
                num_queries_sent);
21
-	printf("  Queries completed:    %" ISC_PRINT_QUADFORMAT "u\n",
22
+	printf("  Queries completed:    %" PRIu64 "\n",
23
                num_responses_received);
24
-	printf("  Queries lost:         %" ISC_PRINT_QUADFORMAT "u\n",
25
+	printf("  Queries lost:         %" PRIu64 "\n",
26
 	       num_queries_sent - num_responses_received);
27
 	printf("  Response codes:       ");
28
 	first_rcode = ISC_TRUE;
29
@@ -404,7 +406,7 @@ print_statistics(void) {
30
 			first_rcode = ISC_FALSE;
31
 		else
32
 			printf(", ");
33
-		printf("%s %" ISC_PRINT_QUADFORMAT "u (%.2lf%%)",
34
+		printf("%s %" PRIu64 " (%.2lf%%)",
35
 		       perf_dns_rcode_strings[i], rcodecounts[i],
36
 		       (rcodecounts[i] * 100.0) / num_responses_received);
37
 	}
(-)pkg-descr (-1 / +1 lines)
Lines 15-18 Link Here
15
ResPerf systematically increases the query rate and monitors the
15
ResPerf systematically increases the query rate and monitors the
16
response rate to simulate caching DNS services.
16
response rate to simulate caching DNS services.
17
17
18
WWW: https://www.akamai.com/us/en/products/network-operator/measurement-tools.jsp
18
WWW: https://www.dns-oarc.net/tools/dnsperf

Return to bug 235237