diff options
Diffstat (limited to 'benchmarks')
28 files changed, 0 insertions, 1131 deletions
diff --git a/benchmarks/polygraph31/Makefile b/benchmarks/polygraph31/Makefile deleted file mode 100644 index afabffb55a20..000000000000 --- a/benchmarks/polygraph31/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# New ports collection makefile for: polygraph -# Date created: 3 March 1999 -# Whom: Dima Sivachenko <dima@chg.ru> -# -# $FreeBSD$ -# - -PORTNAME= polygraph -PORTVERSION= 2.8.1 -CATEGORIES= benchmarks www -MASTER_SITES= http://www.web-polygraph.org/downloads/srcs/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-src -EXTRACT_SUFX= .tgz - -MAINTAINER= ports@FreeBSD.org -COMMENT= A benchmarking tool for Web proxies - -RESTRICTED= Redistribution forbidden by license -IS_INTERACTIVE= yes - -GNU_CONFIGURE= YES -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -Wno-deprecated" -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - -CONFLICTS= ltrace-0* - -.include <bsd.port.mk> diff --git a/benchmarks/polygraph31/distinfo b/benchmarks/polygraph31/distinfo deleted file mode 100644 index 6ba80ea1b8cd..000000000000 --- a/benchmarks/polygraph31/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (polygraph-2.8.1-src.tgz) = f42e70d3fa383f42bf3676c086b2d16c -SHA256 (polygraph-2.8.1-src.tgz) = 0fbd101421385538e31187186f07476e91e1a66281e1e3c393dd9cbd2049508b -SIZE (polygraph-2.8.1-src.tgz) = 710841 diff --git a/benchmarks/polygraph31/files/patch-tools-ReportGen-Makefile.in b/benchmarks/polygraph31/files/patch-tools-ReportGen-Makefile.in deleted file mode 100644 index 130457622a3d..000000000000 --- a/benchmarks/polygraph31/files/patch-tools-ReportGen-Makefile.in +++ /dev/null @@ -1,22 +0,0 @@ ---- tools/ReportGen/Makefile.in.orig Tue Jun 12 02:04:12 2001 -+++ tools/ReportGen/Makefile.in Sat Aug 3 13:55:53 2002 -@@ -15,7 +15,7 @@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ - --rgen_dir = @prefix@/ReportGen -+rgen_dir = @prefix@/share/polygraph/ReportGen - - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -42,8 +42,8 @@ - fi - - install_mkdirs: -- @for d in $(prefix) $(rgen_dir); do \ -- if test ! -d $$d; then echo mkdir $$d; mkdir $$d; fi; \ -+ @for d in $(rgen_dir); do \ -+ if test ! -d $$d; then echo mkdir -p $$d; mkdir -p $$d; fi; \ - done - - clean: diff --git a/benchmarks/polygraph31/files/patch-workloads-Makefile.in b/benchmarks/polygraph31/files/patch-workloads-Makefile.in deleted file mode 100644 index 9bc6ff415c93..000000000000 --- a/benchmarks/polygraph31/files/patch-workloads-Makefile.in +++ /dev/null @@ -1,84 +0,0 @@ ---- workloads/Makefile.in.orig Sun Jul 29 06:45:59 2001 -+++ workloads/Makefile.in Sat Aug 3 13:56:45 2002 -@@ -45,55 +45,55 @@ - default: all - - datacomm-1.pg_install: install_dirs datacomm-1.pg -- $(INSTALL_DTA) datacomm-1.pg ${prefix}/workloads -+ $(INSTALL_DTA) datacomm-1.pg ${datadir}/polygraph/workloads - - downtime-2.pg_install: install_dirs downtime-2.pg -- $(INSTALL_DTA) downtime-2.pg ${prefix}/workloads -+ $(INSTALL_DTA) downtime-2.pg ${datadir}/polygraph/workloads - - nolb-l4-4.pg_install: install_dirs nolb-l4-4.pg -- $(INSTALL_DTA) nolb-l4-4.pg ${prefix}/workloads -+ $(INSTALL_DTA) nolb-l4-4.pg ${datadir}/polygraph/workloads - - polyfill-2.pg_install: install_dirs polyfill-2.pg -- $(INSTALL_DTA) polyfill-2.pg ${prefix}/workloads -+ $(INSTALL_DTA) polyfill-2.pg ${datadir}/polygraph/workloads - - polymix-1.pg_install: install_dirs polymix-1.pg -- $(INSTALL_DTA) polymix-1.pg ${prefix}/workloads -+ $(INSTALL_DTA) polymix-1.pg ${datadir}/polygraph/workloads - - polymix-2.pg_install: install_dirs polymix-2.pg -- $(INSTALL_DTA) polymix-2.pg ${prefix}/workloads -+ $(INSTALL_DTA) polymix-2.pg ${datadir}/polygraph/workloads - - polymix-3.pg_install: install_dirs polymix-3.pg -- $(INSTALL_DTA) polymix-3.pg ${prefix}/workloads -+ $(INSTALL_DTA) polymix-3.pg ${datadir}/polygraph/workloads - - polymix-4.pg_install: install_dirs polymix-4.pg -- $(INSTALL_DTA) polymix-4.pg ${prefix}/workloads -+ $(INSTALL_DTA) polymix-4.pg ${datadir}/polygraph/workloads - - pxylb-4.pg_install: install_dirs pxylb-4.pg -- $(INSTALL_DTA) pxylb-4.pg ${prefix}/workloads -+ $(INSTALL_DTA) pxylb-4.pg ${datadir}/polygraph/workloads - - simple.pg_install: install_dirs simple.pg -- $(INSTALL_DTA) simple.pg ${prefix}/workloads -+ $(INSTALL_DTA) simple.pg ${datadir}/polygraph/workloads - - srvlb-l4-4.pg_install: install_dirs srvlb-l4-4.pg -- $(INSTALL_DTA) srvlb-l4-4.pg ${prefix}/workloads -+ $(INSTALL_DTA) srvlb-l4-4.pg ${datadir}/polygraph/workloads - - srvlb-l7-4.pg_install: install_dirs srvlb-l7-4.pg -- $(INSTALL_DTA) srvlb-l7-4.pg ${prefix}/workloads -+ $(INSTALL_DTA) srvlb-l7-4.pg ${datadir}/polygraph/workloads - - test_csm.pg_install: install_dirs test_csm.pg -- $(INSTALL_DTA) test_csm.pg ${prefix}/workloads -+ $(INSTALL_DTA) test_csm.pg ${datadir}/polygraph/workloads - - test_polypxy.pg_install: install_dirs test_polypxy.pg -- $(INSTALL_DTA) test_polypxy.pg ${prefix}/workloads -+ $(INSTALL_DTA) test_polypxy.pg ${datadir}/polygraph/workloads - - webaxe-1.pg_install: install_dirs webaxe-1.pg -- $(INSTALL_DTA) webaxe-1.pg ${prefix}/workloads -+ $(INSTALL_DTA) webaxe-1.pg ${datadir}/polygraph/workloads - - webaxe-3.pg_install: install_dirs webaxe-3.pg -- $(INSTALL_DTA) webaxe-3.pg ${prefix}/workloads -+ $(INSTALL_DTA) webaxe-3.pg ${datadir}/polygraph/workloads - - webaxe-4.pg_install: install_dirs webaxe-4.pg -- $(INSTALL_DTA) webaxe-4.pg ${prefix}/workloads -+ $(INSTALL_DTA) webaxe-4.pg ${datadir}/polygraph/workloads - - all: all_subdirs datacomm-1.pg downtime-2.pg nolb-l4-4.pg polyfill-2.pg polymix-1.pg polymix-2.pg polymix-3.pg polymix-4.pg pxylb-4.pg simple.pg srvlb-l4-4.pg srvlb-l7-4.pg test_csm.pg test_polypxy.pg webaxe-1.pg webaxe-3.pg webaxe-4.pg - -@@ -122,7 +122,7 @@ - - install: install_subdirs datacomm-1.pg downtime-2.pg nolb-l4-4.pg polyfill-2.pg polymix-1.pg polymix-2.pg polymix-3.pg polymix-4.pg pxylb-4.pg simple.pg srvlb-l4-4.pg srvlb-l7-4.pg test_csm.pg test_polypxy.pg webaxe-1.pg webaxe-3.pg webaxe-4.pg - install_dirs: -- @for d in ${prefix}/workloads/; do \ -+ @for d in ${datadir}/polygraph/workloads ; do \ - if test ! -d $$d; then echo mkdir -p $$d; mkdir -p $$d; fi; \ - done - diff --git a/benchmarks/polygraph31/files/patch-workloads-include-Makefile.in b/benchmarks/polygraph31/files/patch-workloads-include-Makefile.in deleted file mode 100644 index 3852d88cc9bf..000000000000 --- a/benchmarks/polygraph31/files/patch-workloads-include-Makefile.in +++ /dev/null @@ -1,44 +0,0 @@ ---- workloads/include/Makefile.in.orig Sat Aug 3 14:23:13 2002 -+++ workloads/include/Makefile.in Sat Aug 3 14:24:50 2002 -@@ -45,25 +45,25 @@ - default: all - - benches.pg_install: install_dirs benches.pg -- $(INSTALL_DTA) benches.pg ${prefix}/workloads/include -+ $(INSTALL_DTA) benches.pg ${datadir}/polygraph/workloads/include - - contents.pg_install: install_dirs contents.pg -- $(INSTALL_DTA) contents.pg ${prefix}/workloads/include -+ $(INSTALL_DTA) contents.pg ${datadir}/polygraph/workloads/include - - phases.pg_install: install_dirs phases.pg -- $(INSTALL_DTA) phases.pg ${prefix}/workloads/include -+ $(INSTALL_DTA) phases.pg ${datadir}/polygraph/workloads/include - - pipes.pg_install: install_dirs pipes.pg -- $(INSTALL_DTA) pipes.pg ${prefix}/workloads/include -+ $(INSTALL_DTA) pipes.pg ${datadir}/polygraph/workloads/include - - polymix-3-guts.pg_install: install_dirs polymix-3-guts.pg -- $(INSTALL_DTA) polymix-3-guts.pg ${prefix}/workloads/include -+ $(INSTALL_DTA) polymix-3-guts.pg ${datadir}/polygraph/workloads/include - - polymix-4-guts.pg_install: install_dirs polymix-4-guts.pg -- $(INSTALL_DTA) polymix-4-guts.pg ${prefix}/workloads/include -+ $(INSTALL_DTA) polymix-4-guts.pg ${datadir}/polygraph/workloads/include - - webaxe-4-guts.pg_install: install_dirs webaxe-4-guts.pg -- $(INSTALL_DTA) webaxe-4-guts.pg ${prefix}/workloads/include -+ $(INSTALL_DTA) webaxe-4-guts.pg ${datadir}/polygraph/workloads/include - - all: all_subdirs benches.pg contents.pg phases.pg pipes.pg polymix-3-guts.pg polymix-4-guts.pg webaxe-4-guts.pg - -@@ -80,7 +80,7 @@ - - install: install_subdirs benches.pg contents.pg phases.pg pipes.pg polymix-3-guts.pg polymix-4-guts.pg webaxe-4-guts.pg - install_dirs: -- @for d in ${prefix}/workloads/include/; do \ -+ @for d in ${datadir}/polygraph/workloads/include/; do \ - if test ! -d $$d; then echo mkdir -p $$d; mkdir -p $$d; fi; \ - done - diff --git a/benchmarks/polygraph31/pkg-descr b/benchmarks/polygraph31/pkg-descr deleted file mode 100644 index 9d618be1b026..000000000000 --- a/benchmarks/polygraph31/pkg-descr +++ /dev/null @@ -1,13 +0,0 @@ -Web Polygraph is a benchmarking tool for Web proxies. Polygraph -distribution includes a high-performance client and server simulators. -The simulators create a stream of HTTP requests that can be routed through -a Web proxy. Studying proxy performance under various [stress] conditions is -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/ - ---Dima -dima@chg.ru diff --git a/benchmarks/polygraph31/pkg-plist b/benchmarks/polygraph31/pkg-plist deleted file mode 100644 index 927b65a85e09..000000000000 --- a/benchmarks/polygraph31/pkg-plist +++ /dev/null @@ -1,63 +0,0 @@ -bin/aka -bin/cdb -bin/distr_test -bin/dns_cfg -bin/lr -bin/ltrace -bin/lx -bin/pgl2acl -bin/pgl2eng -bin/pgl2ldif -bin/pgl_test -bin/polyclt -bin/polymon -bin/polyprobe -bin/polypxy -bin/polyrrd -bin/polysrv -bin/pop_test -bin/reporter -bin/rng_test -bin/tcp2xmld -bin/udp2tcpd -%%DATADIR%%/ReportGen/label_results -%%DATADIR%%/ReportGen/make_report -%%DATADIR%%/ReportGen/make_card -%%DATADIR%%/ReportGen/plot_traces -%%DATADIR%%/ReportGen/plot_table -%%DATADIR%%/ReportGen/Globs.pm -%%DATADIR%%/ReportGen/Line.pm -%%DATADIR%%/ReportGen/ObjDbase.pm -%%DATADIR%%/ReportGen/ObjManip.pm -%%DATADIR%%/ReportGen/Opts.pm -%%DATADIR%%/ReportGen/Plot.pm -%%DATADIR%%/ReportGen/RepFormat.pm -%%DATADIR%%/ReportGen/reportgen.cfg -%%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 -@dirrm %%DATADIR%%/ReportGen -@dirrm %%DATADIR%%/workloads/include -@dirrm %%DATADIR%%/workloads -@dirrm %%DATADIR%% diff --git a/benchmarks/sipp/Makefile b/benchmarks/sipp/Makefile deleted file mode 100644 index 320d14d5912c..000000000000 --- a/benchmarks/sipp/Makefile +++ /dev/null @@ -1,83 +0,0 @@ -# New ports collection makefile for: sipp -# Date created: 15 Jun 2004 -# Whom: jesper@jdn.dk -# -# $FreeBSD$ -# - -PORTNAME= sipp -PORTVERSION= 1.1.r8.20070116 -CATEGORIES= net -MASTER_SITES= http://sipp.sourceforge.net/snapshots/ -DISTNAME= ${PORTNAME}.2007-01-16 - -MAINTAINER= tut@nhamon.com.ua -COMMENT= SIP testing tool - -PLIST_FILES= bin/sipp -MAN1= sipp.1 - -MAKE_ENV+= CPP="${CXX}" CPPFLAGS="${CXXFLAGS}" CCLINK="${CXX}" - -OPTIONS= OPENSSL "OpenSSL support (for digest auth and SIP over TLS)" on \ - PCAPPLAY "RTP play support" off - -.include <bsd.port.pre.mk> - -.if defined(WITH_PCAPPLAY) -BUILD_DEPENDS= libnet*>=1.1.2,1:${PORTSDIR}/net/libnet - -PCAP_FILES= dtmf_2833_1.pcap dtmf_2833_2.pcap dtmf_2833_3.pcap \ - dtmf_2833_4.pcap dtmf_2833_5.pcap dtmf_2833_6.pcap \ - dtmf_2833_7.pcap dtmf_2833_8.pcap dtmf_2833_9.pcap \ - dtmf_2833_pound.pcap dtmf_2833_star.pcap g711a.pcap - -PLIST_DIRS= %%DATADIR%%/pcap \ - %%DATADIR%% - -.for f in ${PCAP_FILES} -PLIST_FILES+= %%DATADIR%%/pcap/${f} -.endfor -.endif #defined(WITH_PCAPPLAY) - -.if defined(WITHOUT_OPENSSL) - -.if defined(WITH_PCAPPLAY) -ALL_TARGET= pcapplay -.endif #defined(WITH_PCAPPLAY) - -.else #!defined(WITHOUT_OPENSSL) - -.if defined(WITH_PCAPPLAY) -ALL_TARGET= pcapplay_ossl -.else -ALL_TARGET= ossl -.endif #defined(WITH_PCAPPLAY) - -.endif #defined(WITHOUT_OPENSSL) - -post-patch: -.if ${ARCH} == "ia64" - @${REINPLACE_CMD} 's/^\(MFLAGS_ia64=\)\+DD64$$/\1/' ${WRKSRC}/Makefile -.endif - -.if defined(WITH_PCAPPLAY) - @${REINPLACE_CMD} \ - 's|\(\\"\)\(pcap/[^"]*\.pcap\\"\)|\1${DATADIR}/\2|' \ - ${WRKSRC}/scenario.cpp -.endif #defined(WITH_PCAPPLAY) - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - ${INSTALL_MAN} ${FILESDIR}/sipp.1 ${PREFIX}/man/man1 - -.if defined(WITH_PCAPPLAY) - ${MKDIR} ${DATADIR}/pcap - -.for f in ${PCAP_FILES} - ${INSTALL_DATA} ${WRKSRC}/pcap/${f} ${DATADIR}/pcap/${f} -.endfor - -.endif #defined(WITH_PCAPPLAY) - -.include <bsd.port.post.mk> diff --git a/benchmarks/sipp/distinfo b/benchmarks/sipp/distinfo deleted file mode 100644 index 689f7e094eaf..000000000000 --- a/benchmarks/sipp/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (sipp.2007-01-16.tar.gz) = 31814aa7d5b6ddc0d287997dbe762471 -SHA256 (sipp.2007-01-16.tar.gz) = 240021c7f3a4b49d1af3ca02135e3eb76ce91a525bf20d21ab6c18564cca1afd -SIZE (sipp.2007-01-16.tar.gz) = 171551 diff --git a/benchmarks/sipp/files/patch-Makefile b/benchmarks/sipp/files/patch-Makefile deleted file mode 100644 index 0c93740279cc..000000000000 --- a/benchmarks/sipp/files/patch-Makefile +++ /dev/null @@ -1,67 +0,0 @@ -$FreeBSD$ - ---- Makefile.orig -+++ Makefile -@@ -18,8 +18,6 @@ - # From Hewlett Packard Company. - # - ---include local.mk -- - # Output binary to be built - OUTPUT=sipp - -@@ -69,7 +67,7 @@ - CC_SunOS=gcc - CC_Cygwin=cc - CC_Darwin=cc --CC=$(CC_$(SYSTEM)) -+CC?=$(CC_$(SYSTEM)) - - # C++ compiler mapping - CPP_hpux=aCC -@@ -79,7 +77,7 @@ - CPP_SunOS=g++ - CPP_Cygwin=g++ - CPP_Darwin=g++ --CPP=$(CPP_$(SYSTEM)) -+CPP?=$(CPP_$(SYSTEM)) - - #Model specific flags - MFLAGS_ia64=+DD64 -@@ -102,7 +100,7 @@ - CFLAGS_SunOS=-g -D__SUNOS - CFLAGS_Cygwin=-D__CYGWIN -Dsocklen_t=int - CFLAGS_Darwin=-D__DARWIN --CFLAGS=$(CFLAGS_$(SYSTEM)) -D__3PCC__ $(TLS) $(PCAPPLAY) $(EXTRACFLAGS) -+CFLAGS+=$(CFLAGS_$(SYSTEM)) -D__3PCC__ $(TLS) $(PCAPPLAY) - - #C++ Compiler Flags - CPPFLAGS_hpux=-AA -mt -D__HPUX +W829 -@@ -112,7 +110,7 @@ - CPPFLAGS_SunOS=-g -D__SUNOS - CPPFLAGS_Cygwin=-D__CYGWIN -Dsocklen_t=int - CPPFLAGS_Darwin=-D__DARWIN --CPPFLAGS=$(CPPFLAGS_$(SYSTEM)) -D__3PCC__ $(TLS) $(PCAPPLAY) $(EXTRACPPFLAGS) -+CPPFLAGS+=$(CPPFLAGS_$(SYSTEM)) -D__3PCC__ $(TLS) $(PCAPPLAY) - - #Linker mapping - CCLINK_hpux=aCC -@@ -122,7 +120,7 @@ - CCLINK_SunOS=gcc - CCLINK_Cygwin=g++ - CCLINK_Darwin=g++ --CCLINK=$(CCLINK_$(SYSTEM)) -+CCLINK?=$(CCLINK_$(SYSTEM)) - - #Linker Flags - LFLAGS_hpux=-AA -mt -@@ -153,8 +151,6 @@ - INCDIR_Cygwin=-I. -I/usr/include/openssl -I/usr/include -I/usr/lib/WpdPack/Include - INCDIR_Darwin=-I. -I/usr/local/ssl/include - INCDIR=$(INCDIR_$(SYSTEM)) -- ---include local.mk - - # Building without TLS and authentication (no openssl pre-requisite) - all: diff --git a/benchmarks/sipp/files/patch-prepare_pcap.c b/benchmarks/sipp/files/patch-prepare_pcap.c deleted file mode 100644 index a878d162d7ba..000000000000 --- a/benchmarks/sipp/files/patch-prepare_pcap.c +++ /dev/null @@ -1,48 +0,0 @@ -$FreeBSD$ - ---- prepare_pcap.c.orig -+++ prepare_pcap.c -@@ -19,7 +19,7 @@ - #include <stdlib.h> - #include <netinet/in.h> - #include <netinet/udp.h> --#if defined(__HPUX) || defined(__CYGWIN) -+#if defined(__HPUX) || defined(__CYGWIN) || defined(__FreeBSD__) - #include <netinet/in_systm.h> - #endif - #include <netinet/ip.h> -@@ -142,7 +142,7 @@ - fprintf(stderr, "prepare_pcap.c: Ignoring non UDP packet!\n"); - continue; - } --#if defined(__DARWIN) || defined(__CYGWIN) -+#if defined(__DARWIN) || defined(__CYGWIN) || defined(__FreeBSD__) - udphdr = (struct udphdr *)((char *)iphdr + (iphdr->ihl << 2) + 4); - pktlen = (u_long)(ntohs(udphdr->uh_ulen)); - #else -@@ -164,7 +164,7 @@ - ERROR("Can't allocate memory for pcap pkt data"); - memcpy(pkt_index->data, udphdr, pktlen); - --#if defined(__HPUX) || defined(__DARWIN) || (defined __CYGWIN) -+#if defined(__HPUX) || defined(__DARWIN) || (defined __CYGWIN) || defined(__FreeBSD__) - udphdr->uh_sum = 0 ; - #else - udphdr->check = 0; -@@ -173,14 +173,14 @@ - // compute a partial udp checksum - // not including port that will be changed - // when sending RTP --#if defined(__HPUX) || defined(__DARWIN) || (defined __CYGWIN) -+#if defined(__HPUX) || defined(__DARWIN) || (defined __CYGWIN) || defined(__FreeBSD__) - pkt_index->partial_check = check((u_int16_t *) &udphdr->uh_ulen, pktlen - 4) + ntohs(IPPROTO_UDP + pktlen); - #else - pkt_index->partial_check = check((u_int16_t *) &udphdr->len, pktlen - 4) + ntohs(IPPROTO_UDP + pktlen); - #endif - if (max_length < pktlen) - max_length = pktlen; --#if defined(__HPUX) || defined(__DARWIN) || (defined __CYGWIN) -+#if defined(__HPUX) || defined(__DARWIN) || (defined __CYGWIN) || defined(__FreeBSD__) - if (base > ntohs(udphdr->uh_dport)) - base = ntohs(udphdr->uh_dport); - #else diff --git a/benchmarks/sipp/files/patch-prepare_pcap.h b/benchmarks/sipp/files/patch-prepare_pcap.h deleted file mode 100644 index f7c7fec52e60..000000000000 --- a/benchmarks/sipp/files/patch-prepare_pcap.h +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- prepare_pcap.h.orig -+++ prepare_pcap.h -@@ -22,7 +22,7 @@ - #include <netinet/udp.h> - #include <time.h> - --#if defined(__HPUX) || defined(__DARWIN) || defined(__CYGWIN) -+#if defined(__HPUX) || defined(__DARWIN) || defined(__CYGWIN) || defined(__FreeBSD__) - #define u_int8_t uint8_t - #define u_int16_t uint16_t - #define u_int32_t uint32_t diff --git a/benchmarks/sipp/files/patch-send_packets.c b/benchmarks/sipp/files/patch-send_packets.c deleted file mode 100644 index e386eee113b6..000000000000 --- a/benchmarks/sipp/files/patch-send_packets.c +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- send_packets.c.orig -+++ send_packets.c -@@ -45,7 +45,7 @@ - #include <unistd.h> - #include <stdlib.h> - #include <netinet/udp.h> --#if defined(__DARWIN) || defined(__CYGWIN) -+#if defined(__DARWIN) || defined(__CYGWIN) || defined(__FreeBSD__) - #include <netinet/in.h> - #endif - #ifndef __CYGWIN diff --git a/benchmarks/sipp/files/sipp.1 b/benchmarks/sipp/files/sipp.1 deleted file mode 100644 index 52e5cbe2cac6..000000000000 --- a/benchmarks/sipp/files/sipp.1 +++ /dev/null @@ -1,158 +0,0 @@ -.\" -.\" Standard preamble: -.\" ======================================================================== -.de Sh \" Subsection heading -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. -.de Sp \" Vertical space (when we can't use .PP) -.if t .sp .5v -.if n .sp -.. -.de Vb \" Begin verbatim text -.ft CW -.nf -.ne \\$1 -.. -.de Ve \" End verbatim text -.ft R -.fi -.. -.\" Set up some character translations and predefined strings. \*(-- will -.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. | will give a -.\" real vertical bar. \*(C+ will give a nicer C++. Capital omega is used to -.\" do unbreakable dashes and therefore won't be available. \*(C` and \*(C' -.\" expand to `' in nroff, nothing in troff, for use with C<>. -.tr \(*W-|\(bv\*(Tr -.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' -.ie n \{\ -. ds -- \(*W- -. ds PI pi -. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch -. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch -. ds L" "" -. ds R" "" -. ds C` "" -. ds C' "" -'br\} -.el\{\ -. ds -- \|\(em\| -. ds PI \(*p -. ds L" `` -. ds R" '' -'br\} -.\" -.\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index -.\" entries marked with X<> in POD. Of course, you'll have to process the -.\" output yourself in some meaningful fashion. -.if \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" -.. -. nr % 0 -. rr F -.\} -.\" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.hy 0 -.if n .na -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). -.\" Fear. Run. Save yourself. No user-serviceable parts. -. \" fudge factors for nroff and troff -.if n \{\ -. ds #H 0 -. ds #V .8m -. ds #F .3m -. ds #[ \f1 -. ds #] \fP -.\} -.if t \{\ -. ds #H ((1u-(\\\\n(.fu%2u))*.13m) -. ds #V .6m -. ds #F 0 -. ds #[ \& -. ds #] \& -.\} -. \" simple accents for nroff and troff -.if n \{\ -. ds ' \& -. ds ` \& -. ds ^ \& -. ds , \& -. ds ~ ~ -. ds / -.\} -.if t \{\ -. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" -. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' -. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' -. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' -. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' -. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' -.\} -. \" troff and (daisy-wheel) nroff accents -.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' -.ds 8 \h'\*(#H'\(*b\h'-\*(#H' -.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] -.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' -.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' -.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] -.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] -.ds ae a\h'-(\w'a'u*4/10)'e -.ds Ae A\h'-(\w'A'u*4/10)'E -. \" corrections for vroff -.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' -. \" for low resolution devices (crt and lpr) -.if \n(.H>23 .if \n(.V>19 \ -\{\ -. ds : e -. ds 8 ss -. ds o a -. ds d- d\h'-1'\(ga -. ds D- D\h'-1'\(hy -. ds th \o'bp' -. ds Th \o'LP' -. ds ae ae -. ds Ae AE -.\} -.rm #[ #] #H #V #F C -.\" ======================================================================== -.\" -.IX Title "sipp 1" -.TH sipp 1 "2006-12-17" "sipp" "User Contributed Documentation" -.SH "NAME" -sipp \- A benchworking tool for the SIP protocol. -.SH "DESCRIPTION" -.IX Header "DESCRIPTION" -Sipp is a performance test tool / traffic generator for the \s-1SIP\s0 -protocol. It comes with a few basic SipStone user-agents -scenarios (\s-1UAC\s0 & \s-1UAS\s0), establishing and releasing multiple -calls with the \s-1INVITE\s0 and \s-1BYE\s0 methods. -.PP -It can also read \s-1XML\s0 scenario files describing any performance -testing configuration for \s-1SIP\s0. -.SH "SYNTAX" -.IX Header "SYNTAX" -.Vb 1 -\&Run 'sipp' command without parameters for configuration details. -.Ve -.SH "SEE ALSO" -.IX Header "SEE ALSO" -.Vb 1 -\&SIPp documentation - http://sipp.sourceforge.net/doc/ -.Ve -.SH "AUTHORS" -.IX Header "AUTHORS" -.Vb 2 -\&Richard Gayraud <richard_gayraud@users.sourceforge.net> -\&Olivier Jacques <ojacques@users.sourceforge.net> -.Ve diff --git a/benchmarks/sipp/pkg-descr b/benchmarks/sipp/pkg-descr deleted file mode 100644 index b7635f87453e..000000000000 --- a/benchmarks/sipp/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Sipp is a performance test tool / traffic generator for the SIP protocol. - -It comes with a few basic SipStone user-agents scenarios (UAC & UAS), i -establishing and releasing multiple calls with the INVITE and BYE methods. - -WWW: http://sipp.sourceforge.net/ diff --git a/benchmarks/xdd/Makefile b/benchmarks/xdd/Makefile deleted file mode 100644 index 7912418c8803..000000000000 --- a/benchmarks/xdd/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# New ports collection makefile for: sysutils/xdd -# Date created: 29.05.2006 -# Whom: Gerhard Gonter <g.gonter@ieee.org> -# -# $FreeBSD$ -# - -PORTNAME= xdd -PORTVERSION= 64 -CATEGORIES= sysutils -MASTER_SITES= http://www.ioperformance.com/xddversions/ -DISTNAME= xdd64.121805 - -MAINTAINER= g.gonter@ieee.org -COMMENT= Tool for measuring and characterizing disk subsystem I/O - -WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION} -PLIST_FILES= bin/xdd bin/timeserver bin/gettime - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= Doesn't build on 4.x -.endif - -post-extract: - ${CP} ${FILESDIR}/freebsd.makefile ${WRKSRC} - -do-build: - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} -f freebsd.makefile - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/xdd.freebsd ${PREFIX}/bin/xdd - ${INSTALL_PROGRAM} ${WRKSRC}/bin/timeserver.freebsd ${PREFIX}/bin/timeserver - ${INSTALL_PROGRAM} ${WRKSRC}/bin/gettime.freebsd ${PREFIX}/bin/gettime - -.include <bsd.port.post.mk> diff --git a/benchmarks/xdd/distinfo b/benchmarks/xdd/distinfo deleted file mode 100644 index 79142b9f8b58..000000000000 --- a/benchmarks/xdd/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (xdd64.121805.tar.gz) = 10cc5daeddb3853833f88d20cf6fda3e -SIZE (xdd64.121805.tar.gz) = 1985205 -SHA256 (xdd64.121805.tar.gz) = cfa60804145bec2066b494cb47d734ae3d50a4d0344bd1cc5277214cada804df diff --git a/benchmarks/xdd/files/freebsd.makefile b/benchmarks/xdd/files/freebsd.makefile deleted file mode 100644 index 71813707f637..000000000000 --- a/benchmarks/xdd/files/freebsd.makefile +++ /dev/null @@ -1,69 +0,0 @@ -# XDD Makefile for FreeBSD -SHELL = /bin/sh -CC ?= gcc -CFLAGS += -DFreeBSD -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -g -PROJECT = xdd -OBJECTS = xdd.o access_pattern.o barrier.o global_time.o initialization.o parse.o pclk.o read_after_write.o results.o ticker.o time_stamp.o -HEADERS = xdd.h pclk.h ticker.h misc.h -TSOBJECTS = timeserver.o pclk.o ticker.o -GTOBJECTS = gettime.o global_time.o pclk.o ticker.o - -all: xdd timeserver gettime - -xdd: $(OBJECTS) - ${CC} -o xdd $(CFLAGS) $(OBJECTS) -lpthread -v - mv -f xdd bin/xdd.freebsd - -timeserver: $(TSOBJECTS) - ${CC} -o timeserver $(CFLAGS) $(TSOBJECTS) -lpthread -v - mv -f timeserver bin/timeserver.freebsd - -gettime: $(GTOBJECTS) - ${CC} -o gettime $(CFLAGS) $(GTOBJECTS) -lpthread -v - mv -f gettime bin/gettime.freebsd - -access_pattern.o: access_pattern.c - ${CC} $(CFLAGS) -c access_pattern.c - -barrier.o: barrier.c - ${CC} $(CFLAGS) -c barrier.c - -gettime.o: gettime.c - ${CC} $(CFLAGS) -c gettime.c - -global_time.o: global_time.c - ${CC} $(CFLAGS) -c global_time.c - -initialization.o: initialization.c - ${CC} $(CFLAGS) -c initialization.c - -parse.o: parse.c - ${CC} $(CFLAGS) -c parse.c - -pclk.o: pclk.c - ${CC} $(CFLAGS) -c pclk.c - -read_after_write.o: read_after_write.c - ${CC} $(CFLAGS) -c read_after_write.c - -results.o: results.c - ${CC} $(CFLAGS) -c results.c - -ticker.o: ticker.c - ${CC} $(CFLAGS) -c ticker.c - -time_stamp.o: time_stamp.c - ${CC} $(CFLAGS) -c time_stamp.c - -timeserver.o: timeserver.c - ${CC} $(CFLAGS) -c timeserver.c - -xdd.o: xdd.c - ${CC} $(CFLAGS) -c xdd.c - -dist: clean - tar cf ../dist.tar . -clean: - -rm -f xdd timeserver gettime a.out $(OBJECTS) $(TSOBJECTS) $(GTOBJECTS) - - diff --git a/benchmarks/xdd/files/patch-global_time.c b/benchmarks/xdd/files/patch-global_time.c deleted file mode 100644 index 26208e9008eb..000000000000 --- a/benchmarks/xdd/files/patch-global_time.c +++ /dev/null @@ -1,19 +0,0 @@ ---- global_time.c.orig Mon May 29 04:12:29 2006 -+++ global_time.c Mon May 29 04:16:36 2006 -@@ -42,11 +42,15 @@ - #else /* GENERIC_UNIX */ - #include <netdb.h> - #include <sys/socket.h> -+#if (FreeBSD) -+#include <sys/types.h> -+#include <sys/unistd.h> -+#endif /* (FreeBSD) */ - #include <netinet/in.h> - #include <netinet/tcp.h> - #include <arpa/inet.h> - #endif --#if (AIX || HPUX || SOLARIS) -+#if (AIX || HPUX || SOLARIS || FreeBSD) - #include <stdarg.h> - #endif - #include "xdd.h" diff --git a/benchmarks/xdd/files/patch-initialization.c b/benchmarks/xdd/files/patch-initialization.c deleted file mode 100644 index ea88eee2862b..000000000000 --- a/benchmarks/xdd/files/patch-initialization.c +++ /dev/null @@ -1,73 +0,0 @@ ---- initialization.c.orig Mon May 29 04:17:28 2006 -+++ initialization.c Mon May 29 04:18:32 2006 -@@ -562,7 +562,7 @@ - * NOTE: This is not supported by all operating systems. - */ - if (p->target_options & RX_SHARED_MEMORY) { --#if (AIX || LINUX || SOLARIS || OSX) -+#if (AIX || LINUX || SOLARIS || OSX || FreeBSD) - /* In AIX we need to get memory in a shared memory segment to avoid - * the system continually trying to pin each page on every I/O operation */ - #if (AIX) -@@ -590,14 +590,14 @@ - fprintf(xgp->errout,"%s: Shared Memory not supported on this OS - using valloc\n", - xgp->progname); - p->target_options &= ~RX_SHARED_MEMORY; --#if (IRIX || SOLARIS || HPUX || LINUX || AIX || ALTIX || OSX) -+#if (IRIX || SOLARIS || HPUX || LINUX || AIX || ALTIX || OSX || FreeBSD) - rwbuf = valloc(p->iosize); - #else - rwbuf = malloc(p->iosize); - #endif - #endif - } else { /* Allocate memory the normal way */ --#if (IRIX || SOLARIS || HPUX || LINUX || AIX || ALTIX || OSX) -+#if (IRIX || SOLARIS || HPUX || LINUX || AIX || ALTIX || OSX || FreeBSD) - rwbuf = valloc(p->iosize); - #else - rwbuf = malloc(p->iosize); -@@ -684,7 +684,7 @@ - newlim = liret - (PAGESIZE*8); - return; - #else --#if (LINUX || SOLARIS || HPUX || OSX || AIX) -+#if (LINUX || SOLARIS || HPUX || OSX || AIX || FreeBSD) - if (getuid() != 0) { - fprintf(xgp->errout,"(PID %d) %s: You must run as superuser to lock memory for %s\n", - getpid(),xgp->progname, sp); -@@ -833,7 +833,7 @@ - #endif - return; - #else --#if (IRIX || SOLARIS || HPUX || LINUX || ALTIX || OSX) -+#if (IRIX || SOLARIS || HPUX || LINUX || ALTIX || OSX || FreeBSD) - if (getuid() != 0) { - return; - } -@@ -919,7 +919,7 @@ - return; - - #if !(OSX) --#if (IRIX || SOLARIS || HPUX || AIX || LINUX || ALTIX || OSX) -+#if (IRIX || SOLARIS || HPUX || AIX || LINUX || ALTIX || OSX || FreeBSD) - if (getuid() != 0) - fprintf(xgp->errout,"%s: xdd_schedule_options: You must be super user to lock processes\n",xgp->progname); - #endif -@@ -933,7 +933,7 @@ - - /* reset priority */ - if (xgp->global_options & RX_MAXPRI) { --#if (IRIX || SOLARIS || HPUX || AIX || LINUX || ALTIX || OSX) -+#if (IRIX || SOLARIS || HPUX || AIX || LINUX || ALTIX || OSX || FreeBSD) - if (getuid() != 0) - fprintf(xgp->errout,"%s: xdd_schedule_options: You must be super user to max priority\n",xgp->progname); - #endif -@@ -1063,7 +1063,7 @@ - #endif - #if (IRIX || SOLARIS || HPUX || AIX || ALTIX) - struct stat64 statbuf; /* buffer for file statistics */ --#elif ( LINUX || OSX ) -+#elif ( LINUX || OSX || FreeBSD ) - struct stat statbuf; /* buffer for file statistics */ - #endif - int32_t i; /* working variable */ diff --git a/benchmarks/xdd/files/patch-misc.h b/benchmarks/xdd/files/patch-misc.h deleted file mode 100644 index f163e9bca1cb..000000000000 --- a/benchmarks/xdd/files/patch-misc.h +++ /dev/null @@ -1,29 +0,0 @@ ---- misc.h.orig Mon May 29 04:04:19 2006 -+++ misc.h Mon May 29 04:12:05 2006 -@@ -35,7 +35,7 @@ - /* -------- */ - /* Includes */ - /* -------- */ --#if (LINUX || AIX || IRIX || SOLARIS || HPUX || ALTIX || OSX) -+#if (LINUX || AIX || IRIX || SOLARIS || HPUX || ALTIX || OSX || FreeBSD) - #ifndef NDEBUG /* These are only needed if Assert() expands to something */ - #include <stdio.h> /* fprintf(), stderr */ - #include <unistd.h> /* pause() */ -@@ -60,7 +60,7 @@ - /* --------- */ - /* Constants */ - /* --------- */ --#if (LINUX || AIX || IRIX || SOLARIS || HPUX || ALTIX || OSX) -+#if (LINUX || AIX || IRIX || SOLARIS || HPUX || ALTIX || OSX || FreeBSD) - #define MILLION 1000000LL /* 10^6, as opposed to 2^20 */ - #define BILLION 1000000000LL /* 10^9, as opposed to 2^30 */ - #define TRILLION 1000000000000LL /* 10^12, as opposed to 2^40 */ -@@ -77,7 +77,7 @@ - #ifndef LLONG_MIN - #define LLONG_MIN (-LLONG_MAX - 1LL) - #endif --#if (LINUX || AIX || IRIX || SOLARIS || HPUX || ALTIX || OSX) -+#if (LINUX || AIX || IRIX || SOLARIS || HPUX || ALTIX || OSX || FreeBSD) - #ifndef LONGLONG_MIN - #define LONGLONG_MIN LLONG_MIN - #endif diff --git a/benchmarks/xdd/files/patch-parse.c b/benchmarks/xdd/files/patch-parse.c deleted file mode 100644 index 9ca45648e169..000000000000 --- a/benchmarks/xdd/files/patch-parse.c +++ /dev/null @@ -1,20 +0,0 @@ ---- parse.c.orig Thu Jun 1 14:48:28 2006 -+++ parse.c Thu Jun 1 14:56:44 2006 -@@ -697,7 +697,7 @@ - xddfunc_delay(int32_t argc, char *argv[]) - { - xgp->passdelay = atoi(argv[1]); -- return(1); -+ return(2); - } - /*----------------------------------------------------------------------------*/ - // Delete the target file when complete -@@ -1101,7 +1101,7 @@ - xddfunc_maxerrors(int32_t argc, char *argv[]) - { - xgp->max_errors = atoi(argv[1]); -- return(1); -+ return(2); - } - /*----------------------------------------------------------------------------*/ - // Set the maximum runtime priority diff --git a/benchmarks/xdd/files/patch-ticker.c b/benchmarks/xdd/files/patch-ticker.c deleted file mode 100644 index 8ce4a109effd..000000000000 --- a/benchmarks/xdd/files/patch-ticker.c +++ /dev/null @@ -1,29 +0,0 @@ ---- ticker.c.orig Mon May 29 04:23:53 2006 -+++ ticker.c Mon May 29 04:24:15 2006 -@@ -76,7 +76,7 @@ - return; - } - /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ --#elif (LINUX || SOLARIS || AIX || HPUX || OSX) -+#elif (LINUX || SOLARIS || AIX || HPUX || OSX || FreeBSD) - void - ticker_open(tick_t *tickp) { - uint32_t picos; -@@ -161,7 +161,7 @@ - return; /* Ticker not open, or error reading ticker */ - } - /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ --#elif (LINUX || SOLARIS || AIX || HPUX || OSX) -+#elif (LINUX || SOLARIS || AIX || HPUX || OSX || FreeBSD) - void - ticker_read(tick_t *tickp) { - struct timeval current_time; -@@ -198,7 +198,7 @@ - * - * Close the ticker. - */ --#if (WIN32 || LINUX || SOLARIS || AIX || HPUX || OSX) -+#if (WIN32 || LINUX || SOLARIS || AIX || HPUX || OSX || FreeBSD) - void - ticker_close(void) { - ticker_period = 0; diff --git a/benchmarks/xdd/files/patch-ticker.h b/benchmarks/xdd/files/patch-ticker.h deleted file mode 100644 index 43dd18b7aedd..000000000000 --- a/benchmarks/xdd/files/patch-ticker.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ticker.h.orig Mon May 29 04:02:17 2006 -+++ ticker.h Mon May 29 04:02:33 2006 -@@ -35,7 +35,7 @@ - /* Types */ - /* ----- */ - /* A ticker value */ --#if (LINUX || AIX || IRIX || SOLARIS || HPUX || ALTIX || OSX) -+#if (LINUX || AIX || IRIX || SOLARIS || HPUX || ALTIX || OSX || FreeBSD) - typedef unsigned long long tick_t; - #else - typedef unsigned __int64 tick_t; diff --git a/benchmarks/xdd/files/patch-timeserver.c b/benchmarks/xdd/files/patch-timeserver.c deleted file mode 100644 index 861d28138963..000000000000 --- a/benchmarks/xdd/files/patch-timeserver.c +++ /dev/null @@ -1,32 +0,0 @@ ---- timeserver.c.orig Mon May 29 04:25:26 2006 -+++ timeserver.c Mon May 29 04:25:56 2006 -@@ -29,9 +29,9 @@ - #include <stdarg.h> /* variable arguments stuff */ - #include <string.h> /* strrchr(), strerror() */ - #include <errno.h> /* errno stuff */ --#if (IRIX || SOLARIS || AIX || HPUX || LINUX || OSX) -+#if (IRIX || SOLARIS || AIX || HPUX || LINUX || OSX || FreeBSD) - #include <unistd.h> --#if !(SOLARIS || AIX || HPUX || LINUX || OSX) -+#if !(SOLARIS || AIX || HPUX || LINUX || OSX || FreeBSD) - #include <bstring.h> - #endif - #include <limits.h> /* USHRT_MAX */ -@@ -57,7 +57,7 @@ - /* ----- */ - /* Types */ - /* ----- */ --#if !(IRIX || SOLARIS || AIX || HPUX || LINUX || OSX) -+#if !(IRIX || SOLARIS || AIX || HPUX || LINUX || OSX || FreeBSD) - /* SGI defines these in <netinet/in.h> */ - typedef unsigned long in_addr_t; /* An IP number */ - typedef unsigned short in_port_t; /* A port number */ -@@ -231,7 +231,7 @@ - #if (AIX) - nd = sd + 1; - #endif --#if (SOLARIS || HPUX || OSX) -+#if (SOLARIS || HPUX || OSX || FreeBSD) - nd = FD_SETSIZE; - #endif - for (;;) { diff --git a/benchmarks/xdd/files/patch-xdd.c b/benchmarks/xdd/files/patch-xdd.c deleted file mode 100644 index 6b39d23a4f9d..000000000000 --- a/benchmarks/xdd/files/patch-xdd.c +++ /dev/null @@ -1,74 +0,0 @@ ---- xdd.c.orig Mon May 29 04:06:49 2006 -+++ xdd.c Mon May 29 04:24:54 2006 -@@ -60,7 +60,7 @@ - /* Things used by the read-after-write operations */ - #if (IRIX || SOLARIS || HPUX || AIX || ALTIX) - struct stat64 statbuf; --#elif (LINUX || OSX) -+#elif (LINUX || OSX || FreeBSD) - struct stat statbuf; - #endif - int64_t prev_loc; /* The previous location from a read-after-write message from the writer */ -@@ -114,11 +114,11 @@ - sleep_time_dw = (int32_t)(p->start_delay/BILLION); - #ifdef WIN32 - Sleep(sleep_time_dw); --#elif (LINUX || IRIX || AIX || ALTIX || OSX) /* Add OS Support to this line for usleep() */ -+#elif (LINUX || IRIX || AIX || ALTIX || OSX || FreeBSD) /* Add OS Support to this line for usleep() */ - if ((sleep_time_dw*CLK_TCK) > 1000) /* only sleep if it will be 1 or more ticks */ - #if (IRIX || ALTIX) - sginap((sleep_time_dw*CLK_TCK)/1000); --#elif (LINUX || AIX || OSX) /* Add OS Support to this line for usleep() as well*/ -+#elif (LINUX || AIX || OSX || FreeBSD) /* Add OS Support to this line for usleep() as well*/ - usleep(sleep_time_dw*1000); - #endif - #endif -@@ -384,14 +384,14 @@ - p->my_current_byte_location = (uint64_t)((p->mynum * xgp->target_offset) + p->seekhdr.seeks[0].block_location) * p->block_size; - else p->my_current_byte_location = (uint64_t)((p->mynum * xgp->target_offset) + p->seekhdr.seeks[current_op].block_location) * p->block_size; - --#if (LINUX || IRIX || SOLARIS || HPUX || AIX || ALTIX || OSX) -+#if (LINUX || IRIX || SOLARIS || HPUX || AIX || ALTIX || OSX || FreeBSD) - if ((p->target_options & RX_READAFTERWRITE) && (p->target_options & RX_RAW_READER)) { - // fprintf(stderr,"Reader: RAW check - dataready=%lld, trigger=%x\n",data_ready,p->raw_trigger); - /* Check to see if we can read more data - if not see where we are at */ - if (p->raw_trigger & RX_RAW_STAT) { /* This section will continually poll the file status waiting for the size to increase so that it can read more data */ - while (data_ready < p->iosize) { - /* Stat the file so see if there is data to read */ --#if (LINUX || OSX) -+#if (LINUX || OSX || FreeBSD) - status = fstat(p->fd,&statbuf); - #else - status = fstat64(p->fd,&statbuf); -@@ -472,11 +472,11 @@ - sleep_time_dw = sleep_time; - #ifdef WIN32 - Sleep(sleep_time_dw); --#elif (LINUX || IRIX || AIX || ALTIX || OSX) /* Change this line to use usleep */ -+#elif (LINUX || IRIX || AIX || ALTIX || OSX || FreeBSD) /* Change this line to use usleep */ - if ((sleep_time_dw*CLK_TCK) > 1000) /* only sleep if it will be 1 or more ticks */ - #if (IRIX || ALTIX) - sginap((sleep_time_dw*CLK_TCK)/1000); --#elif (LINUX || AIX || OSX) /* Change this line to use usleep */ -+#elif (LINUX || AIX || OSX || FreeBSD) /* Change this line to use usleep */ - usleep(sleep_time_dw*1000); - #endif - #endif -@@ -564,7 +564,7 @@ - #else /* UUUUUUUUUUUUUUUU Begin Unix stuff UUUUUUUUUUUUUUUUU*/ - #if (IRIX || SOLARIS || HPUX || AIX || ALTIX) - lseek64(p->fd,(off64_t)p->my_current_byte_location,0); --#elif (LINUX || OSX) -+#elif (LINUX || OSX || FreeBSD) - /* In Linux the -D_FILE_OFFSET_BITS=64 make the off_t type be a 64-bit integer */ - if (!p->target_options & RX_SGIO) - lseek(p->fd, (off_t)p->my_current_byte_location, SEEK_SET); -@@ -653,7 +653,7 @@ - } - } - --#if (LINUX || IRIX || SOLARIS || HPUX || AIX || ALTIX || OSX) -+#if (LINUX || IRIX || SOLARIS || HPUX || AIX || ALTIX || OSX || FreeBSD) - if ((p->target_options & RX_READAFTERWRITE) && (p->target_options & RX_RAW_WRITER)) { - /* Since I am the writer in a read-after-write operation, and if we are using a socket connection to the reader for write-completion messages - * then I need to send the reader a message of what I just wrote - starting location and length of write. diff --git a/benchmarks/xdd/files/patch-xdd.h b/benchmarks/xdd/files/patch-xdd.h deleted file mode 100644 index 91fa36b6428f..000000000000 --- a/benchmarks/xdd/files/patch-xdd.h +++ /dev/null @@ -1,72 +0,0 @@ ---- xdd.h.orig Mon Dec 19 03:13:28 2005 -+++ xdd.h Mon May 29 04:45:14 2006 -@@ -46,7 +46,7 @@ - #include <sys/ipc.h> - #include <sys/sem.h> - #include <sys/times.h> --#if !(SOLARIS || HPUX || AIX || OSX) -+#if !(SOLARIS || HPUX || AIX || OSX || FreeBSD) - #include <sys/prctl.h> - #endif - #include <sys/param.h> -@@ -68,6 +68,11 @@ - #include <sys/procset.h> - #include <sys/utsname.h> - #endif -+#ifdef FreeBSD -+#include <inttypes.h> -+#include <sys/types.h> -+#include <sys/unistd.h> -+#endif - #ifdef AIX - #include <sys/processor.h> - #include <ulimit.h> -@@ -90,7 +95,7 @@ - #include <sys/utsname.h> - #endif - /* for the global clock stuff */ --#if (LINUX || AIX || IRIX || SOLARIS || HPUX || ALTIX || OSX) -+#if (LINUX || AIX || IRIX || SOLARIS || HPUX || ALTIX || OSX || FreeBSD) - #include <netdb.h> - #include <sys/socket.h> - #include <netinet/in.h> -@@ -197,7 +202,7 @@ - #ifdef HPUX - typedef unsigned short in_port_t; - #endif --#if (LINUX || SOLARIS || HPUX || AIX || OSX) -+#if (LINUX || SOLARIS || HPUX || AIX || OSX || FreeBSD) - #define MP_MUSTRUN 1 /* ASsign this thread to a specific processor */ - #define MP_NPROCS 2 /* return the number of processors on the system */ - typedef int sd_t; /* A socket descriptor */ -@@ -290,8 +295,13 @@ - #define RX_SHARED_MEMORY 0x020000000 /* Use a shared memory segment instead of malloced memmory */ - #define RX_VERBOSE 0x040000000 /* Verbose output */ - #define RX_SEQUENCED_PATTERN 0x080000000 /* Sequenced Data Pattern in the data buffer */ -+#if (FreeBSD) -+#define RX_NOMEMLOCK 0x100000000LL /* Do not lock memory */ -+#define RX_NOPROCLOCK 0x200000000LL /* Do not lock process */ -+#else - #define RX_NOMEMLOCK 0x100000000 /* Do not lock memory */ - #define RX_NOPROCLOCK 0x200000000 /* Do not lock process */ -+#endif - /* ts_options bit settings */ - #define TS_NORMALIZE 0x00000001 /* Time stamping normalization of output*/ - #define TS_ON 0x00000002 /* Time stamping is ON */ -@@ -330,14 +340,14 @@ - /* XXX *//* This needs to be converted to use a config file */ - /* Default flag values */ - #define DFL_FL_SERVER false /* Client by default */ --#if (LINUX || AIX || IRIX || SOLARIS || HPUX || ALTIX) -+#if (LINUX || AIX || IRIX || SOLARIS || HPUX || ALTIX || FreeBSD) - #define DFL_FL_ADDR INADDR_ANY /* Any address */ /* server only */ - #else /* Windows */ - #define DFL_FL_ADDR 0x8065b61b /* crystal 128.101.182.27 */ - #endif - #define DFL_FL_PORT 2000 /* Port to use */ - #define DFL_FL_COUNT 10 /* Bounce a hundred times */ --#if (LINUX || AIX || IRIX || SOLARIS || HPUX || ALTIX || OSX) -+#if (LINUX || AIX || IRIX || SOLARIS || HPUX || ALTIX || OSX || FreeBSD) - #define DFL_FL_TIME 99160##000000000000LL /* Zero means don't wait */ - #else - #define DFL_FL_TIME 99160##000000000000I64 /* Zero means don't wait */ diff --git a/benchmarks/xdd/pkg-descr b/benchmarks/xdd/pkg-descr deleted file mode 100644 index 07d3c01fda52..000000000000 --- a/benchmarks/xdd/pkg-descr +++ /dev/null @@ -1,16 +0,0 @@ -From the Xdd User's Guide: - -About xdd - -Xdd is a tool for measuring and characterizing disk subsystem I/O -on single systems and clusters of systems. It is a command-line -based tool that grew out of the UNIX world and has been ported to -run in Windows environments as well. It is designed to provide -consistent and reproducible performance measurements of disk I/O -traffic. There are three basic components to xdd that include the -xdd program itself, a timeserver program, and a gettime program. -The timeserver and gettime programs are used to synchronize the -clocks of xdd programs simultaneously running across multiple -computer systems. - -WWW: http://www.ioperformance.com/ |