Attachment 165573 Details for Bug 206242 – benchmarks_polygraph.diff

[patch] benchmarks_polygraph.diff

benchmarks_polygraph.diff (text/plain), 11.46 KB, created by tkato432 on 2016-01-14 18:30:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2016-01-14 18:30:15 UTC

Size: 11.46 KB

patch

obsolete

>diff -urN /usr/ports/benchmarks/polygraph/Makefile benchmarks/polygraph/Makefile
>--- /usr/ports/benchmarks/polygraph/Makefile	2015-10-01 18:57:09.399647000 +0900
>+++ benchmarks/polygraph/Makefile	2016-01-15 00:00:00.000000000 +0900
>@@ -2,12 +2,10 @@
> # $FreeBSD: head/benchmarks/polygraph/Makefile 398241 2015-09-30 23:09:05Z amdmi3 $
> 
> PORTNAME=	polygraph
>-PORTVERSION=	4.3.2
>-PORTREVISION=	1
>+PORTVERSION=	4.9.0
>+DISTVERSIONSUFFIX=	-src
> CATEGORIES=	benchmarks www
>-MASTER_SITES=	http://www.web-polygraph.org/downloads/srcs/ \
>-		http://people.bsdgroup.de/~as/freebsd/distfiles/
>-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
>+MASTER_SITES=	http://www.web-polygraph.org/downloads/srcs/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Benchmarking tool for Web proxies
>@@ -15,27 +13,40 @@
> LICENSE=	APACHE20
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-USES=		shebangfix tar:tgz
>+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>+
>+USES=		gmake ncurses shebangfix tar:tgz
> SHEBANG_FILES=	tools/*.pl
> USE_GCC=	any
> GNU_CONFIGURE=	yes
>-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
> 
> CONFLICTS=	ltrace-0*
> 
>-OPTIONS_DEFINE=	GNUPLOT OPENSSL PERL ZLIB
>-OPTIONS_DEFAULT=OPENSSL ZLIB
>-
>-GNUPLOT_DESC=	GNUPlot for full reporting functionality
>-OPENSSL_DESC=	Enable SSL/HTTPS support
>-PERL_DESC=	Install Perl for PolyGraph tools
>-ZLIB_DESC=	Enable HTTP compression support
>+OPTIONS_DEFINE=		DOCS GNUPLOT GSSAPI LDNS PERL SSL ZLIB
>+OPTIONS_DEFAULT=	SSL ZLIB
> 
>+GNUPLOT_DESC=		GNUPlot for full reporting functionality
> GNUPLOT_RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
>-OPENSSL_USE=		OPENSSL=yes
>-OPENSSL_CONFIGURE_ON=	--with-ssl=${OPENSSLBASE}
>+GSSAPI_USES=		gssapi:mit
>+GSSAPI_CONFIGURE_ON=	--with-kerberos=${KRB5CONFIG} ${GSSAPI_CONFIGURE_ARGS}
>+GSSAPI_CONFIGURE_OFF=	--without-kerberos
>+LDNS_DESC=		DNS zone file support via libldns
>+LDNS_LIB_DEPENDS=	libldns.so:${PORTSDIR}/dns/ldns
>+LDNS_CONFIGURE_ON=	--with-ldns=${LOCALBASE}/bin/ldns-config
>+LDNS_CONFIGURE_OFF=	--without-ldns
>+SSL_DESC=		SSL/HTTPS support
>+SSL_USE=		openssl=yes
>+SSL_CONFIGURE_ON=	--with-ssl=${OPENSSLBASE}
>+SSL_CONFIGURE_OFF=	--without-ssl
>+PERL_DESC=		Install Perl for PolyGraph tools
> PERL_USES=		perl5
>-PERL_USE=		PERL5=run
>-ZLIB_CONFIGURE_WITH=	zlib=/usr
>+PERL_USE=		perl5=run
>+ZLIB_DESC=		HTTP compression support
>+ZLIB_CONFIGURE_ON=	--with-zlib=/usr
>+ZLIB_CONFIGURE_OFF=	--without-zlib
>+
>+post-patch:
>+	@${REINPLACE_CMD} -e \
>+		'/LICENSE /d' ${WRKSRC}/Makefile.in
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/benchmarks/polygraph/distinfo benchmarks/polygraph/distinfo
>--- /usr/ports/benchmarks/polygraph/distinfo	2015-08-24 03:58:53.974440000 +0900
>+++ benchmarks/polygraph/distinfo	2016-01-15 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (polygraph-4.3.2-src.tgz) = b0104448ff3c2f29cebeb5ad5ee6e6f670438d8b78fa095fd54f3b16d99569bb
>-SIZE (polygraph-4.3.2-src.tgz) = 1497797
>+SHA256 (polygraph-4.9.0-src.tgz) = 36af0031e15b0a123fecda2d74c36cbe632cd479bdb2c85c1b020d4e57ff6bf4
>+SIZE (polygraph-4.9.0-src.tgz) = 3371570
>diff -urN /usr/ports/benchmarks/polygraph/files/patch-src_runtime_StatPhase.cc benchmarks/polygraph/files/patch-src_runtime_StatPhase.cc
>--- /usr/ports/benchmarks/polygraph/files/patch-src_runtime_StatPhase.cc	2015-08-24 03:58:53.988969000 +0900
>+++ benchmarks/polygraph/files/patch-src_runtime_StatPhase.cc	1970-01-01 09:00:00.000000000 +0900
>@@ -1,21 +0,0 @@
>---- src/runtime/StatPhase.cc.orig	2011-04-04 22:07:36.000000000 +0000
>-+++ src/runtime/StatPhase.cc
>-@@ -413,12 +413,12 @@ void StatPhase::noteXactEvent(BcastChann
>- 						break;
>- 				}
>- 		} else {
>--			static CompoundXactInfo &compound = *CompoundXactInfo::Create();
>--			compound.exchanges = 1;
>--			compound.reqSize = reqSize;
>--			compound.repSize = repSize;
>--			compound.lifeTime = repTime;
>--			compound.record(rec.theIsolated);
>-+			static CompoundXactInfo &compound2 = *CompoundXactInfo::Create();
>-+			compound2.exchanges = 1;
>-+			compound2.reqSize = reqSize;
>-+			compound2.repSize = repSize;
>-+			compound2.lifeTime = repTime;
>-+			compound2.record(rec.theIsolated);
>- 		}
>- 
>- 		if (x->cookiesSent() > 0)
>diff -urN /usr/ports/benchmarks/polygraph/files/patch-src_xstd_Heap.h benchmarks/polygraph/files/patch-src_xstd_Heap.h
>--- /usr/ports/benchmarks/polygraph/files/patch-src_xstd_Heap.h	2015-08-24 03:58:53.998802000 +0900
>+++ benchmarks/polygraph/files/patch-src_xstd_Heap.h	1970-01-01 09:00:00.000000000 +0900
>@@ -1,11 +0,0 @@
>---- src/xstd/Heap.h.orig	2011-04-04 22:07:36.000000000 +0000
>-+++ src/xstd/Heap.h
>-@@ -23,7 +23,7 @@ class Heap: protected Array<Item> {
>- 		const Item &top() const { return this->theItems[1]; }
>- 		Item &at(int idx) { return this->theItems[idx+1]; }
>- 
>--		void add(Item v) { append(v); floatUp(++theCnt); }
>-+		void add(Item v) { this->append(v); floatUp(++theCnt); }
>- 		void skip() { this->theItems[1] = this->theItems[theCnt--]; this->theCount--; sinkDown(1); }
>- 		Item shift() { const Item v = this->theItems[1]; skip(); return v; }
>- 
>diff -urN /usr/ports/benchmarks/polygraph/files/patch-src_xstd_Ring.h benchmarks/polygraph/files/patch-src_xstd_Ring.h
>--- /usr/ports/benchmarks/polygraph/files/patch-src_xstd_Ring.h	2015-08-24 03:58:54.025558000 +0900
>+++ benchmarks/polygraph/files/patch-src_xstd_Ring.h	1970-01-01 09:00:00.000000000 +0900
>@@ -1,18 +0,0 @@
>---- src/xstd/Ring.h.orig	2011-04-04 22:07:36.000000000 +0000
>-+++ src/xstd/Ring.h
>-@@ -22,11 +22,11 @@ class Ring: protected Array<Item> {
>- 		int size() const { return Array<Item>::size(); }
>- 		bool empty() const { return this->theInOff <= this->theOutOff; }
>- 		bool full() const { return count() >= this->theCapacity; }
>--		const Item &top(int off = 0) const { return item((this->theOutOff+off) % this->theCapacity); }
>-+		const Item &top(int off = 0) const { return this->item((this->theOutOff+off) % this->theCapacity); }
>- 
>--		Item &top(int off = 0) { return item((this->theOutOff+off) % this->theCapacity); }
>--		void enqueue(Item i) { Assert(!full()); item(this->theInOff++ % this->theCapacity) = i; check(); }
>--		Item dequeue() { return item(this->theOutOff++ % this->theCapacity); }
>-+		Item &top(int off = 0) { return this->item((this->theOutOff+off) % this->theCapacity); }
>-+		void enqueue(Item i) { Assert(!full()); this->item(this->theInOff++ % this->theCapacity) = i; check(); }
>-+		Item dequeue() { return this->item(this->theOutOff++ % this->theCapacity); }
>- 
>- 		void reset() { this->theInOff = this->theOutOff = 0; }
>- 		inline void resize(int aCap);
>diff -urN /usr/ports/benchmarks/polygraph/pkg-descr benchmarks/polygraph/pkg-descr
>--- /usr/ports/benchmarks/polygraph/pkg-descr	2015-08-24 03:58:53.974874000 +0900
>+++ benchmarks/polygraph/pkg-descr	2016-01-15 00:00:00.000000000 +0900
>@@ -5,6 +5,4 @@
> essential for performance tuning, evaluation of new algorithms, analysis of
> hardware configurations, and comparing available proxy products.
> 
>-Documentation can be found at http://polygraph.ircache.net/doc/
>-
> WWW: http://www.web-polygraph.org/
>diff -urN /usr/ports/benchmarks/polygraph/pkg-plist benchmarks/polygraph/pkg-plist
>--- /usr/ports/benchmarks/polygraph/pkg-plist	2015-08-24 03:58:54.033682000 +0900
>+++ benchmarks/polygraph/pkg-plist	2016-01-15 00:00:00.000000000 +0900
>@@ -1,53 +1,29 @@
>-bin/polygraph-pgl-test
>-bin/polygraph-pgl2eng
>-bin/polygraph-pgl2acl
>+bin/polygraph-aka
>+bin/polygraph-beepmon
> bin/polygraph-cdb
>-bin/polygraph-server
> bin/polygraph-client
>-bin/polygraph-pgl2ldif
>-bin/polygraph-lx
>-bin/polygraph-lr
>-bin/polygraph-ltrace
>-bin/polygraph-reporter
>-bin/polygraph-aka
>-bin/polygraph-pop-test
>+bin/polygraph-cmp-lx
> bin/polygraph-distr-test
>-bin/polygraph-rng-test
> bin/polygraph-dns-cfg
>+bin/polygraph-lr
>+bin/polygraph-ltrace
>+bin/polygraph-lx
>+bin/polygraph-pgl-test
>+bin/polygraph-pgl2acl
>+bin/polygraph-pgl2eng
> bin/polygraph-pgl2ips
>-bin/polygraph-polyprobe
>+bin/polygraph-pgl2ldif
>+bin/polygraph-pmix2-ips
>+bin/polygraph-pmix3-ips
> bin/polygraph-polymon
>+bin/polygraph-polyprobe
> bin/polygraph-polyrrd
>+bin/polygraph-pop-test
>+bin/polygraph-reporter
>+bin/polygraph-rng-test
>+bin/polygraph-server
> bin/polygraph-udp2tcpd
>-bin/polygraph-beepmon
>-bin/polygraph-pmix2-ips
>-bin/polygraph-pmix3-ips
> bin/polygraph-webaxe4-ips
>-bin/polygraph-cmp-lx
>-%%DATADIR%%/workloads/datacomm-1.pg
>-%%DATADIR%%/workloads/downtime-2.pg
>-%%DATADIR%%/workloads/include/benches.pg
>-%%DATADIR%%/workloads/include/contents.pg
>-%%DATADIR%%/workloads/include/phases.pg
>-%%DATADIR%%/workloads/include/pipes.pg
>-%%DATADIR%%/workloads/include/polymix-3-guts.pg
>-%%DATADIR%%/workloads/include/polymix-4-guts.pg
>-%%DATADIR%%/workloads/include/webaxe-4-guts.pg
>-%%DATADIR%%/workloads/nolb-l4-4.pg
>-%%DATADIR%%/workloads/polyfill-2.pg
>-%%DATADIR%%/workloads/polymix-1.pg
>-%%DATADIR%%/workloads/polymix-2.pg
>-%%DATADIR%%/workloads/polymix-3.pg
>-%%DATADIR%%/workloads/polymix-4.pg
>-%%DATADIR%%/workloads/pxylb-4.pg
>-%%DATADIR%%/workloads/simple.pg
>-%%DATADIR%%/workloads/srvlb-l4-4.pg
>-%%DATADIR%%/workloads/srvlb-l7-4.pg
>-%%DATADIR%%/workloads/test_csm.pg
>-%%DATADIR%%/workloads/test_polypxy.pg
>-%%DATADIR%%/workloads/webaxe-1.pg
>-%%DATADIR%%/workloads/webaxe-3.pg
>-%%DATADIR%%/workloads/webaxe-4.pg
> man/man1/polygraph-aka.1.gz
> man/man1/polygraph-beepmon.1.gz
> man/man1/polygraph-cdb.1.gz
>@@ -75,3 +51,56 @@
> man/man1/polygraph-udp2tcpd.1.gz
> man/man1/polygraph-webaxe4-ips.1.gz
> man/man7/polygraph.7.gz
>+%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS
>+%%PORTDOCS%%%%DOCSDIR%%/NOTICE
>+%%PORTDOCS%%%%DOCSDIR%%/README
>+%%PORTDOCS%%%%DOCSDIR%%/change.log
>+%%DATADIR%%/javascripts/ReportFigures.js
>+%%DATADIR%%/javascripts/jqplot.canvasAxisLabelRenderer.js
>+%%DATADIR%%/javascripts/jqplot.canvasTextRenderer.js
>+%%DATADIR%%/javascripts/jqplot.cursor.js
>+%%DATADIR%%/javascripts/jqplot.enhancedLegendRenderer.js
>+%%DATADIR%%/javascripts/jquery-ui-1.8.18.custom.js
>+%%DATADIR%%/javascripts/jquery.jqplot.js
>+%%DATADIR%%/javascripts/jquery.js
>+%%DATADIR%%/stylesheets/Print.css
>+%%DATADIR%%/stylesheets/ReportFigures.css
>+%%DATADIR%%/stylesheets/images/ui-bg_flat_0_aaaaaa_40x100.png
>+%%DATADIR%%/stylesheets/images/ui-bg_flat_75_ffffff_40x100.png
>+%%DATADIR%%/stylesheets/images/ui-bg_glass_55_fbf9ee_1x400.png
>+%%DATADIR%%/stylesheets/images/ui-bg_glass_65_ffffff_1x400.png
>+%%DATADIR%%/stylesheets/images/ui-bg_glass_75_dadada_1x400.png
>+%%DATADIR%%/stylesheets/images/ui-bg_glass_75_e6e6e6_1x400.png
>+%%DATADIR%%/stylesheets/images/ui-bg_glass_95_fef1ec_1x400.png
>+%%DATADIR%%/stylesheets/images/ui-bg_highlight-soft_75_cccccc_1x100.png
>+%%DATADIR%%/stylesheets/images/ui-icons_222222_256x240.png
>+%%DATADIR%%/stylesheets/images/ui-icons_2e83ff_256x240.png
>+%%DATADIR%%/stylesheets/images/ui-icons_454545_256x240.png
>+%%DATADIR%%/stylesheets/images/ui-icons_888888_256x240.png
>+%%DATADIR%%/stylesheets/images/ui-icons_cd0a0a_256x240.png
>+%%DATADIR%%/stylesheets/jquery-ui-1.8.18.custom.css
>+%%DATADIR%%/stylesheets/jquery.jqplot.css
>+%%DATADIR%%/workloads/datacomm-1.pg
>+%%DATADIR%%/workloads/downtime-2.pg
>+%%DATADIR%%/workloads/include/benches.pg
>+%%DATADIR%%/workloads/include/contents.pg
>+%%DATADIR%%/workloads/include/phases.pg
>+%%DATADIR%%/workloads/include/pipes.pg
>+%%DATADIR%%/workloads/include/polymix-3-guts.pg
>+%%DATADIR%%/workloads/include/polymix-4-guts.pg
>+%%DATADIR%%/workloads/include/webaxe-4-guts.pg
>+%%DATADIR%%/workloads/nolb-l4-4.pg
>+%%DATADIR%%/workloads/polyfill-2.pg
>+%%DATADIR%%/workloads/polymix-1.pg
>+%%DATADIR%%/workloads/polymix-2.pg
>+%%DATADIR%%/workloads/polymix-3.pg
>+%%DATADIR%%/workloads/polymix-4.pg
>+%%DATADIR%%/workloads/pxylb-4.pg
>+%%DATADIR%%/workloads/simple.pg
>+%%DATADIR%%/workloads/srvlb-l4-4.pg
>+%%DATADIR%%/workloads/srvlb-l7-4.pg
>+%%DATADIR%%/workloads/test_csm.pg
>+%%DATADIR%%/workloads/test_polypxy.pg
>+%%DATADIR%%/workloads/webaxe-1.pg
>+%%DATADIR%%/workloads/webaxe-3.pg
>+%%DATADIR%%/workloads/webaxe-4.pg

Actions: View | Diff

Attachments on bug 206242: 165573