svn commit: r419178 - in head/benchmarks: bonnie++/files bonnie/files clpeak/files dbench/files dbs/files dkftpbench/files filebench/files himenobench/files imb/files iorate/files iozone21/files ip...
Mathieu Arnold
mat at FreeBSD.org
Wed Jul 27 15:09:18 UTC 2016
Author: mat
Date: Wed Jul 27 15:09:11 2016
New Revision: 419178
URL: https://svnweb.freebsd.org/changeset/ports/419178
Log:
Cleanup patches, category benchmarks
Rename them to follow the make makepatch naming, and regenerate them.
With hat: portmgr
Sponsored by: Absolight
Added:
head/benchmarks/bonnie++/files/patch-zcav__io.cpp
- copied, changed from r419177, head/benchmarks/bonnie++/files/patch-zcav_io.cpp
head/benchmarks/dbs/files/patch-src_tcp__trace.c
- copied, changed from r419177, head/benchmarks/dbs/files/patch-src_tcp_trace.c
head/benchmarks/imb/files/patch-IMB__declare.h
- copied, changed from r419177, head/benchmarks/imb/files/patch-src-IMB_declare.h
head/benchmarks/imb/files/patch-make__mpich
- copied, changed from r419177, head/benchmarks/imb/files/patch-src-make_mpich
head/benchmarks/iorate/files/patch-ior__mach.c
- copied, changed from r419177, head/benchmarks/iorate/files/patch-ior_mach.c
head/benchmarks/iorate/files/patch-ior__mach.h
- copied, changed from r419177, head/benchmarks/iorate/files/patch-ior_mach.h
head/benchmarks/iperf/files/patch-src_Client.cpp
- copied, changed from r419177, head/benchmarks/iperf/files/patch-src__Client.cpp
head/benchmarks/libmicro/files/patch-cascade__cond.c
- copied, changed from r419177, head/benchmarks/libmicro/files/patch-cascade_cond.c
head/benchmarks/libmicro/files/patch-cascade__mutex.c
- copied, changed from r419177, head/benchmarks/libmicro/files/patch-cascade_mutex.c
head/benchmarks/libmicro/files/patch-mmap.c
- copied, changed from r419177, head/benchmarks/libmicro/files/patch-mmpa.c
head/benchmarks/lmbench/files/patch-results_Makefile
- copied, changed from r419177, head/benchmarks/lmbench/files/patch-results__Makefile
head/benchmarks/lmbench/files/patch-scripts_config-run
- copied, changed from r419177, head/benchmarks/lmbench/files/patch-scripts__config-run
head/benchmarks/lmbench/files/patch-scripts_getpercent
- copied, changed from r419177, head/benchmarks/lmbench/files/patch-scripts__getpercent
head/benchmarks/lmbench/files/patch-src_Makefile
- copied, changed from r419177, head/benchmarks/lmbench/files/patch-src__Makefile
head/benchmarks/netperf/files/patch-doc_examples_arr__script
- copied, changed from r419177, head/benchmarks/netperf/files/patch-arr_script
head/benchmarks/netperf/files/patch-doc_examples_bloat.sh
- copied, changed from r419177, head/benchmarks/netperf/files/patch-bloat.sh
head/benchmarks/netperf/files/patch-doc_examples_packet__byte__script
- copied, changed from r419177, head/benchmarks/netperf/files/patch-packet_byte_script
head/benchmarks/netperf/files/patch-doc_examples_runemomni.sh
- copied, changed from r419177, head/benchmarks/netperf/files/patch-runemomni.sh
head/benchmarks/netperf/files/patch-doc_examples_runemomniagg2.sh
- copied, changed from r419177, head/benchmarks/netperf/files/patch-runemomniagg2.sh
head/benchmarks/netperf/files/patch-doc_examples_runemomniaggdemo.sh
- copied, changed from r419177, head/benchmarks/netperf/files/patch-runemomniaggdemo.sh
head/benchmarks/netperf/files/patch-doc_examples_sctp__stream__script
- copied, changed from r419177, head/benchmarks/netperf/files/patch-sctp_stream_script
head/benchmarks/netperf/files/patch-doc_examples_snapshot__script
- copied, changed from r419177, head/benchmarks/netperf/files/patch-snapshot_script
head/benchmarks/netperf/files/patch-doc_examples_tcp__range__script
- copied, changed from r419177, head/benchmarks/netperf/files/patch-tcp_range_script
head/benchmarks/netperf/files/patch-doc_examples_tcp__rr__script
- copied, changed from r419177, head/benchmarks/netperf/files/patch-tcp_rr_script
head/benchmarks/netperf/files/patch-doc_examples_tcp__stream__script
- copied, changed from r419177, head/benchmarks/netperf/files/patch-tcp_stream_script
head/benchmarks/netperf/files/patch-doc_examples_udp__rr__script
- copied, changed from r419177, head/benchmarks/netperf/files/patch-udp_rr_script
head/benchmarks/netperf/files/patch-doc_examples_udp__stream__script
- copied, changed from r419177, head/benchmarks/netperf/files/patch-udp_stream_script
head/benchmarks/netperf/files/patch-doc_netperf.man
- copied, changed from r419177, head/benchmarks/netperf/files/patch-netperf.man
head/benchmarks/netperf/files/patch-src_dscp.c
- copied, changed from r419177, head/benchmarks/netperf/files/patch-dscp.c
head/benchmarks/netperf/files/patch-src_netcpu__sysctl.c
- copied, changed from r419177, head/benchmarks/netperf/files/patch-netcpu_sysctl.c
head/benchmarks/netperf/files/patch-src_nettest__unix.c
- copied, changed from r419177, head/benchmarks/netperf/files/patch-nettest_unix.c
head/benchmarks/netpipe/files/patch-dox_netpipe.1
- copied, changed from r419177, head/benchmarks/netpipe/files/patch-dox-netpipe.1
head/benchmarks/smhasher/files/patch-Platform.cpp
- copied, changed from r419177, head/benchmarks/smhasher/files/patch-smhasher-Platform.cpp
head/benchmarks/smhasher/files/patch-Platform.h
- copied, changed from r419177, head/benchmarks/smhasher/files/patch-smhasher-Platform.h
head/benchmarks/super-smack/files/patch-src_query.cc
- copied, changed from r419177, head/benchmarks/super-smack/files/patch-query.cc
head/benchmarks/ubench/files/patch-cpubench.c
- copied, changed from r419177, head/benchmarks/ubench/files/patch-timeout-cpubench.c
head/benchmarks/ubench/files/patch-diskbench.c
- copied, changed from r419177, head/benchmarks/ubench/files/patch-timeout-diskbench.c
head/benchmarks/ubench/files/patch-membench.c
- copied, changed from r419177, head/benchmarks/ubench/files/patch-timeout-membench.c
head/benchmarks/ubench/files/patch-netbench.c
- copied, changed from r419177, head/benchmarks/ubench/files/patch-timeout-netbench.c
head/benchmarks/ubench/files/patch-ubench.c
- copied, changed from r419177, head/benchmarks/ubench/files/patch-timeout-ubench.c
Deleted:
head/benchmarks/bonnie++/files/patch-zcav_io.cpp
head/benchmarks/dbs/files/patch-src_tcp_trace.c
head/benchmarks/imb/files/patch-src-IMB_declare.h
head/benchmarks/imb/files/patch-src-make_mpich
head/benchmarks/iorate/files/patch-ior_mach.c
head/benchmarks/iorate/files/patch-ior_mach.h
head/benchmarks/iperf/files/patch-src__Client.cpp
head/benchmarks/libmicro/files/patch-cascade_cond.c
head/benchmarks/libmicro/files/patch-cascade_mutex.c
head/benchmarks/libmicro/files/patch-mmpa.c
head/benchmarks/lmbench/files/patch-results__Makefile
head/benchmarks/lmbench/files/patch-scripts__config-run
head/benchmarks/lmbench/files/patch-scripts__getpercent
head/benchmarks/lmbench/files/patch-src__Makefile
head/benchmarks/netperf/files/patch-arr_script
head/benchmarks/netperf/files/patch-bloat.sh
head/benchmarks/netperf/files/patch-dscp.c
head/benchmarks/netperf/files/patch-netcpu_sysctl.c
head/benchmarks/netperf/files/patch-netperf.man
head/benchmarks/netperf/files/patch-nettest_unix.c
head/benchmarks/netperf/files/patch-packet_byte_script
head/benchmarks/netperf/files/patch-runemomni.sh
head/benchmarks/netperf/files/patch-runemomniagg2.sh
head/benchmarks/netperf/files/patch-runemomniaggdemo.sh
head/benchmarks/netperf/files/patch-sctp_stream_script
head/benchmarks/netperf/files/patch-snapshot_script
head/benchmarks/netperf/files/patch-tcp_range_script
head/benchmarks/netperf/files/patch-tcp_rr_script
head/benchmarks/netperf/files/patch-tcp_stream_script
head/benchmarks/netperf/files/patch-udp_rr_script
head/benchmarks/netperf/files/patch-udp_stream_script
head/benchmarks/netpipe/files/patch-dox-netpipe.1
head/benchmarks/smhasher/files/patch-smhasher-Platform.cpp
head/benchmarks/smhasher/files/patch-smhasher-Platform.h
head/benchmarks/super-smack/files/patch-query.cc
head/benchmarks/ubench/files/patch-timeout-cpubench.c
head/benchmarks/ubench/files/patch-timeout-diskbench.c
head/benchmarks/ubench/files/patch-timeout-membench.c
head/benchmarks/ubench/files/patch-timeout-netbench.c
head/benchmarks/ubench/files/patch-timeout-ubench.c
Modified:
head/benchmarks/bonnie++/files/patch-Makefile.in
head/benchmarks/bonnie++/files/patch-bonnie++.cpp
head/benchmarks/bonnie++/files/patch-bonnie.h.in
head/benchmarks/bonnie++/files/patch-duration.cpp
head/benchmarks/bonnie++/files/patch-port.h.in
head/benchmarks/bonnie++/files/patch-rand.h
head/benchmarks/bonnie++/files/patch-zcav.8
head/benchmarks/bonnie++/files/patch-zcav.cpp
head/benchmarks/bonnie/files/patch-Bonnie.c
head/benchmarks/clpeak/files/patch-src_include_common.h
head/benchmarks/dbench/files/patch-Makefile.in
head/benchmarks/dbench/files/patch-dbench.c
head/benchmarks/dbs/files/patch-src_Makefile
head/benchmarks/dbs/files/patch-src_dbsc.c
head/benchmarks/dbs/files/patch-src_dbsd.c
head/benchmarks/dbs/files/patch-src_record.h
head/benchmarks/dbs/files/patch-src_scan.c
head/benchmarks/dbs/files/patch-src_sendrecv.c
head/benchmarks/dkftpbench/files/patch-Makefile.in
head/benchmarks/dkftpbench/files/patch-Platoon.cc
head/benchmarks/filebench/files/patch-parser__gram.c
head/benchmarks/himenobench/files/patch-himenobmtxp__l.f
head/benchmarks/himenobench/files/patch-himenobmtxp__m.f
head/benchmarks/himenobench/files/patch-himenobmtxp__s.f
head/benchmarks/himenobench/files/patch-himenobmtxp__xl.f
head/benchmarks/himenobench/files/patch-himenobmtxps.c
head/benchmarks/iozone21/files/patch-Makefile
head/benchmarks/libmicro/files/patch-Makefile
head/benchmarks/libmicro/files/patch-Makefile.FreeBSD
head/benchmarks/libmicro/files/patch-bench.sh
head/benchmarks/libmicro/files/patch-getcontext.c
head/benchmarks/libmicro/files/patch-getrusage.c
head/benchmarks/libmicro/files/patch-libmicro.c
head/benchmarks/libmicro/files/patch-longjmp.c
head/benchmarks/libmicro/files/patch-msync.c
head/benchmarks/libmicro/files/patch-multiview.sh
head/benchmarks/libmicro/files/patch-mutex.c
head/benchmarks/libmicro/files/patch-setcontext.c
head/benchmarks/libmicro/files/patch-siglongjmp.c
head/benchmarks/libmicro/files/patch-writev.c
head/benchmarks/netio/files/patch-Makefile
head/benchmarks/netio/files/patch-netio.c
head/benchmarks/netperf/files/patch-configure
head/benchmarks/nttcp/files/patch-Makefile
head/benchmarks/phoronix-test-suite/files/patch-install-sh
head/benchmarks/postal/files/patch-basictcp.cpp
head/benchmarks/postal/files/patch-basictcp.h
head/benchmarks/postal/files/patch-bhm.cpp
head/benchmarks/postal/files/patch-bhmusers.cpp
head/benchmarks/postal/files/patch-bhmusers.h
head/benchmarks/postal/files/patch-postal.cpp
head/benchmarks/postal/files/patch-rabid.cpp
head/benchmarks/postal/files/patch-smtp.cpp
head/benchmarks/postal/files/patch-smtp.h
head/benchmarks/postal/files/patch-tcp.cpp
head/benchmarks/postal/files/patch-tcp.h
head/benchmarks/ramspeed/files/patch-build.sh
head/benchmarks/randomio/files/patch-Makefile
head/benchmarks/scimark2c/files/patch-Makefile
head/benchmarks/scimark2c/files/patch-scimark2.c
head/benchmarks/siege/files/patch-Makefile.am
head/benchmarks/siege/files/patch-configure.ac
head/benchmarks/siege/files/patch-src_init.c
head/benchmarks/siege/files/patch-src_sock.c
head/benchmarks/spp/files/patch-Makefile
head/benchmarks/stress-ng/files/patch-stress-cpu.c
head/benchmarks/super-smack/files/patch-Makefile.in
head/benchmarks/ttcp/files/patch-ttcp.c
Modified: head/benchmarks/bonnie++/files/patch-Makefile.in
==============================================================================
--- head/benchmarks/bonnie++/files/patch-Makefile.in Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/bonnie++/files/patch-Makefile.in Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2008-12-30 22:04:25.000000000 +0100
-+++ Makefile.in 2013-11-05 05:59:48.000000000 +0100
-@@ -9,7 +9,7 @@
+--- Makefile.in.orig 2008-12-30 21:04:25 UTC
++++ Makefile.in
+@@ -9,7 +9,7 @@ prefix=@prefix@
eprefix=@exec_prefix@
#MORE_WARNINGS=-Weffc++
WFLAGS=-Wall -W -Wshadow -Wpointer-arith -Wwrite-strings -pedantic -ffor-scope -Wcast-align -Wsign-compare -Wpointer-arith -Wwrite-strings -Wformat-security -Wswitch-enum -Winit-self $(MORE_WARNINGS)
@@ -9,7 +9,7 @@
CXX=@CXX@ $(CFLAGS)
LINK=@CXX@
THREAD_LFLAGS=@thread_ldflags@
-@@ -52,15 +52,15 @@
+@@ -52,15 +52,15 @@ generate_randfile: generate_randfile.o
$(LINK) generate_randfile.o -o generate_randfile
install-bin: $(EXE) $(EXES)
Modified: head/benchmarks/bonnie++/files/patch-bonnie++.cpp
==============================================================================
--- head/benchmarks/bonnie++/files/patch-bonnie++.cpp Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/bonnie++/files/patch-bonnie++.cpp Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,6 +1,6 @@
---- bonnie++.cpp.orig 2009-07-03 04:38:14.000000000 +0200
-+++ bonnie++.cpp 2014-05-10 12:04:25.000000000 +0200
-@@ -73,7 +73,7 @@
+--- bonnie++.cpp.orig 2009-07-03 02:38:14 UTC
++++ bonnie++.cpp
+@@ -73,7 +73,7 @@ public:
void set_io_chunk_size(int size)
{ delete m_buf; pa_new(size, m_buf, m_buf_pa); m_io_chunk_size = size; }
void set_file_chunk_size(int size)
@@ -9,7 +9,7 @@
// Return the page-aligned version of the local buffer
char *buf() { return m_buf_pa; }
-@@ -138,7 +138,7 @@
+@@ -138,7 +138,7 @@ CGlobalItems::CGlobalItems(bool *exitFla
, m_buf(NULL)
, m_buf_pa(NULL)
{
@@ -18,7 +18,7 @@
SetName(".");
}
-@@ -294,11 +294,7 @@
+@@ -294,11 +294,7 @@ int main(int argc, char *argv[])
{
char *sbuf = _strdup(optarg);
char *size = strtok(sbuf, ":");
@@ -30,7 +30,7 @@
size = strtok(NULL, "");
if(size)
{
-@@ -384,17 +380,8 @@
+@@ -384,17 +380,8 @@ int main(int argc, char *argv[])
if(file_size % 1024 > 512)
file_size = file_size + 1024 - (file_size % 1024);
}
@@ -50,7 +50,7 @@
if(machine == NULL)
{
-@@ -465,14 +452,6 @@
+@@ -465,14 +452,6 @@ int main(int argc, char *argv[])
&& (directory_max_size < directory_min_size || directory_max_size < 0
|| directory_min_size < 0) )
usage();
Modified: head/benchmarks/bonnie++/files/patch-bonnie.h.in
==============================================================================
--- head/benchmarks/bonnie++/files/patch-bonnie.h.in Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/bonnie++/files/patch-bonnie.h.in Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,5 +1,5 @@
---- bonnie.h.in.orig 2009-08-21 18:45:50.068536643 +0000
-+++ bonnie.h.in 2009-08-21 18:45:58.564755017 +0000
+--- bonnie.h.in.orig 2009-07-03 03:39:33 UTC
++++ bonnie.h.in
@@ -1,8 +1,6 @@
#ifndef BONNIE
#define BONNIE
@@ -9,7 +9,7 @@
#define BON_VERSION "@version@"
#define CSV_VERSION "@csv_version@"
-@@ -12,6 +10,8 @@
+@@ -12,6 +10,8 @@ using namespace std;
#include <sys/stat.h>
#include <fcntl.h>
Modified: head/benchmarks/bonnie++/files/patch-duration.cpp
==============================================================================
--- head/benchmarks/bonnie++/files/patch-duration.cpp Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/bonnie++/files/patch-duration.cpp Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,12 +1,12 @@
---- duration.cpp.orig 2008-12-23 23:26:42.000000000 +0100
-+++ duration.cpp 2014-05-10 12:04:40.000000000 +0200
+--- duration.cpp.orig 2008-12-23 22:26:42 UTC
++++ duration.cpp
@@ -1,5 +1,3 @@
-using namespace std;
-
#include <stdlib.h>
#include "duration.h"
-@@ -20,6 +18,8 @@
+@@ -20,6 +18,8 @@ using namespace std;
#endif
#endif
@@ -15,7 +15,7 @@
Duration_Base::Duration_Base()
: m_start(0.0)
, m_max(0.0)
-@@ -38,7 +38,7 @@
+@@ -38,7 +38,7 @@ double Duration_Base::stop()
getTime(&tv);
double ret;
ret = tv - m_start;
Modified: head/benchmarks/bonnie++/files/patch-port.h.in
==============================================================================
--- head/benchmarks/bonnie++/files/patch-port.h.in Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/bonnie++/files/patch-port.h.in Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,5 +1,5 @@
---- port.h.in.orig 2008-12-24 01:16:16.000000000 +0100
-+++ port.h.in 2014-05-10 12:05:20.000000000 +0200
+--- port.h.in.orig 2008-12-24 00:16:16 UTC
++++ port.h.in
@@ -4,12 +4,12 @@
#include "conf.h"
@@ -33,7 +33,7 @@
#if @true_false@
#define false 0
-@@ -49,8 +42,6 @@
+@@ -49,8 +42,6 @@ typedef struct timeval TIMEVAL_TYPE;
#endif
typedef int FILE_TYPE;
Modified: head/benchmarks/bonnie++/files/patch-rand.h
==============================================================================
--- head/benchmarks/bonnie++/files/patch-rand.h Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/bonnie++/files/patch-rand.h Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,5 +1,5 @@
---- rand.h.orig 2009-08-21 18:45:50.068536643 +0000
-+++ rand.h 2009-08-21 18:45:58.564755017 +0000
+--- rand.h.orig 2003-01-08 19:52:53 UTC
++++ rand.h
@@ -1,11 +1,11 @@
#ifndef RAND_H
#define RAND_H
Modified: head/benchmarks/bonnie++/files/patch-zcav.8
==============================================================================
--- head/benchmarks/bonnie++/files/patch-zcav.8 Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/bonnie++/files/patch-zcav.8 Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,6 +1,6 @@
---- zcav.8.orig 2009-08-21 07:13:21.319089995 +0000
-+++ zcav.8 2009-08-21 07:14:03.189181585 +0000
-@@ -95,6 +95,9 @@
+--- zcav.8.orig 2012-11-23 07:27:16 UTC
++++ zcav.8
+@@ -95,6 +95,9 @@ programs.
.B \-w
write zero blocks to the disk instead of reading from the disk - will destroy data!
Modified: head/benchmarks/bonnie++/files/patch-zcav.cpp
==============================================================================
--- head/benchmarks/bonnie++/files/patch-zcav.cpp Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/bonnie++/files/patch-zcav.cpp Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,6 +1,6 @@
---- zcav.cpp.orig 2009-08-24 07:31:32.060913886 +0000
-+++ zcav.cpp 2009-08-24 07:33:16.257389975 +0000
-@@ -15,9 +15,7 @@
+--- zcav.cpp.orig 2012-11-23 07:26:19 UTC
++++ zcav.cpp
+@@ -15,9 +15,7 @@ void usage()
, "Usage: zcav [-b block-size[:chunk-size]] [-c count]\n"
" [-r [start offset:]end offset] [-w]\n"
" [-u uid-to-use:gid-to-use] [-g gid-to-use]\n"
@@ -10,7 +10,7 @@
" [-l log-file] [-f] file-name\n"
" [-l log-file [-f] file-name]...\n"
"\n"
-@@ -186,9 +184,7 @@
+@@ -186,9 +184,7 @@ int main(int argc, char *argv[])
const char *log = "-";
const char *file = "";
while(-1 != (c = getopt(argc, argv, "-c:b:f:l:r:w"
@@ -20,7 +20,7 @@
"u:g:")) )
{
switch(char(c))
-@@ -225,11 +221,9 @@
+@@ -225,11 +221,9 @@ int main(int argc, char *argv[])
}
}
break;
Copied and modified: head/benchmarks/bonnie++/files/patch-zcav__io.cpp (from r419177, head/benchmarks/bonnie++/files/patch-zcav_io.cpp)
==============================================================================
--- head/benchmarks/bonnie++/files/patch-zcav_io.cpp Wed Jul 27 15:05:03 2016 (r419177, copy source)
+++ head/benchmarks/bonnie++/files/patch-zcav__io.cpp Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,6 +1,6 @@
---- zcav_io.cpp.orig 2009-08-24 07:36:02.677798155 +0000
-+++ zcav_io.cpp 2009-08-24 07:36:40.688614055 +0000
-@@ -83,7 +83,6 @@
+--- zcav_io.cpp.orig 2012-11-23 07:34:43 UTC
++++ zcav_io.cpp
+@@ -83,7 +83,6 @@ int ZcavRead::Read(int max_loops, int ma
for(int loops = 0; !exiting && loops < max_loops; loops++)
{
int i = 0;
@@ -8,7 +8,7 @@
if(start_offset)
{
OFF_TYPE real_offset = OFF_TYPE(start_offset) * OFF_TYPE(m_block_size) * OFF_TYPE(1<<20);
-@@ -96,7 +95,6 @@
+@@ -96,7 +95,6 @@ int ZcavRead::Read(int max_loops, int ma
i = start_offset;
}
else
@@ -16,7 +16,7 @@
if(lseek(m_fd, 0, SEEK_SET))
{
fprintf(stderr, "Can't lseek().\n");
-@@ -224,14 +222,12 @@
+@@ -224,14 +222,12 @@ ssize_t ZcavRead::access_all(int count)
// Read/write a block of data
double ZcavRead::access_data(int skip)
{
Modified: head/benchmarks/bonnie/files/patch-Bonnie.c
==============================================================================
--- head/benchmarks/bonnie/files/patch-Bonnie.c Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/bonnie/files/patch-Bonnie.c Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,5 +1,5 @@
---- Bonnie.c.orig 1996-08-29 01:23:49.000000000 +0900
-+++ Bonnie.c 2009-08-21 23:05:39.000000000 +0900
+--- Bonnie.c.orig 1996-08-28 16:23:49 UTC
++++ Bonnie.c
@@ -25,6 +25,9 @@
#include <unistd.h>
@@ -19,7 +19,7 @@
/* labels for the tests, used as an array index */
typedef enum
-@@ -87,7 +90,7 @@
+@@ -87,7 +90,7 @@ static double delta[(int) TestCount][2];
static double last_cpustamp = 0.0; /* for computing delta-t */
static double last_timestamp = 0.0; /* for computing delta-t */
@@ -28,7 +28,7 @@
int argc,
char * argv[])
{
-@@ -146,7 +149,7 @@
+@@ -146,7 +149,7 @@ main(
/* size is in meg, rounded down to multiple of Chunk */
size *= (1024 * 1024);
size = Chunk * (size / Chunk);
@@ -37,7 +37,7 @@
/* Fill up a file, writing it a char at a time with the stdio putc() call */
fprintf(stderr, "Writing with putc()...");
-@@ -167,7 +170,7 @@
+@@ -167,7 +170,7 @@ main(
/* Now read & rewrite it using block I/O. Dirty one word in each block */
newfile(name, &fd, &stream, 0);
@@ -46,7 +46,7 @@
io_error("lseek(2) before rewrite");
fprintf(stderr, "Rewriting...");
timestamp();
-@@ -179,7 +182,7 @@
+@@ -179,7 +182,7 @@ main(
if (bufindex == Chunk / IntSize)
bufindex = 0;
buf[bufindex++]++;
@@ -55,7 +55,7 @@
io_error("relative lseek(2)");
if (write(fd, (char *) buf, words) == -1)
io_error("re write(2)");
-@@ -235,7 +238,7 @@
+@@ -235,7 +238,7 @@ main(
/* Now suck it in, Chunk at a time, as fast as we can */
newfile(name, &fd, &stream, 0);
@@ -64,7 +64,7 @@
io_error("lseek before read");
fprintf(stderr, "Reading intelligently...");
timestamp();
-@@ -288,6 +291,7 @@
+@@ -288,6 +291,7 @@ main(
{ /* child process */
/* set up and wait for the go-ahead */
@@ -72,7 +72,7 @@
close(seek_feedback[0]);
close(seek_control[1]);
newfile(name, &fd, &stream, 0);
-@@ -303,7 +307,12 @@
+@@ -303,7 +307,12 @@ main(
/* loop until we read a 0 ticket back from our parent */
while(seek_tickets[0])
{ /* until Mom says stop */
@@ -86,7 +86,7 @@
((lseek_count++ % UpdateSeek) == 0));
if (read(seek_control[0], seek_tickets, 1) != 1)
io_error("read ticket");
-@@ -413,7 +422,7 @@
+@@ -413,7 +422,7 @@ report(
printf("K/sec %%CPU K/sec %%CPU K/sec %%CPU K/sec %%CPU K/sec ");
printf("%%CPU /sec %%CPU\n");
@@ -95,7 +95,7 @@
printf("%5d %4.1f %5d %4.1f %5d %4.1f ",
(int) (((double) size) / (delta[(int) Putc][Elapsed] * 1024.0)),
delta[(int) Putc][CPU] / delta[(int) Putc][Elapsed] * 100.0,
-@@ -529,7 +538,10 @@
+@@ -529,7 +538,10 @@ io_error(char * message)
{
char buf[Chunk];
@@ -107,7 +107,7 @@
perror(buf);
exit(1);
}
-@@ -557,7 +569,7 @@
+@@ -557,7 +569,7 @@ doseek(
off_t size;
probe = where * Chunk;
@@ -116,7 +116,7 @@
io_error("lseek in doseek");
if ((size = read(fd, (char *) buf, Chunk)) == -1)
io_error("read in doseek");
-@@ -568,7 +580,7 @@
+@@ -568,7 +580,7 @@ doseek(
/* touch a word */
buf[((int) random() % (size/IntSize - 2)) + 1]--;
Modified: head/benchmarks/clpeak/files/patch-src_include_common.h
==============================================================================
--- head/benchmarks/clpeak/files/patch-src_include_common.h Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/clpeak/files/patch-src_include_common.h Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,4 +1,4 @@
---- src/include/common.h.orig 2016-05-28 05:15:40 UTC
+--- src/include/common.h.orig 2015-11-04 06:03:41 UTC
+++ src/include/common.h
@@ -8,13 +8,19 @@
#include <CL/cl.hpp>
Modified: head/benchmarks/dbench/files/patch-Makefile.in
==============================================================================
--- head/benchmarks/dbench/files/patch-Makefile.in Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/dbench/files/patch-Makefile.in Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,6 +1,6 @@
---- ./Makefile.in.orig 2014-06-01 10:35:20.000000000 +0200
-+++ ./Makefile.in 2014-06-01 10:36:46.000000000 +0200
-@@ -32,12 +32,12 @@
+--- Makefile.in.orig 2008-02-18 00:49:25 UTC
++++ Makefile.in
+@@ -32,12 +32,12 @@ tbench_srv: $(SRV_OBJS)
# Careful here: don't install client.txt over itself.
install: all
Modified: head/benchmarks/dbench/files/patch-dbench.c
==============================================================================
--- head/benchmarks/dbench/files/patch-dbench.c Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/dbench/files/patch-dbench.c Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,6 +1,6 @@
---- ./dbench.c.orig 2011-01-07 14:33:29.000000000 +0000
-+++ ./dbench.c 2011-01-07 14:36:43.000000000 +0000
-@@ -304,7 +304,7 @@
+--- dbench.c.orig 2008-02-18 00:49:35 UTC
++++ dbench.c
+@@ -304,7 +304,7 @@ static void create_procs(int nprocs, voi
exit(1);
}
@@ -9,7 +9,7 @@
fn(&children[i*options.clients_per_process], options.loadfile);
_exit(0);
-@@ -334,7 +334,7 @@
+@@ -334,7 +334,7 @@ static void create_procs(int nprocs, voi
exit(1);
}
Modified: head/benchmarks/dbs/files/patch-src_Makefile
==============================================================================
--- head/benchmarks/dbs/files/patch-src_Makefile Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/dbs/files/patch-src_Makefile Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,5 +1,5 @@
---- src/Makefile-- Sat Aug 1 19:13:01 1998
-+++ src/Makefile Sat Aug 1 19:44:49 1998
+--- src/Makefile.orig 1998-06-08 00:25:16 UTC
++++ src/Makefile
@@ -27,10 +27,10 @@
# make install
#
@@ -13,7 +13,7 @@
#CFLAGS =-g # debug
#CFLAGS =-g -DDEBUGMODE
-@@ -51,7 +51,7 @@
+@@ -51,7 +51,7 @@ all:: dbsc dbsd
obj::
(cd ../obj/$(UNAME); make)
@@ -22,7 +22,7 @@
dir::
-@ mkdir ../obj
-@ mkdir ../obj/$(UNAME)
-@@ -74,7 +74,7 @@
+@@ -74,7 +74,7 @@ tags::
etags *.c *.h
install::
Modified: head/benchmarks/dbs/files/patch-src_dbsc.c
==============================================================================
--- head/benchmarks/dbs/files/patch-src_dbsc.c Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/dbs/files/patch-src_dbsc.c Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,5 +1,5 @@
---- src/dbsc.c-- Mon Jun 8 00:23:35 1998
-+++ src/dbsc.c Sat Aug 1 19:29:49 1998
+--- src/dbsc.c.orig 1998-06-08 00:23:35 UTC
++++ src/dbsc.c
@@ -51,6 +51,10 @@
#define DBSC
Modified: head/benchmarks/dbs/files/patch-src_dbsd.c
==============================================================================
--- head/benchmarks/dbs/files/patch-src_dbsd.c Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/dbs/files/patch-src_dbsd.c Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,5 +1,5 @@
---- src/dbsd.c.orig Sun Jun 7 19:23:26 1998
-+++ src/dbsd.c Sat Sep 18 17:19:36 1999
+--- src/dbsd.c.orig 1998-06-08 00:23:26 UTC
++++ src/dbsd.c
@@ -51,6 +51,9 @@
#define DBSD
@@ -19,7 +19,7 @@
#include <malloc.h>
#endif
-@@ -1002,8 +1005,13 @@
+@@ -1002,8 +1005,13 @@ struct timeval origin_time;
d[i].snd_max = htonl((int)rt.d[i].td_cb.snd_max);
d[i].snd_cwnd = htonl((int)rt.d[i].td_cb.snd_cwnd);
d[i].snd_ssthresh = htonl((int)rt.d[i].td_cb.snd_ssthresh);
Modified: head/benchmarks/dbs/files/patch-src_record.h
==============================================================================
--- head/benchmarks/dbs/files/patch-src_record.h Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/dbs/files/patch-src_record.h Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,5 +1,5 @@
---- src/record.h.orig 1997-10-13 09:36:38.000000000 +0900
-+++ src/record.h 2012-04-29 03:08:53.000000000 +0900
+--- src/record.h.orig 1997-10-13 00:36:38 UTC
++++ src/record.h
@@ -69,7 +69,9 @@
#include <netinet/tcp.h>
Modified: head/benchmarks/dbs/files/patch-src_scan.c
==============================================================================
--- head/benchmarks/dbs/files/patch-src_scan.c Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/dbs/files/patch-src_scan.c Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,5 +1,5 @@
---- src/scan.c-- Fri Jul 11 00:54:12 1997
-+++ src/scan.c Sat Aug 1 19:33:34 1998
+--- src/scan.c.orig 1997-07-11 00:54:12 UTC
++++ src/scan.c
@@ -49,6 +49,9 @@
* $Author: yukio-m $
*****************************************************************/
Modified: head/benchmarks/dbs/files/patch-src_sendrecv.c
==============================================================================
--- head/benchmarks/dbs/files/patch-src_sendrecv.c Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/dbs/files/patch-src_sendrecv.c Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,5 +1,5 @@
---- src/sendrecv.c-- Mon Oct 13 03:27:19 1997
-+++ src/sendrecv.c Sat Aug 1 19:37:02 1998
+--- src/sendrecv.c.orig 1997-10-13 03:27:19 UTC
++++ src/sendrecv.c
@@ -70,12 +70,12 @@
#define INIT_RECORD() (rdp = rd->d, rd->n=0)
#define INIT_RECORD2() (rdp2 = rd2->d, rd2->n=0)
Copied and modified: head/benchmarks/dbs/files/patch-src_tcp__trace.c (from r419177, head/benchmarks/dbs/files/patch-src_tcp_trace.c)
==============================================================================
--- head/benchmarks/dbs/files/patch-src_tcp_trace.c Wed Jul 27 15:05:03 2016 (r419177, copy source)
+++ head/benchmarks/dbs/files/patch-src_tcp__trace.c Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,6 +1,6 @@
---- src/tcp_trace.c-- Thu Nov 2 23:00:13 2000
-+++ src/tcp_trace.c Thu Nov 2 23:00:33 2000
-@@ -307,7 +307,7 @@
+--- src/tcp_trace.c.orig 1997-05-05 17:02:18 UTC
++++ src/tcp_trace.c
+@@ -307,7 +307,7 @@ int act, flg;
#ifdef _PATH_UNIX
system = _PATH_UNIX;
#else
Modified: head/benchmarks/dkftpbench/files/patch-Makefile.in
==============================================================================
--- head/benchmarks/dkftpbench/files/patch-Makefile.in Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/dkftpbench/files/patch-Makefile.in Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2002-07-31 19:00:13.000000000 +0400
-+++ Makefile.in 2015-09-08 20:28:30.951369000 +0300
-@@ -92,19 +92,6 @@
+--- Makefile.in.orig 2002-07-31 15:00:13 UTC
++++ Makefile.in
+@@ -92,19 +92,6 @@ HAND_TESTS = \
# Real programs
bin_PROGRAMS = dkftpbench
@@ -20,7 +20,7 @@
# No info yet
info_TEXINFOS =
-@@ -828,7 +815,7 @@
+@@ -828,7 +815,7 @@ installcheck: installcheck-am
install-exec-am: install-libLIBRARIES install-binPROGRAMS
install-exec: install-exec-am
@@ -29,7 +29,7 @@
install-data: install-data-am
install-am: all-am
-@@ -843,7 +830,7 @@
+@@ -843,7 +830,7 @@ install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs:
$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
Modified: head/benchmarks/dkftpbench/files/patch-Platoon.cc
==============================================================================
--- head/benchmarks/dkftpbench/files/patch-Platoon.cc Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/dkftpbench/files/patch-Platoon.cc Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,5 +1,5 @@
---- Platoon.cc.orig 2007-07-08 09:20:15.000000000 +0400
-+++ Platoon.cc 2007-07-08 09:20:35.000000000 +0400
+--- Platoon.cc.orig 2002-02-15 05:11:46 UTC
++++ Platoon.cc
@@ -1,3 +1,5 @@
+#include <assert.h>
+
Modified: head/benchmarks/filebench/files/patch-parser__gram.c
==============================================================================
--- head/benchmarks/filebench/files/patch-parser__gram.c Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/filebench/files/patch-parser__gram.c Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,4 +1,4 @@
---- parser_gram.c.orig 2010-12-30 21:42:39 UTC
+--- parser_gram.c.orig 2011-09-06 17:22:21 UTC
+++ parser_gram.c
@@ -114,7 +114,7 @@ static GetLine *gl;
/* executable name to execute worker processes later */
Modified: head/benchmarks/himenobench/files/patch-himenobmtxp__l.f
==============================================================================
--- head/benchmarks/himenobench/files/patch-himenobmtxp__l.f Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/himenobench/files/patch-himenobmtxp__l.f Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,4 +1,4 @@
---- himenobmtxp_l.f.orig 2016-06-20 13:01:22 UTC
+--- himenobmtxp_l.f.orig 2016-07-27 14:57:50 UTC
+++ himenobmtxp_l.f
@@ -39,7 +39,6 @@ C -------------------
C "use portlib" statement on the next line is for Visual fortran
Modified: head/benchmarks/himenobench/files/patch-himenobmtxp__m.f
==============================================================================
--- head/benchmarks/himenobench/files/patch-himenobmtxp__m.f Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/himenobench/files/patch-himenobmtxp__m.f Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,4 +1,4 @@
---- himenobmtxp_m.f.orig 2016-06-20 13:01:22 UTC
+--- himenobmtxp_m.f.orig 2016-07-27 14:57:50 UTC
+++ himenobmtxp_m.f
@@ -39,7 +39,6 @@ C -------------------
C "use portlib" statement on the next line is for Visual fortran
Modified: head/benchmarks/himenobench/files/patch-himenobmtxp__s.f
==============================================================================
--- head/benchmarks/himenobench/files/patch-himenobmtxp__s.f Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/himenobench/files/patch-himenobmtxp__s.f Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,4 +1,4 @@
---- himenobmtxp_s.f.orig 2016-06-20 13:01:22 UTC
+--- himenobmtxp_s.f.orig 2016-07-27 14:57:50 UTC
+++ himenobmtxp_s.f
@@ -39,7 +39,6 @@ C -------------------
C "use portlib" statement on the next line is for Visual fortran
Modified: head/benchmarks/himenobench/files/patch-himenobmtxp__xl.f
==============================================================================
--- head/benchmarks/himenobench/files/patch-himenobmtxp__xl.f Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/himenobench/files/patch-himenobmtxp__xl.f Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,4 +1,4 @@
---- himenobmtxp_xl.f.orig 2016-06-20 13:01:22 UTC
+--- himenobmtxp_xl.f.orig 2016-07-27 14:57:50 UTC
+++ himenobmtxp_xl.f
@@ -39,7 +39,6 @@ C -------------------
C "use portlib" statement on the next line is for Visual fortran
Modified: head/benchmarks/himenobench/files/patch-himenobmtxps.c
==============================================================================
--- head/benchmarks/himenobench/files/patch-himenobmtxps.c Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/himenobench/files/patch-himenobmtxps.c Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,4 +1,4 @@
---- himenobmtxps.c.orig 2016-06-20 13:01:22 UTC
+--- himenobmtxps.c.orig 2016-07-27 14:57:50 UTC
+++ himenobmtxps.c
@@ -37,6 +37,7 @@
********************************************************************/
Copied and modified: head/benchmarks/imb/files/patch-IMB__declare.h (from r419177, head/benchmarks/imb/files/patch-src-IMB_declare.h)
==============================================================================
--- head/benchmarks/imb/files/patch-src-IMB_declare.h Wed Jul 27 15:05:03 2016 (r419177, copy source)
+++ head/benchmarks/imb/files/patch-IMB__declare.h Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,6 +1,6 @@
---- IMB_declare.h.orig Sun Nov 19 13:48:20 2006
-+++ IMB_declare.h Sun Nov 19 13:48:36 2006
-@@ -69,7 +69,6 @@
+--- IMB_declare.h.orig 2016-07-27 14:58:51 UTC
++++ IMB_declare.h
+@@ -69,7 +69,6 @@ For more documentation than found here,
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Copied and modified: head/benchmarks/imb/files/patch-make__mpich (from r419177, head/benchmarks/imb/files/patch-src-make_mpich)
==============================================================================
--- head/benchmarks/imb/files/patch-src-make_mpich Wed Jul 27 15:05:03 2016 (r419177, copy source)
+++ head/benchmarks/imb/files/patch-make__mpich Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,5 +1,5 @@
---- make_mpich.orig Thu Jun 22 09:43:10 2006
-+++ make_mpich Sun Nov 19 14:11:11 2006
+--- make_mpich.orig 2016-07-27 14:58:51 UTC
++++ make_mpich
@@ -1,5 +1,5 @@
# Enter root directory of mpich install
-MPI_HOME=
@@ -7,7 +7,7 @@
MPICC=$(shell find ${MPI_HOME} -name mpicc -print)
-@@ -12,7 +12,7 @@
+@@ -12,7 +12,7 @@ endif
LIB_PATH =
LIBS =
CC = ${MPI_HOME}/bin/mpicc
Copied and modified: head/benchmarks/iorate/files/patch-ior__mach.c (from r419177, head/benchmarks/iorate/files/patch-ior_mach.c)
==============================================================================
--- head/benchmarks/iorate/files/patch-ior_mach.c Wed Jul 27 15:05:03 2016 (r419177, copy source)
+++ head/benchmarks/iorate/files/patch-ior__mach.c Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,6 +1,6 @@
---- ior_mach.c_orig 2013-01-27 02:03:38.000000000 +0200
-+++ ior_mach.c 2013-01-27 04:52:47.000000000 +0200
-@@ -411,6 +411,10 @@
+--- ior_mach.c.orig 2011-11-03 15:27:58 UTC
++++ ior_mach.c
+@@ -411,6 +411,10 @@ int ior_dev_lock( ior_config *cfg, long
};
#else
@@ -11,7 +11,7 @@
#ifdef IOR_LARGE_FILES
#define IOR_SET_LOCK_FLAG F_SETLK64
struct flock64 d_lock; /* lock command to run */
-@@ -418,6 +422,7 @@
+@@ -418,6 +422,7 @@ int ior_dev_lock( ior_config *cfg, long
#define IOR_SET_LOCK_FLAG F_SETLK
struct flock d_lock; /* lock command to run */
#endif
@@ -19,7 +19,7 @@
result = 0; /* all OK so far */
-@@ -486,6 +491,10 @@
+@@ -486,6 +491,10 @@ int ior_dev_unlock( ior_config *cfg, lon
};
#else
@@ -30,7 +30,7 @@
#ifdef IOR_LARGE_FILES
#define IOR_SET_LOCK_FLAG F_SETLK64
struct flock64 d_lock; /* lock command to run */
-@@ -493,6 +502,7 @@
+@@ -493,6 +502,7 @@ int ior_dev_unlock( ior_config *cfg, lon
#define IOR_SET_LOCK_FLAG F_SETLK
struct flock d_lock; /* lock command to run */
#endif
Copied and modified: head/benchmarks/iorate/files/patch-ior__mach.h (from r419177, head/benchmarks/iorate/files/patch-ior_mach.h)
==============================================================================
--- head/benchmarks/iorate/files/patch-ior_mach.h Wed Jul 27 15:05:03 2016 (r419177, copy source)
+++ head/benchmarks/iorate/files/patch-ior__mach.h Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,5 +1,5 @@
---- ior_mach.h_orig 2013-01-27 01:03:32.000000000 +0200
-+++ ior_mach.h 2013-01-27 01:53:51.000000000 +0200
+--- ior_mach.h.orig 2011-11-03 15:50:06 UTC
++++ ior_mach.h
@@ -142,7 +142,6 @@
#define IOR_MAX_SEEK (HUGE)(4398046511104LL) /* 4 TB */
#endif
Modified: head/benchmarks/iozone21/files/patch-Makefile
==============================================================================
--- head/benchmarks/iozone21/files/patch-Makefile Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/iozone21/files/patch-Makefile Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,38 +1,36 @@
-*** /dev/null Wed Oct 5 14:46:59 1994
---- Makefile Wed Oct 5 16:03:22 1994
-***************
-*** 0 ****
---- 1,33 ----
-+ all: iozone
-+
-+ iozone:
-+ $(CC) $(CFLAGS) -Dbsd4_3 -DOS_TYPE="\"FreeBSD 2.x\"" -o iozone iozone.c
-+
-+ install:
-+ - at mkdir -p $(DESTDIR)${PREFIX}/bin
-+ - at mkdir -p $(DESTDIR)${PREFIX}/man/man1
-+ ${BSD_INSTALL_PROGRAM} iozone $(DESTDIR)${PREFIX}/bin
-+ @echo .Dd `/bin/date` > iozone.1
-+ @echo .Dt IOZONE 1 >> iozone.1
-+ @echo .Sh NAME >> iozone.1
-+ @echo .Nm iozone >> iozone.1
-+ @echo .Nd Performance Test of Sequential File I/O >> iozone.1
-+ @echo .Sh SYNOPSIS >> iozone.1
-+ @echo .Nm iozone >> iozone.1
-+ @echo .Op Ar megabytes >> iozone.1
-+ @echo .Op Ar record_length_in_bytes >> iozone.1
-+ @echo .Op Ar [path]filename>> iozone.1
-+ @echo .Nm iozone >> iozone.1
-+ @echo .Ar auto[=filename] >> iozone.1
-+ @echo .Nm iozone >> iozone.1
-+ @echo .Ar raw[=filename] >> iozone.1
-+ @echo .Nm iozone >> iozone.1
-+ @echo .Ar cdrom[=filename] >> iozone.1
-+ @echo .Nm iozone >> iozone.1
-+ @echo .Ar help >> iozone.1
-+ @echo .Sh DESCRIPTION >> iozone.1
-+ ./iozone help|awk '{if (/Copyright/) x++} {if (/For V1.06/) exit;}\
-+ {if (x) print $0}' >>iozone.1
-+ @echo .Sh AUTHOR >> iozone.1
-+ @echo Bill Norcott >> iozone.1
-+ ${BSD_INSTALL_MAN} iozone.1 $(DESTDIR)${PREFIX}/man/man1
+--- Makefile.orig 2016-07-27 14:59:13 UTC
++++ Makefile
+@@ -0,0 +1,33 @@
++all: iozone
++
++iozone:
++ $(CC) $(CFLAGS) -Dbsd4_3 -DOS_TYPE="\"FreeBSD 2.x\"" -o iozone iozone.c
++
++install:
++ - at mkdir -p $(DESTDIR)${PREFIX}/bin
++ - at mkdir -p $(DESTDIR)${PREFIX}/man/man1
++ ${BSD_INSTALL_PROGRAM} iozone $(DESTDIR)${PREFIX}/bin
++ @echo .Dd `/bin/date` > iozone.1
++ @echo .Dt IOZONE 1 >> iozone.1
++ @echo .Sh NAME >> iozone.1
++ @echo .Nm iozone >> iozone.1
++ @echo .Nd Performance Test of Sequential File I/O >> iozone.1
++ @echo .Sh SYNOPSIS >> iozone.1
++ @echo .Nm iozone >> iozone.1
++ @echo .Op Ar megabytes >> iozone.1
++ @echo .Op Ar record_length_in_bytes >> iozone.1
++ @echo .Op Ar [path]filename>> iozone.1
++ @echo .Nm iozone >> iozone.1
++ @echo .Ar auto[=filename] >> iozone.1
++ @echo .Nm iozone >> iozone.1
++ @echo .Ar raw[=filename] >> iozone.1
++ @echo .Nm iozone >> iozone.1
++ @echo .Ar cdrom[=filename] >> iozone.1
++ @echo .Nm iozone >> iozone.1
++ @echo .Ar help >> iozone.1
++ @echo .Sh DESCRIPTION >> iozone.1
++ ./iozone help|awk '{if (/Copyright/) x++} {if (/For V1.06/) exit;}\
++ {if (x) print $0}' >>iozone.1
++ @echo .Sh AUTHOR >> iozone.1
++ @echo Bill Norcott >> iozone.1
++ ${BSD_INSTALL_MAN} iozone.1 $(DESTDIR)${PREFIX}/man/man1
Copied and modified: head/benchmarks/iperf/files/patch-src_Client.cpp (from r419177, head/benchmarks/iperf/files/patch-src__Client.cpp)
==============================================================================
--- head/benchmarks/iperf/files/patch-src__Client.cpp Wed Jul 27 15:05:03 2016 (r419177, copy source)
+++ head/benchmarks/iperf/files/patch-src_Client.cpp Wed Jul 27 15:09:11 2016 (r419178)
@@ -3,9 +3,9 @@
# errno to ENOBUFS, which causes issues with the UDP bandwidth tests.
# Check if errno != ENOBUFS after write(2).
#
---- src/Client.cpp.orig Wed Dec 13 11:22:18 2006
-+++ src/Client.cpp Wed Dec 13 11:22:47 2006
-@@ -215,7 +215,7 @@
+--- src/Client.cpp.orig 2010-04-01 20:23:17 UTC
++++ src/Client.cpp
+@@ -157,7 +157,7 @@ void Client::RunTCP( void ) {
// perform write
currLen = write( mSettings->mSock, mBuf, mSettings->mBufLen );
Modified: head/benchmarks/libmicro/files/patch-Makefile
==============================================================================
--- head/benchmarks/libmicro/files/patch-Makefile Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/libmicro/files/patch-Makefile Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,6 +1,6 @@
---- Makefile.orig Tue Jan 8 12:11:55 2008
-+++ Makefile Tue Jan 8 12:12:21 2008
-@@ -68,7 +68,7 @@
+--- Makefile.orig 2011-05-11 00:58:23 UTC
++++ Makefile
+@@ -68,7 +68,7 @@ TARBALL_CONTENTS = \
wrapper.sh \
README
Modified: head/benchmarks/libmicro/files/patch-Makefile.FreeBSD
==============================================================================
--- head/benchmarks/libmicro/files/patch-Makefile.FreeBSD Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/libmicro/files/patch-Makefile.FreeBSD Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,5 +1,5 @@
---- /dev/null Sat Aug 6 14:00:00 2005
-+++ Makefile.FreeBSD Sat Aug 6 14:00:04 2005
+--- Makefile.FreeBSD.orig 2016-07-27 14:59:58 UTC
++++ Makefile.FreeBSD
@@ -0,0 +1,42 @@
+#
+# CDDL HEADER START
Modified: head/benchmarks/libmicro/files/patch-bench.sh
==============================================================================
--- head/benchmarks/libmicro/files/patch-bench.sh Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/libmicro/files/patch-bench.sh Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,6 +1,6 @@
---- bench.sh.orig 2008-01-12 14:26:38.000000000 +0100
-+++ bench.sh 2008-01-12 14:26:59.000000000 +0100
-@@ -65,7 +65,7 @@
+--- bench.sh.orig 2011-05-11 00:58:23 UTC
++++ bench.sh
+@@ -65,7 +65,7 @@ mkdir -p $VDIR1 $VDIR2
touch $IFILE
@@ -9,7 +9,7 @@
# produce benchmark header for easier comparisons
-@@ -83,6 +83,12 @@
+@@ -83,6 +83,12 @@ if [ -f /proc/cpuinfo ]; then
p_type=`awk -F: '/model name/{print $2; exit}' /proc/cpuinfo`
fi
@@ -22,7 +22,7 @@
printf "!Libmicro_#: %30s\n" $libmicro_version
printf "!Options: %30s\n" "$OPTS"
printf "!Machine_name: %30s\n" $hostname
-@@ -154,7 +160,6 @@
+@@ -154,7 +160,6 @@ memset $OPTS -N "memset_4k_uc" -s 4k
memset $OPTS -N "memset_10k" -s 10k -I 600
memset $OPTS -N "memset_1m" -s 1m -I 200000
memset $OPTS -N "memset_10m" -s 10m -I 2000000
Copied and modified: head/benchmarks/libmicro/files/patch-cascade__cond.c (from r419177, head/benchmarks/libmicro/files/patch-cascade_cond.c)
==============================================================================
--- head/benchmarks/libmicro/files/patch-cascade_cond.c Wed Jul 27 15:05:03 2016 (r419177, copy source)
+++ head/benchmarks/libmicro/files/patch-cascade__cond.c Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,6 +1,6 @@
---- cascade_cond.c.orig Sat Aug 6 14:12:15 2005
-+++ cascade_cond.c Sat Aug 6 14:13:17 2005
-@@ -87,7 +87,6 @@
+--- cascade_cond.c.orig 2011-05-11 00:58:23 UTC
++++ cascade_cond.c
+@@ -83,7 +83,6 @@ benchmark_init()
(void) sprintf(lm_usage,
" [-o] (do signal outside mutex)\n"
@@ -8,7 +8,7 @@
"notes: thread cascade using pthread_conds\n");
return (0);
-@@ -101,9 +100,6 @@
+@@ -97,9 +96,6 @@ benchmark_optswitch(int opt, char *optar
case 'o':
opto = 1;
break;
@@ -18,7 +18,7 @@
default:
return (-1);
}
-@@ -152,6 +148,7 @@
+@@ -148,6 +144,7 @@ benchmark_initrun()
(void) pthread_mutexattr_init(&ma);
(void) pthread_condattr_init(&ca);
@@ -26,7 +26,7 @@
if (lm_optP > 1 || opts) {
(void) pthread_mutexattr_setpshared(&ma,
PTHREAD_PROCESS_SHARED);
-@@ -163,6 +160,7 @@
+@@ -159,6 +156,7 @@ benchmark_initrun()
(void) pthread_condattr_setpshared(&ca,
PTHREAD_PROCESS_PRIVATE);
}
Copied and modified: head/benchmarks/libmicro/files/patch-cascade__mutex.c (from r419177, head/benchmarks/libmicro/files/patch-cascade_mutex.c)
==============================================================================
--- head/benchmarks/libmicro/files/patch-cascade_mutex.c Wed Jul 27 15:05:03 2016 (r419177, copy source)
+++ head/benchmarks/libmicro/files/patch-cascade__mutex.c Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,6 +1,6 @@
---- cascade_mutex.c.orig Sat Aug 6 14:10:03 2005
-+++ cascade_mutex.c Sat Aug 6 14:11:53 2005
-@@ -83,7 +83,6 @@
+--- cascade_mutex.c.orig 2011-05-11 00:58:23 UTC
++++ cascade_mutex.c
+@@ -79,7 +79,6 @@ benchmark_init()
lm_defN = "cscd_mutex";
(void) sprintf(lm_usage,
@@ -8,7 +8,7 @@
"notes: thread cascade using pthread_mutexes\n");
return (0);
-@@ -94,9 +93,6 @@
+@@ -90,9 +89,6 @@ int
benchmark_optswitch(int opt, char *optarg)
{
switch (opt) {
@@ -18,7 +18,7 @@
default:
return (-1);
}
-@@ -123,6 +119,7 @@
+@@ -119,6 +115,7 @@ benchmark_initrun()
}
(void) pthread_mutexattr_init(&ma);
@@ -26,7 +26,7 @@
if (lm_optP > 1 || opts) {
(void) pthread_mutexattr_setpshared(&ma,
PTHREAD_PROCESS_SHARED);
-@@ -130,6 +127,7 @@
+@@ -126,6 +123,7 @@ benchmark_initrun()
(void) pthread_mutexattr_setpshared(&ma,
PTHREAD_PROCESS_PRIVATE);
}
Modified: head/benchmarks/libmicro/files/patch-getcontext.c
==============================================================================
--- head/benchmarks/libmicro/files/patch-getcontext.c Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/libmicro/files/patch-getcontext.c Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,6 +1,6 @@
---- getcontext.c.orig Sat Aug 6 16:11:21 2005
-+++ getcontext.c Sat Aug 6 16:11:45 2005
-@@ -39,6 +39,7 @@
+--- getcontext.c.orig 2011-05-11 00:58:23 UTC
++++ getcontext.c
+@@ -35,6 +35,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
Modified: head/benchmarks/libmicro/files/patch-getrusage.c
==============================================================================
--- head/benchmarks/libmicro/files/patch-getrusage.c Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/libmicro/files/patch-getrusage.c Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,6 +1,6 @@
---- getrusage.c.orig Sat Aug 6 16:12:36 2005
-+++ getrusage.c Sat Aug 6 16:12:57 2005
-@@ -40,6 +40,7 @@
+--- getrusage.c.orig 2011-05-11 00:58:23 UTC
++++ getrusage.c
+@@ -36,6 +36,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
Modified: head/benchmarks/libmicro/files/patch-libmicro.c
==============================================================================
--- head/benchmarks/libmicro/files/patch-libmicro.c Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/libmicro/files/patch-libmicro.c Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,6 +1,6 @@
---- libmicro.c.orig Sat Aug 6 14:15:04 2005
-+++ libmicro.c Sat Aug 6 14:15:52 2005
-@@ -854,10 +854,14 @@
+--- libmicro.c.orig 2011-05-11 00:58:23 UTC
++++ libmicro.c
+@@ -859,10 +859,14 @@ barrier_create(int hwm, int datasize)
b->ba_flag = 0;
(void) pthread_mutexattr_init(&attr);
Modified: head/benchmarks/libmicro/files/patch-longjmp.c
==============================================================================
--- head/benchmarks/libmicro/files/patch-longjmp.c Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/libmicro/files/patch-longjmp.c Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,6 +1,6 @@
---- longjmp.c.orig Wed Aug 31 11:53:48 2005
-+++ longjmp.c Wed Aug 31 11:55:10 2005
-@@ -55,7 +55,7 @@
+--- longjmp.c.orig 2011-05-11 00:58:23 UTC
++++ longjmp.c
+@@ -51,7 +51,7 @@ benchmark_init()
int
benchmark(void *tsd, result_t *res)
{
Copied and modified: head/benchmarks/libmicro/files/patch-mmap.c (from r419177, head/benchmarks/libmicro/files/patch-mmpa.c)
==============================================================================
--- head/benchmarks/libmicro/files/patch-mmpa.c Wed Jul 27 15:05:03 2016 (r419177, copy source)
+++ head/benchmarks/libmicro/files/patch-mmap.c Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,8 +1,8 @@
---- mmap.c.orig Sat Aug 6 16:13:46 2005
-+++ mmap.c Sat Aug 6 16:14:01 2005
-@@ -7,6 +7,7 @@
- #pragma ident "@(#)mmap.c 1.6 05/08/04 SMI"
- #endif
+--- mmap.c.orig 2011-05-11 00:58:23 UTC
++++ mmap.c
+@@ -28,6 +28,7 @@
+ * Use is subject to license terms.
+ */
+#include <sys/types.h>
#include <sys/mman.h>
Modified: head/benchmarks/libmicro/files/patch-msync.c
==============================================================================
--- head/benchmarks/libmicro/files/patch-msync.c Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/libmicro/files/patch-msync.c Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,8 +1,8 @@
---- msync.c.orig Sat Aug 6 16:14:27 2005
-+++ msync.c Sat Aug 6 16:14:45 2005
-@@ -7,6 +7,7 @@
- #pragma ident "@(#)msync.c 1.1 05/08/04 SMI"
- #endif
+--- msync.c.orig 2011-05-11 00:58:23 UTC
++++ msync.c
+@@ -28,6 +28,7 @@
+ * Use is subject to license terms.
+ */
+#include <sys/types.h>
#include <sys/mman.h>
Modified: head/benchmarks/libmicro/files/patch-multiview.sh
==============================================================================
--- head/benchmarks/libmicro/files/patch-multiview.sh Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/libmicro/files/patch-multiview.sh Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,6 +1,6 @@
---- multiview.sh.orig Wed Aug 17 22:48:57 2005
-+++ multiview.sh Wed Aug 17 22:49:00 2005
-@@ -40,15 +40,15 @@
+--- multiview.sh.orig 2011-05-11 00:58:23 UTC
++++ multiview.sh
+@@ -38,15 +38,15 @@
# the redder the color, the slower the result, the greener the
# faster
@@ -19,7 +19,7 @@
}
/^\!/ {
split($0, A_header, ":");
-@@ -59,7 +59,7 @@
+@@ -57,7 +57,7 @@
header_names[name] = ++header_count;
headers[header_count] = name;
}
@@ -28,7 +28,7 @@
}
{
-@@ -136,7 +136,7 @@
+@@ -136,7 +136,7 @@ END {
for (j = 2; j < ARGC; j++)
printf("<td>%s</td>\n", "not computed");
Modified: head/benchmarks/libmicro/files/patch-mutex.c
==============================================================================
--- head/benchmarks/libmicro/files/patch-mutex.c Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/libmicro/files/patch-mutex.c Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,6 +1,6 @@
---- mutex.c.orig Sat Aug 6 14:17:43 2005
-+++ mutex.c Sat Aug 6 14:18:26 2005
-@@ -125,9 +125,11 @@
+--- mutex.c.orig 2011-05-11 00:58:23 UTC
++++ mutex.c
+@@ -121,9 +121,11 @@ benchmark_initrun()
errors++;
} else {
(void) pthread_mutexattr_init(&attr);
Modified: head/benchmarks/libmicro/files/patch-setcontext.c
==============================================================================
--- head/benchmarks/libmicro/files/patch-setcontext.c Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/libmicro/files/patch-setcontext.c Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,6 +1,6 @@
---- setcontext.c.orig Sat Aug 6 16:15:12 2005
-+++ setcontext.c Sat Aug 6 16:15:31 2005
-@@ -36,6 +36,7 @@
+--- setcontext.c.orig 2011-05-11 00:58:23 UTC
++++ setcontext.c
+@@ -31,6 +31,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
Modified: head/benchmarks/libmicro/files/patch-siglongjmp.c
==============================================================================
--- head/benchmarks/libmicro/files/patch-siglongjmp.c Wed Jul 27 15:05:03 2016 (r419177)
+++ head/benchmarks/libmicro/files/patch-siglongjmp.c Wed Jul 27 15:09:11 2016 (r419178)
@@ -1,6 +1,6 @@
---- siglongjmp.c.orig Wed Aug 31 11:53:57 2005
-+++ siglongjmp.c Wed Aug 31 11:55:14 2005
-@@ -60,7 +60,7 @@
+--- siglongjmp.c.orig 2011-05-11 00:58:23 UTC
++++ siglongjmp.c
+@@ -56,7 +56,7 @@ benchmark(void *tsd, result_t *res)
{
tsd_t *ts = (tsd_t *)tsd;
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list