diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2016-07-27 15:09:11 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2016-07-27 15:09:11 +0000 |
| commit | 56bf85096cc89f91d28671b5d93b4172240263bc (patch) | |
| tree | 0574ce9eee45d627f943b80b2445882a762b52af /benchmarks | |
| parent | Add new port -- Rounded Mgen+ Japanese TrueType fonts (diff) | |
Cleanup patches, category benchmarks
Rename them to follow the make makepatch naming, and regenerate them.
With hat: portmgr
Sponsored by: Absolight
Notes
Notes:
svn path=/head/; revision=419178
Diffstat (limited to 'benchmarks')
113 files changed, 434 insertions, 444 deletions
diff --git a/benchmarks/bonnie++/files/patch-Makefile.in b/benchmarks/bonnie++/files/patch-Makefile.in index ccf166eea47b..c64dfe7748d0 100644 --- a/benchmarks/bonnie++/files/patch-Makefile.in +++ b/benchmarks/bonnie++/files/patch-Makefile.in @@ -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) diff --git a/benchmarks/bonnie++/files/patch-bonnie++.cpp b/benchmarks/bonnie++/files/patch-bonnie++.cpp index dc434a16759a..2d0cb9272723 100644 --- a/benchmarks/bonnie++/files/patch-bonnie++.cpp +++ b/benchmarks/bonnie++/files/patch-bonnie++.cpp @@ -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(); diff --git a/benchmarks/bonnie++/files/patch-bonnie.h.in b/benchmarks/bonnie++/files/patch-bonnie.h.in index de7547755d19..d6b9d5e1759e 100644 --- a/benchmarks/bonnie++/files/patch-bonnie.h.in +++ b/benchmarks/bonnie++/files/patch-bonnie.h.in @@ -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> diff --git a/benchmarks/bonnie++/files/patch-duration.cpp b/benchmarks/bonnie++/files/patch-duration.cpp index c728a21af411..7ba96bc261ed 100644 --- a/benchmarks/bonnie++/files/patch-duration.cpp +++ b/benchmarks/bonnie++/files/patch-duration.cpp @@ -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; diff --git a/benchmarks/bonnie++/files/patch-port.h.in b/benchmarks/bonnie++/files/patch-port.h.in index 9806a6c78164..c9ec73421e9b 100644 --- a/benchmarks/bonnie++/files/patch-port.h.in +++ b/benchmarks/bonnie++/files/patch-port.h.in @@ -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; diff --git a/benchmarks/bonnie++/files/patch-rand.h b/benchmarks/bonnie++/files/patch-rand.h index 9d411036e6bb..59753d937b43 100644 --- a/benchmarks/bonnie++/files/patch-rand.h +++ b/benchmarks/bonnie++/files/patch-rand.h @@ -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 diff --git a/benchmarks/bonnie++/files/patch-zcav.8 b/benchmarks/bonnie++/files/patch-zcav.8 index a7b9598d104c..6634e57522af 100644 --- a/benchmarks/bonnie++/files/patch-zcav.8 +++ b/benchmarks/bonnie++/files/patch-zcav.8 @@ -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! diff --git a/benchmarks/bonnie++/files/patch-zcav.cpp b/benchmarks/bonnie++/files/patch-zcav.cpp index a0ebecfe2e23..ca604297fb73 100644 --- a/benchmarks/bonnie++/files/patch-zcav.cpp +++ b/benchmarks/bonnie++/files/patch-zcav.cpp @@ -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; diff --git a/benchmarks/bonnie++/files/patch-zcav_io.cpp b/benchmarks/bonnie++/files/patch-zcav__io.cpp index 69dce29e122f..797fd7191ec0 100644 --- a/benchmarks/bonnie++/files/patch-zcav_io.cpp +++ b/benchmarks/bonnie++/files/patch-zcav__io.cpp @@ -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) { diff --git a/benchmarks/bonnie/files/patch-Bonnie.c b/benchmarks/bonnie/files/patch-Bonnie.c index 2ac462d48750..f1473d3ab00f 100644 --- a/benchmarks/bonnie/files/patch-Bonnie.c +++ b/benchmarks/bonnie/files/patch-Bonnie.c @@ -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]--; diff --git a/benchmarks/clpeak/files/patch-src_include_common.h b/benchmarks/clpeak/files/patch-src_include_common.h index a82d8d3f4fe5..1c6f3651832f 100644 --- a/benchmarks/clpeak/files/patch-src_include_common.h +++ b/benchmarks/clpeak/files/patch-src_include_common.h @@ -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> diff --git a/benchmarks/dbench/files/patch-Makefile.in b/benchmarks/dbench/files/patch-Makefile.in index 5f498032fdcd..bea48a4ce1f4 100644 --- a/benchmarks/dbench/files/patch-Makefile.in +++ b/benchmarks/dbench/files/patch-Makefile.in @@ -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 diff --git a/benchmarks/dbench/files/patch-dbench.c b/benchmarks/dbench/files/patch-dbench.c index c5a1fb4e8390..6578be0feba8 100644 --- a/benchmarks/dbench/files/patch-dbench.c +++ b/benchmarks/dbench/files/patch-dbench.c @@ -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); } diff --git a/benchmarks/dbs/files/patch-src_Makefile b/benchmarks/dbs/files/patch-src_Makefile index f533d8c59b3d..5a432a755e18 100644 --- a/benchmarks/dbs/files/patch-src_Makefile +++ b/benchmarks/dbs/files/patch-src_Makefile @@ -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:: diff --git a/benchmarks/dbs/files/patch-src_dbsc.c b/benchmarks/dbs/files/patch-src_dbsc.c index f3f9b60fdb4d..910c1a8e9a19 100644 --- a/benchmarks/dbs/files/patch-src_dbsc.c +++ b/benchmarks/dbs/files/patch-src_dbsc.c @@ -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 diff --git a/benchmarks/dbs/files/patch-src_dbsd.c b/benchmarks/dbs/files/patch-src_dbsd.c index e0dd4f7cb47d..25814090fba4 100644 --- a/benchmarks/dbs/files/patch-src_dbsd.c +++ b/benchmarks/dbs/files/patch-src_dbsd.c @@ -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); diff --git a/benchmarks/dbs/files/patch-src_record.h b/benchmarks/dbs/files/patch-src_record.h index af6f763eb9f0..e2dfa972dae7 100644 --- a/benchmarks/dbs/files/patch-src_record.h +++ b/benchmarks/dbs/files/patch-src_record.h @@ -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> diff --git a/benchmarks/dbs/files/patch-src_scan.c b/benchmarks/dbs/files/patch-src_scan.c index 5939f8477776..2d7356de605d 100644 --- a/benchmarks/dbs/files/patch-src_scan.c +++ b/benchmarks/dbs/files/patch-src_scan.c @@ -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 $ *****************************************************************/ diff --git a/benchmarks/dbs/files/patch-src_sendrecv.c b/benchmarks/dbs/files/patch-src_sendrecv.c index 8adccc9b1dd4..17886eb61334 100644 --- a/benchmarks/dbs/files/patch-src_sendrecv.c +++ b/benchmarks/dbs/files/patch-src_sendrecv.c @@ -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) diff --git a/benchmarks/dbs/files/patch-src_tcp_trace.c b/benchmarks/dbs/files/patch-src_tcp__trace.c index 6353e42e5946..69450082b5e9 100644 --- a/benchmarks/dbs/files/patch-src_tcp_trace.c +++ b/benchmarks/dbs/files/patch-src_tcp__trace.c @@ -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 diff --git a/benchmarks/dkftpbench/files/patch-Makefile.in b/benchmarks/dkftpbench/files/patch-Makefile.in index 4022f34012d8..6f0e9de47ed1 100644 --- a/benchmarks/dkftpbench/files/patch-Makefile.in +++ b/benchmarks/dkftpbench/files/patch-Makefile.in @@ -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) \ diff --git a/benchmarks/dkftpbench/files/patch-Platoon.cc b/benchmarks/dkftpbench/files/patch-Platoon.cc index 5d077e2e4e74..fbea4d488e33 100644 --- a/benchmarks/dkftpbench/files/patch-Platoon.cc +++ b/benchmarks/dkftpbench/files/patch-Platoon.cc @@ -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> + diff --git a/benchmarks/filebench/files/patch-parser__gram.c b/benchmarks/filebench/files/patch-parser__gram.c index 18a5cc80f52b..3ef61d82930d 100644 --- a/benchmarks/filebench/files/patch-parser__gram.c +++ b/benchmarks/filebench/files/patch-parser__gram.c @@ -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 */ diff --git a/benchmarks/himenobench/files/patch-himenobmtxp__l.f b/benchmarks/himenobench/files/patch-himenobmtxp__l.f index 855e8bff2f52..95aac73c2f0a 100644 --- a/benchmarks/himenobench/files/patch-himenobmtxp__l.f +++ b/benchmarks/himenobench/files/patch-himenobmtxp__l.f @@ -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 diff --git a/benchmarks/himenobench/files/patch-himenobmtxp__m.f b/benchmarks/himenobench/files/patch-himenobmtxp__m.f index 97ddd3f1a023..7f870d106251 100644 --- a/benchmarks/himenobench/files/patch-himenobmtxp__m.f +++ b/benchmarks/himenobench/files/patch-himenobmtxp__m.f @@ -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 diff --git a/benchmarks/himenobench/files/patch-himenobmtxp__s.f b/benchmarks/himenobench/files/patch-himenobmtxp__s.f index cea8df8726fa..1224c50113e0 100644 --- a/benchmarks/himenobench/files/patch-himenobmtxp__s.f +++ b/benchmarks/himenobench/files/patch-himenobmtxp__s.f @@ -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 diff --git a/benchmarks/himenobench/files/patch-himenobmtxp__xl.f b/benchmarks/himenobench/files/patch-himenobmtxp__xl.f index f71a582d45ec..cbf054931068 100644 --- a/benchmarks/himenobench/files/patch-himenobmtxp__xl.f +++ b/benchmarks/himenobench/files/patch-himenobmtxp__xl.f @@ -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 diff --git a/benchmarks/himenobench/files/patch-himenobmtxps.c b/benchmarks/himenobench/files/patch-himenobmtxps.c index b00ab89328ae..c670c40d8bf3 100644 --- a/benchmarks/himenobench/files/patch-himenobmtxps.c +++ b/benchmarks/himenobench/files/patch-himenobmtxps.c @@ -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 @@ ********************************************************************/ diff --git a/benchmarks/imb/files/patch-src-IMB_declare.h b/benchmarks/imb/files/patch-IMB__declare.h index c559a7ab49b9..7dbf858d52e2 100644 --- a/benchmarks/imb/files/patch-src-IMB_declare.h +++ b/benchmarks/imb/files/patch-IMB__declare.h @@ -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> diff --git a/benchmarks/imb/files/patch-src-make_mpich b/benchmarks/imb/files/patch-make__mpich index 642845687643..32b2b1a644b7 100644 --- a/benchmarks/imb/files/patch-src-make_mpich +++ b/benchmarks/imb/files/patch-make__mpich @@ -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 diff --git a/benchmarks/iorate/files/patch-ior_mach.c b/benchmarks/iorate/files/patch-ior__mach.c index 3e4e17e7dd6b..c8ea84dd82b7 100644 --- a/benchmarks/iorate/files/patch-ior_mach.c +++ b/benchmarks/iorate/files/patch-ior__mach.c @@ -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 diff --git a/benchmarks/iorate/files/patch-ior_mach.h b/benchmarks/iorate/files/patch-ior__mach.h index 4d1f0cd73cff..426e44ce2d02 100644 --- a/benchmarks/iorate/files/patch-ior_mach.h +++ b/benchmarks/iorate/files/patch-ior__mach.h @@ -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 diff --git a/benchmarks/iozone21/files/patch-Makefile b/benchmarks/iozone21/files/patch-Makefile index 5b796bbf61ed..8e06f82b0a62 100644 --- a/benchmarks/iozone21/files/patch-Makefile +++ b/benchmarks/iozone21/files/patch-Makefile @@ -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: -+ -@mkdir -p $(DESTDIR)${PREFIX}/bin -+ -@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: ++ -@mkdir -p $(DESTDIR)${PREFIX}/bin ++ -@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 diff --git a/benchmarks/iperf/files/patch-src__Client.cpp b/benchmarks/iperf/files/patch-src_Client.cpp index 4ef41aa22ee8..32044bb6f413 100644 --- a/benchmarks/iperf/files/patch-src__Client.cpp +++ b/benchmarks/iperf/files/patch-src_Client.cpp @@ -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 ); diff --git a/benchmarks/libmicro/files/patch-Makefile b/benchmarks/libmicro/files/patch-Makefile index 1ac9bb80b091..d9a0d03e8e20 100644 --- a/benchmarks/libmicro/files/patch-Makefile +++ b/benchmarks/libmicro/files/patch-Makefile @@ -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 diff --git a/benchmarks/libmicro/files/patch-Makefile.FreeBSD b/benchmarks/libmicro/files/patch-Makefile.FreeBSD index a0d1ce593fb6..7ebbab0d424d 100644 --- a/benchmarks/libmicro/files/patch-Makefile.FreeBSD +++ b/benchmarks/libmicro/files/patch-Makefile.FreeBSD @@ -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 diff --git a/benchmarks/libmicro/files/patch-bench.sh b/benchmarks/libmicro/files/patch-bench.sh index 01ec71af5be0..c1a5ec606086 100644 --- a/benchmarks/libmicro/files/patch-bench.sh +++ b/benchmarks/libmicro/files/patch-bench.sh @@ -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 diff --git a/benchmarks/libmicro/files/patch-cascade_cond.c b/benchmarks/libmicro/files/patch-cascade__cond.c index 3671c36a7b9a..752205f8f085 100644 --- a/benchmarks/libmicro/files/patch-cascade_cond.c +++ b/benchmarks/libmicro/files/patch-cascade__cond.c @@ -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); } diff --git a/benchmarks/libmicro/files/patch-cascade_mutex.c b/benchmarks/libmicro/files/patch-cascade__mutex.c index a76c97822fdd..f4867a3328bd 100644 --- a/benchmarks/libmicro/files/patch-cascade_mutex.c +++ b/benchmarks/libmicro/files/patch-cascade__mutex.c @@ -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); } diff --git a/benchmarks/libmicro/files/patch-getcontext.c b/benchmarks/libmicro/files/patch-getcontext.c index c5cb8fd88a08..6fada96c3a5f 100644 --- a/benchmarks/libmicro/files/patch-getcontext.c +++ b/benchmarks/libmicro/files/patch-getcontext.c @@ -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> diff --git a/benchmarks/libmicro/files/patch-getrusage.c b/benchmarks/libmicro/files/patch-getrusage.c index cd3d852eef28..d7b9ff0d3fc7 100644 --- a/benchmarks/libmicro/files/patch-getrusage.c +++ b/benchmarks/libmicro/files/patch-getrusage.c @@ -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> diff --git a/benchmarks/libmicro/files/patch-libmicro.c b/benchmarks/libmicro/files/patch-libmicro.c index e91108900451..a518842f8257 100644 --- a/benchmarks/libmicro/files/patch-libmicro.c +++ b/benchmarks/libmicro/files/patch-libmicro.c @@ -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); diff --git a/benchmarks/libmicro/files/patch-longjmp.c b/benchmarks/libmicro/files/patch-longjmp.c index 1c190b574c94..f665ad50618d 100644 --- a/benchmarks/libmicro/files/patch-longjmp.c +++ b/benchmarks/libmicro/files/patch-longjmp.c @@ -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) { diff --git a/benchmarks/libmicro/files/patch-mmap.c b/benchmarks/libmicro/files/patch-mmap.c new file mode 100644 index 000000000000..52a741cc7a75 --- /dev/null +++ b/benchmarks/libmicro/files/patch-mmap.c @@ -0,0 +1,10 @@ +--- 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> + #include <unistd.h> + #include <stdlib.h> diff --git a/benchmarks/libmicro/files/patch-mmpa.c b/benchmarks/libmicro/files/patch-mmpa.c deleted file mode 100644 index f559f94ac2ad..000000000000 --- a/benchmarks/libmicro/files/patch-mmpa.c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 - -+#include <sys/types.h> - #include <sys/mman.h> - #include <unistd.h> - #include <stdlib.h> diff --git a/benchmarks/libmicro/files/patch-msync.c b/benchmarks/libmicro/files/patch-msync.c index d4debe66749f..86dd9bbd1ad0 100644 --- a/benchmarks/libmicro/files/patch-msync.c +++ b/benchmarks/libmicro/files/patch-msync.c @@ -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> diff --git a/benchmarks/libmicro/files/patch-multiview.sh b/benchmarks/libmicro/files/patch-multiview.sh index f7f5dfd6cb92..3a576247e718 100644 --- a/benchmarks/libmicro/files/patch-multiview.sh +++ b/benchmarks/libmicro/files/patch-multiview.sh @@ -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"); diff --git a/benchmarks/libmicro/files/patch-mutex.c b/benchmarks/libmicro/files/patch-mutex.c index 8ff00c197695..c2f6d9463b8f 100644 --- a/benchmarks/libmicro/files/patch-mutex.c +++ b/benchmarks/libmicro/files/patch-mutex.c @@ -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); diff --git a/benchmarks/libmicro/files/patch-setcontext.c b/benchmarks/libmicro/files/patch-setcontext.c index eaf46be3a8a2..f522e925a4fa 100644 --- a/benchmarks/libmicro/files/patch-setcontext.c +++ b/benchmarks/libmicro/files/patch-setcontext.c @@ -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> diff --git a/benchmarks/libmicro/files/patch-siglongjmp.c b/benchmarks/libmicro/files/patch-siglongjmp.c index 845305aefda1..7659d9b5b80c 100644 --- a/benchmarks/libmicro/files/patch-siglongjmp.c +++ b/benchmarks/libmicro/files/patch-siglongjmp.c @@ -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 --git a/benchmarks/libmicro/files/patch-writev.c b/benchmarks/libmicro/files/patch-writev.c index 5cbfb3af7342..55793ae6832d 100644 --- a/benchmarks/libmicro/files/patch-writev.c +++ b/benchmarks/libmicro/files/patch-writev.c @@ -1,20 +1,21 @@ ---- writev.c.orig Sat Aug 6 16:16:18 2005 -+++ writev.c Sat Aug 6 16:17:00 2005 -@@ -32,12 +32,17 @@ - #pragma ident "@(#)writev.c 1.7 05/08/04 SMI" - #endif +--- writev.c.orig 2011-05-11 00:58:23 UTC ++++ writev.c +@@ -28,6 +28,7 @@ + * Use is subject to license terms. + */ +#include <sys/types.h> #include <sys/uio.h> #include <limits.h> #include <unistd.h> - #include <stdlib.h> +@@ -35,6 +36,10 @@ #include <stdio.h> #include <fcntl.h> -+ + +#ifndef UIO_MAXIOV +#define UIO_MAXIOV 1024 +#endif - ++ #ifndef IOV_MAX #define IOV_MAX UIO_MAXIOV + #endif diff --git a/benchmarks/lmbench/files/patch-results__Makefile b/benchmarks/lmbench/files/patch-results_Makefile index 148e59e2cdb6..7b1377401aed 100644 --- a/benchmarks/lmbench/files/patch-results__Makefile +++ b/benchmarks/lmbench/files/patch-results_Makefile @@ -1,6 +1,6 @@ ---- ./results/Makefile.orig 2009-06-25 14:38:27.000000000 -0400 -+++ ./results/Makefile 2009-06-25 14:38:52.000000000 -0400 -@@ -121,10 +121,10 @@ +--- results/Makefile.orig 2005-09-04 11:04:28 UTC ++++ results/Makefile +@@ -121,10 +121,10 @@ roff: echo .ps 12 >> summary.roff echo .po .35i >> summary.roff echo .sp .5i >> summary.roff @@ -13,7 +13,7 @@ list: @echo $(LIST) -@@ -185,11 +185,11 @@ +@@ -185,11 +185,11 @@ paper: # XXX - this has to be made incremental, doing everything over from # scratch makes you want a Ghz machine. html: dirs @@ -27,7 +27,7 @@ $(MK) LIST="$(LIST)" SIZE= PRINT="$(PS)" \ GMEM="$(GMEM) -cut -gthk1" GCTX="$(GCTX) -cut -gthk1" print $(MK) LIST="$(LIST)" SIZE= NOOP=-noop PRINT="$(PS)" \ -@@ -207,11 +207,11 @@ +@@ -207,11 +207,11 @@ html: dirs rm HTML/*.pbm HTML/___tmp* htmltest: dirs diff --git a/benchmarks/lmbench/files/patch-scripts__config-run b/benchmarks/lmbench/files/patch-scripts_config-run index ddf3dc887faf..d2031d0cc4a7 100644 --- a/benchmarks/lmbench/files/patch-scripts__config-run +++ b/benchmarks/lmbench/files/patch-scripts_config-run @@ -1,6 +1,6 @@ ---- ./scripts/config-run.orig 2009-06-25 12:16:57.000000000 -0400 -+++ ./scripts/config-run 2009-06-25 12:17:08.000000000 -0400 -@@ -176,7 +176,7 @@ +--- scripts/config-run.orig 2006-11-26 20:11:04 UTC ++++ scripts/config-run +@@ -176,7 +176,7 @@ then fi fi if [ X$MB = X ] diff --git a/benchmarks/lmbench/files/patch-scripts__getpercent b/benchmarks/lmbench/files/patch-scripts_getpercent index 9f0d9fa228e4..0a4f318af3b0 100644 --- a/benchmarks/lmbench/files/patch-scripts__getpercent +++ b/benchmarks/lmbench/files/patch-scripts_getpercent @@ -1,5 +1,5 @@ ---- ./scripts/getpercent.orig 2009-06-25 13:59:43.000000000 -0400 -+++ ./scripts/getpercent 2009-06-25 14:04:59.000000000 -0400 +--- scripts/getpercent.orig 2005-09-04 11:04:28 UTC ++++ scripts/getpercent @@ -5,7 +5,7 @@ # Hacked into existence by Larry McVoy (lm@sun.com now lm@sgi.com). # Copyright (c) 1994 Larry McVoy. GPLed software. diff --git a/benchmarks/lmbench/files/patch-src__Makefile b/benchmarks/lmbench/files/patch-src_Makefile index 48ff7b456476..7ade943755eb 100644 --- a/benchmarks/lmbench/files/patch-src__Makefile +++ b/benchmarks/lmbench/files/patch-src_Makefile @@ -1,6 +1,6 @@ ---- ./src/Makefile.orig 2009-06-25 14:38:24.000000000 -0400 -+++ ./src/Makefile 2009-06-25 14:38:41.000000000 -0400 -@@ -146,7 +146,7 @@ +--- src/Makefile.orig 2007-04-10 12:16:49 UTC ++++ src/Makefile +@@ -146,7 +146,7 @@ install-target: cp $(EXES) $(BASE)/bin cp $(INCS) $(BASE)/include cp $O/lmbench.a $(BASE)/lib/libmbench.a @@ -9,7 +9,7 @@ # No special handling for all these -@@ -239,7 +239,7 @@ +@@ -239,7 +239,7 @@ $O/getopt.o : getopt.c $(INCS) $(COMPILE) -c getopt.c -o $O/getopt.o $(UTILS) : diff --git a/benchmarks/netio/files/patch-Makefile b/benchmarks/netio/files/patch-Makefile index 5341e76d056f..7f1e0d6c77a0 100644 --- a/benchmarks/netio/files/patch-Makefile +++ b/benchmarks/netio/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2016-06-20 13:21:43 UTC +--- Makefile.orig 2016-07-27 15:01:12 UTC +++ Makefile @@ -102,7 +102,7 @@ netio$X: netio$O getopt$O diff --git a/benchmarks/netio/files/patch-netio.c b/benchmarks/netio/files/patch-netio.c index bf3c2e703ee2..d5b630e63670 100644 --- a/benchmarks/netio/files/patch-netio.c +++ b/benchmarks/netio/files/patch-netio.c @@ -1,4 +1,4 @@ ---- netio.c.orig 2016-06-20 13:21:43 UTC +--- netio.c.orig 2016-07-27 15:01:12 UTC +++ netio.c @@ -136,6 +136,7 @@ static char *rcsrev = "$Revision: 1.32 $ #include <ctype.h> diff --git a/benchmarks/netperf/files/patch-configure b/benchmarks/netperf/files/patch-configure index 49d35272d24b..31f10b135692 100644 --- a/benchmarks/netperf/files/patch-configure +++ b/benchmarks/netperf/files/patch-configure @@ -1,6 +1,6 @@ ---- ./configure.orig 2012-05-12 07:05:20.000000000 +1000 -+++ ./configure 2012-05-12 07:22:49.000000000 +1000 -@@ -6567,7 +6567,7 @@ +--- configure.orig 2015-07-20 17:30:24 UTC ++++ configure +@@ -6567,7 +6567,7 @@ fi done case "$host" in @@ -9,7 +9,7 @@ # FreeBSD 7.x and later SCTP support doesn't need -lsctp. ;; *) -@@ -7142,7 +7142,7 @@ +@@ -7142,7 +7142,7 @@ ac_cv_lib_kstat=ac_cv_lib_kstat_main enable_cpuutil="kstat - auto" NETCPU_SOURCE="kstat" ;; diff --git a/benchmarks/netperf/files/patch-arr_script b/benchmarks/netperf/files/patch-doc_examples_arr__script index 2a9e6b32d9a6..69f3f3f134e5 100644 --- a/benchmarks/netperf/files/patch-arr_script +++ b/benchmarks/netperf/files/patch-doc_examples_arr__script @@ -1,6 +1,6 @@ ---- doc/examples/arr_script.orig Wed Sep 8 15:57:17 1999 -+++ doc/examples/arr_script Wed Sep 8 15:57:56 1999 -@@ -10,8 +10,7 @@ +--- doc/examples/arr_script.orig 2011-02-10 17:04:20 UTC ++++ doc/examples/arr_script +@@ -12,8 +12,7 @@ init_parms() { TOLERANCE=15 MAX_RETRIES=3 diff --git a/benchmarks/netperf/files/patch-bloat.sh b/benchmarks/netperf/files/patch-doc_examples_bloat.sh index 32a55dee4707..8a0aff68146a 100644 --- a/benchmarks/netperf/files/patch-bloat.sh +++ b/benchmarks/netperf/files/patch-doc_examples_bloat.sh @@ -1,5 +1,5 @@ ---- doc/examples/bloat.sh.orig 2012-10-05 02:25:19.000000000 +0200 -+++ doc/examples/bloat.sh 2015-10-19 15:18:22.392273000 +0200 +--- doc/examples/bloat.sh.orig 2012-10-05 00:25:19 UTC ++++ doc/examples/bloat.sh @@ -3,12 +3,7 @@ # buffer bloat on latency. We assume that netperf has been compiled # with demo-mode enabled via ./configure --enable-demo @@ -14,7 +14,7 @@ CHUNK=60 -@@ -20,7 +15,7 @@ +@@ -20,7 +15,7 @@ echo "Starting netperf TCP_RR at $RR_STA # in more accurate demo intervals once the STREAM test kicks-in, but a # somewhat lower transaction rate. not unlike enabling histogram # mode. @@ -23,7 +23,7 @@ # sleep CHUNK seconds sleep $CHUNK -@@ -29,7 +24,7 @@ +@@ -29,7 +24,7 @@ sleep $CHUNK STREAM_START=`date +%s` echo "Starting netperf TCP_STREAM test at $STREAM_START" | tee -a bloat.log diff --git a/benchmarks/netperf/files/patch-packet_byte_script b/benchmarks/netperf/files/patch-doc_examples_packet__byte__script index b3bb8ddd5aec..17318deedc0c 100644 --- a/benchmarks/netperf/files/patch-packet_byte_script +++ b/benchmarks/netperf/files/patch-doc_examples_packet__byte__script @@ -1,6 +1,6 @@ ---- doc/examples/packet_byte_script.orig 2007-11-09 08:29:45.000000000 +0900 -+++ doc/examples/packet_byte_script 2009-06-16 15:35:37.000000000 +0900 -@@ -25,7 +25,7 @@ +--- doc/examples/packet_byte_script.orig 2011-02-10 17:04:20 UTC ++++ doc/examples/packet_byte_script +@@ -25,7 +25,7 @@ if [ $# -eq 0 ]; then fi # where is netperf diff --git a/benchmarks/netperf/files/patch-runemomni.sh b/benchmarks/netperf/files/patch-doc_examples_runemomni.sh index 939f3508fa25..caaa54ffb138 100644 --- a/benchmarks/netperf/files/patch-runemomni.sh +++ b/benchmarks/netperf/files/patch-doc_examples_runemomni.sh @@ -1,5 +1,5 @@ ---- doc/examples/runemomni.sh.orig 2011-07-28 22:35:06.000000000 +0200 -+++ doc/examples/runemomni.sh 2015-10-19 15:22:10.484922000 +0200 +--- doc/examples/runemomni.sh.orig 2011-07-28 20:35:06 UTC ++++ doc/examples/runemomni.sh @@ -1,6 +1,8 @@ # a script to run a set of single-instance netperf tests # between two machines @@ -9,7 +9,7 @@ # the length in seconds of each test iteration. the actual # run time will then be somewhere between that times min # and max iteration for confidence intervals -@@ -81,7 +83,7 @@ +@@ -81,7 +83,7 @@ do fi for j in $set do @@ -18,7 +18,7 @@ done done fi -@@ -100,7 +102,7 @@ +@@ -100,7 +102,7 @@ do fi for j in $set do @@ -27,7 +27,7 @@ done done fi -@@ -119,7 +121,7 @@ +@@ -119,7 +121,7 @@ do fi for j in $set do @@ -36,7 +36,7 @@ done done fi -@@ -138,7 +140,7 @@ +@@ -138,7 +140,7 @@ do fi for j in $set do @@ -45,7 +45,7 @@ done done fi -@@ -151,7 +153,7 @@ +@@ -151,7 +153,7 @@ do do for req in $reqs; do for burst in $bursts; do @@ -54,7 +54,7 @@ done done done -@@ -165,7 +167,7 @@ +@@ -165,7 +167,7 @@ do do for req in $reqs; do for burst in $bursts; do @@ -63,7 +63,7 @@ done done done -@@ -180,7 +182,7 @@ +@@ -180,7 +182,7 @@ do for i in $netperf_CPUs do for req in $reqs; do diff --git a/benchmarks/netperf/files/patch-runemomniagg2.sh b/benchmarks/netperf/files/patch-doc_examples_runemomniagg2.sh index e39d00419b0a..9a64a32bf259 100644 --- a/benchmarks/netperf/files/patch-runemomniagg2.sh +++ b/benchmarks/netperf/files/patch-doc_examples_runemomniagg2.sh @@ -1,5 +1,5 @@ ---- doc/examples/runemomniagg2.sh.orig 2011-07-28 20:37:22.000000000 +0200 -+++ doc/examples/runemomniagg2.sh 2015-10-19 15:35:43.704236000 +0200 +--- doc/examples/runemomniagg2.sh.orig 2011-07-28 18:37:22 UTC ++++ doc/examples/runemomniagg2.sh @@ -1,4 +1,7 @@ #set -x + @@ -8,7 +8,7 @@ # edit and add to this array as necessary # the hosts you will use should be contiguous # starting at index zero -@@ -84,11 +87,11 @@ +@@ -84,11 +87,11 @@ echo four dl585 G5 clients rh5.2, each w echo TCP_STREAM for i in $concurrent_sessions; do j=0; @@ -22,7 +22,7 @@ j=`expr $j + 1`; done; wait; -@@ -99,11 +102,11 @@ +@@ -99,11 +102,11 @@ echo four dl585 G5 clients rh5.2, each w echo TCP_MAERTS for i in $concurrent_sessions; do j=0; @@ -36,7 +36,7 @@ j=`expr $j + 1`; done; wait; -@@ -115,11 +118,11 @@ +@@ -115,11 +118,11 @@ echo four dl585 G5 clients rh5.2, each w HDR="-P 1" for i in $concurrent_sessions; do j=0; @@ -50,7 +50,7 @@ j=`expr $j + 1`; done; wait; -@@ -130,14 +133,14 @@ +@@ -130,14 +133,14 @@ echo four dl585 G5 clients rh5.2, each w echo TCP_RR aggregates HDR="-P 1" for i in $concurrent_sessions; do diff --git a/benchmarks/netperf/files/patch-doc_examples_runemomniaggdemo.sh b/benchmarks/netperf/files/patch-doc_examples_runemomniaggdemo.sh new file mode 100644 index 000000000000..e2ba57a8a08f --- /dev/null +++ b/benchmarks/netperf/files/patch-doc_examples_runemomniaggdemo.sh @@ -0,0 +1,11 @@ +--- doc/examples/runemomniaggdemo.sh.orig 2013-05-10 18:14:25 UTC ++++ doc/examples/runemomniaggdemo.sh +@@ -138,7 +138,7 @@ then + fi + + # allow the netperf binary to be used to be overridden +-NETPERF=${NETPERF:="netperf"} ++NETPERF="%%PREFIX%%/bin/netperf" + + if [ $NUM_REMOTE_HOSTS -lt 2 ] + then diff --git a/benchmarks/netperf/files/patch-sctp_stream_script b/benchmarks/netperf/files/patch-doc_examples_sctp__stream__script index d3b60119e17d..4bcc090e94ae 100644 --- a/benchmarks/netperf/files/patch-sctp_stream_script +++ b/benchmarks/netperf/files/patch-doc_examples_sctp__stream__script @@ -1,6 +1,6 @@ ---- doc/examples/sctp_stream_script.bak Fri Oct 21 07:58:11 2005 -+++ doc/examples/sctp_stream_script Thu Nov 9 13:20:35 2006 -@@ -24,7 +24,7 @@ +--- doc/examples/sctp_stream_script.orig 2011-02-10 17:04:20 UTC ++++ doc/examples/sctp_stream_script +@@ -24,7 +24,7 @@ fi # where the programs are #NETHOME=/usr/local/netperf #NETHOME="/opt/netperf" diff --git a/benchmarks/netperf/files/patch-snapshot_script b/benchmarks/netperf/files/patch-doc_examples_snapshot__script index 1310ab3b8064..c29a0a9467ac 100644 --- a/benchmarks/netperf/files/patch-snapshot_script +++ b/benchmarks/netperf/files/patch-doc_examples_snapshot__script @@ -1,5 +1,5 @@ ---- doc/examples/snapshot_script 2 Aug 1999 12:01:24 -0000 1.1.1.1 -+++ doc/examples/snapshot_script 21 Jan 2003 00:45:21 -0000 +--- doc/examples/snapshot_script.orig 2011-02-10 17:04:20 UTC ++++ doc/examples/snapshot_script @@ -37,7 +37,7 @@ # # where is netperf installed, there are a few possible places: diff --git a/benchmarks/netperf/files/patch-tcp_range_script b/benchmarks/netperf/files/patch-doc_examples_tcp__range__script index 8ed69996ae42..29a14d41e13c 100644 --- a/benchmarks/netperf/files/patch-tcp_range_script +++ b/benchmarks/netperf/files/patch-doc_examples_tcp__range__script @@ -1,6 +1,6 @@ ---- doc/examples/tcp_range_script 2 Aug 1999 12:01:24 -0000 1.1.1.1 -+++ doc/examples/tcp_range_script 21 Jan 2003 00:45:21 -0000 -@@ -43,7 +43,7 @@ +--- doc/examples/tcp_range_script.orig 2011-02-10 17:04:20 UTC ++++ doc/examples/tcp_range_script +@@ -43,7 +43,7 @@ PORT="" # where is netperf, and are there any "constant" options such as # the netserver port number #NETHOME=/usr/etc/net_perf diff --git a/benchmarks/netperf/files/patch-tcp_rr_script b/benchmarks/netperf/files/patch-doc_examples_tcp__rr__script index 5e10843ab2f7..aaa6d8a7bbdc 100644 --- a/benchmarks/netperf/files/patch-tcp_rr_script +++ b/benchmarks/netperf/files/patch-doc_examples_tcp__rr__script @@ -1,8 +1,6 @@ ---- doc/examples/tcp_rr_script 2 Aug 1999 12:01:24 -0000 1.1.1.1 -+++ doc/examples/tcp_rr_script 21 Jan 2003 00:45:21 -0000 -@@ -23,9 +23,9 @@ - fi - +--- doc/examples/tcp_rr_script.orig 2011-02-10 17:04:20 UTC ++++ doc/examples/tcp_rr_script +@@ -25,7 +25,7 @@ fi # where the programs are #NETHOME=/usr/local/netperf #NETHOME="/opt/netperf" diff --git a/benchmarks/netperf/files/patch-doc_examples_tcp__stream__script b/benchmarks/netperf/files/patch-doc_examples_tcp__stream__script new file mode 100644 index 000000000000..20365f24961c --- /dev/null +++ b/benchmarks/netperf/files/patch-doc_examples_tcp__stream__script @@ -0,0 +1,11 @@ +--- doc/examples/tcp_stream_script.orig 2011-02-10 17:04:20 UTC ++++ doc/examples/tcp_stream_script +@@ -24,7 +24,7 @@ fi + # where the programs are + #NETHOME=/usr/local/netperf + #NETHOME="/opt/netperf" +-NETHOME=. ++NETHOME=%%PREFIX%%/bin + + # at what port will netserver be waiting? If you decide to run + # netserver at a different port than the default of 12865, then set diff --git a/benchmarks/netperf/files/patch-udp_rr_script b/benchmarks/netperf/files/patch-doc_examples_udp__rr__script index 83f9ca184848..03ec4228cc28 100644 --- a/benchmarks/netperf/files/patch-udp_rr_script +++ b/benchmarks/netperf/files/patch-doc_examples_udp__rr__script @@ -1,8 +1,6 @@ ---- doc/examples/udp_rr_script 2 Aug 1999 12:01:24 -0000 1.1.1.1 -+++ doc/examples/udp_rr_script 21 Jan 2003 00:45:21 -0000 -@@ -20,9 +20,9 @@ - - # where the programs are +--- doc/examples/udp_rr_script.orig 2011-02-10 17:04:20 UTC ++++ doc/examples/udp_rr_script +@@ -22,7 +22,7 @@ fi #NETHOME=/usr/local/netperf #NETHOME="/opt/netperf" diff --git a/benchmarks/netperf/files/patch-udp_stream_script b/benchmarks/netperf/files/patch-doc_examples_udp__stream__script index 4dbc2058fcf1..5237033f32b6 100644 --- a/benchmarks/netperf/files/patch-udp_stream_script +++ b/benchmarks/netperf/files/patch-doc_examples_udp__stream__script @@ -1,8 +1,6 @@ ---- doc/examples/udp_stream_script 2 Aug 1999 12:01:23 -0000 1.1.1.1 -+++ doc/examples/udp_stream_script 21 Jan 2003 00:45:21 -0000 -@@ -17,9 +17,9 @@ - - # where the programs are +--- doc/examples/udp_stream_script.orig 2011-02-10 17:04:20 UTC ++++ doc/examples/udp_stream_script +@@ -19,7 +19,7 @@ fi #NETHOME=/usr/local/netperf #NETHOME="/opt/netperf" diff --git a/benchmarks/netperf/files/patch-netperf.man b/benchmarks/netperf/files/patch-doc_netperf.man index afdccde69549..0e6515408c06 100644 --- a/benchmarks/netperf/files/patch-netperf.man +++ b/benchmarks/netperf/files/patch-doc_netperf.man @@ -1,6 +1,6 @@ ---- doc/netperf.man.orig 2011-06-30 02:03:05.000000000 +0200 -+++ doc/netperf.man 2013-01-29 21:38:34.000000000 +0100 -@@ -53,8 +53,7 @@ +--- doc/netperf.man.orig 2011-06-30 00:03:05 UTC ++++ doc/netperf.man +@@ -53,8 +53,7 @@ a test (possibly at the expense of perfo .TP .B \-D [secs,units] (*) Display interim results at least every secs seconds uning units as the diff --git a/benchmarks/netperf/files/patch-dscp.c b/benchmarks/netperf/files/patch-dscp.c deleted file mode 100644 index 3354b085e6aa..000000000000 --- a/benchmarks/netperf/files/patch-dscp.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/dscp.c.orig 2012-04-04 08:51:29.000000000 +0900 -+++ src/dscp.c 2012-08-24 11:12:14.866495927 +0900 -@@ -50,6 +50,7 @@ - */ - - #if HAVE_NETINET_IN_SYSTM_H -+#include <sys/types.h> - #include <netinet/in_systm.h> - #endif - #if HAVE_NETINET_IP_H diff --git a/benchmarks/netperf/files/patch-netcpu_sysctl.c b/benchmarks/netperf/files/patch-netcpu_sysctl.c deleted file mode 100644 index cf96284de13d..000000000000 --- a/benchmarks/netperf/files/patch-netcpu_sysctl.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/netcpu_sysctl.c.orig 2014-06-04 01:37:37.000000000 +0200 -+++ src/netcpu_sysctl.c 2015-10-19 16:05:51.583777000 +0200 -@@ -6,6 +6,8 @@ - #endif - - #include <stdio.h> -+#include <stdlib.h> -+#include <string.h> - #include <unistd.h> - - #if HAVE_INTTYPES_H diff --git a/benchmarks/netperf/files/patch-runemomniaggdemo.sh b/benchmarks/netperf/files/patch-runemomniaggdemo.sh deleted file mode 100644 index 0c5ab9e01da8..000000000000 --- a/benchmarks/netperf/files/patch-runemomniaggdemo.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/examples/runemomniaggdemo.sh.orig 2013-05-10 20:14:25.000000000 +0200 -+++ doc/examples/runemomniaggdemo.sh 2015-10-19 15:37:46.597952000 +0200 -@@ -138,7 +138,7 @@ - fi - - # allow the netperf binary to be used to be overridden --NETPERF=${NETPERF:="netperf"} -+NETPERF="%%PREFIX%%/bin/netperf" - - if [ $NUM_REMOTE_HOSTS -lt 2 ] - then diff --git a/benchmarks/netperf/files/patch-src_dscp.c b/benchmarks/netperf/files/patch-src_dscp.c new file mode 100644 index 000000000000..43f33fc55353 --- /dev/null +++ b/benchmarks/netperf/files/patch-src_dscp.c @@ -0,0 +1,10 @@ +--- src/dscp.c.orig 2012-10-11 20:42:06 UTC ++++ src/dscp.c +@@ -54,6 +54,7 @@ const char * iptos2str(int iptos); + */ + + #if HAVE_NETINET_IN_SYSTM_H ++#include <sys/types.h> + #include <netinet/in_systm.h> + #endif + #if HAVE_NETINET_IP_H diff --git a/benchmarks/netperf/files/patch-src_netcpu__sysctl.c b/benchmarks/netperf/files/patch-src_netcpu__sysctl.c new file mode 100644 index 000000000000..b9b3c99aa54e --- /dev/null +++ b/benchmarks/netperf/files/patch-src_netcpu__sysctl.c @@ -0,0 +1,11 @@ +--- src/netcpu_sysctl.c.orig 2014-06-03 23:37:37 UTC ++++ src/netcpu_sysctl.c +@@ -6,6 +6,8 @@ char netcpu_sysctl_id[]="\ + #endif + + #include <stdio.h> ++#include <stdlib.h> ++#include <string.h> + #include <unistd.h> + + #if HAVE_INTTYPES_H diff --git a/benchmarks/netperf/files/patch-nettest_unix.c b/benchmarks/netperf/files/patch-src_nettest__unix.c index fb6e6b3b21de..8078f397c183 100644 --- a/benchmarks/netperf/files/patch-nettest_unix.c +++ b/benchmarks/netperf/files/patch-src_nettest__unix.c @@ -1,6 +1,6 @@ ---- src/nettest_unix.c.orig 2012-06-19 22:35:37.000000000 +0200 -+++ src/nettest_unix.c 2015-10-19 16:15:15.347526000 +0200 -@@ -2714,7 +2714,6 @@ +--- src/nettest_unix.c.orig 2012-06-19 20:35:37 UTC ++++ src/nettest_unix.c +@@ -2714,7 +2714,6 @@ bytes bytes bytes bytes secs. per that sort of rot... */ #ifdef WANT_INTERVALS diff --git a/benchmarks/netperf/files/patch-tcp_stream_script b/benchmarks/netperf/files/patch-tcp_stream_script deleted file mode 100644 index bff83ea174db..000000000000 --- a/benchmarks/netperf/files/patch-tcp_stream_script +++ /dev/null @@ -1,13 +0,0 @@ ---- doc/examples/tcp_stream_script 2 Aug 1999 12:01:23 -0000 1.1.1.1 -+++ doc/examples/tcp_stream_script 21 Jan 2003 00:45:21 -0000 -@@ -22,9 +22,9 @@ - fi - - # where the programs are - #NETHOME=/usr/local/netperf - #NETHOME="/opt/netperf" --NETHOME=. -+NETHOME=%%PREFIX%%/bin - - # at what port will netserver be waiting? If you decide to run - # netserver at a differnet port than the default of 12865, then set diff --git a/benchmarks/netpipe/files/patch-dox-netpipe.1 b/benchmarks/netpipe/files/patch-dox_netpipe.1 index 5834160c94bb..6040a5ea55b9 100644 --- a/benchmarks/netpipe/files/patch-dox-netpipe.1 +++ b/benchmarks/netpipe/files/patch-dox_netpipe.1 @@ -1,6 +1,6 @@ ---- dox/netpipe.1.orig 2007-05-11 01:29:09.000000000 +0900 -+++ dox/netpipe.1 2008-04-15 00:24:20.000000000 +0900 -@@ -26,7 +26,7 @@ +--- dox/netpipe.1.orig 2010-08-19 20:34:26 UTC ++++ dox/netpipe.1 +@@ -26,7 +26,7 @@ NetPIPE \- .IB E valuator .SH SYNOPSIS @@ -9,7 +9,7 @@ [\c .BI \-h \ receiver_hostname\fR\c ] -@@ -124,9 +124,9 @@ +@@ -124,9 +124,9 @@ by using the existing modules as example @@ -21,7 +21,7 @@ both systems or by using a nplaunch script. To manually start NPtcp, the NetPIPE receiver must be started first on the remote system using the command: -@@ -147,7 +147,9 @@ +@@ -147,7 +147,9 @@ NPtcp \-h Any options used must be the same on both sides. The \-P parameter can be used to override the default port number. This is helpful when running several streams through a router to a single endpoint. @@ -32,7 +32,7 @@ The nplaunch script uses ssh to launch the remote receiver before starting the local transmitter. To use rsh, simply change the nplaunch script. -@@ -376,6 +378,11 @@ +@@ -376,6 +378,11 @@ off using .ne 3 .TP diff --git a/benchmarks/nttcp/files/patch-Makefile b/benchmarks/nttcp/files/patch-Makefile index 2692f87414dd..6ea6535cc735 100644 --- a/benchmarks/nttcp/files/patch-Makefile +++ b/benchmarks/nttcp/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Mon Dec 18 19:17:20 2000 -+++ Makefile Mon Jan 29 12:26:51 2001 +--- Makefile.orig 2000-12-18 10:17:20 UTC ++++ Makefile @@ -111,8 +111,8 @@ # For FreeBSD ARCH= -DFreeBSD diff --git a/benchmarks/phoronix-test-suite/files/patch-install-sh b/benchmarks/phoronix-test-suite/files/patch-install-sh index 35a09c9f83b9..2c26ae492f77 100644 --- a/benchmarks/phoronix-test-suite/files/patch-install-sh +++ b/benchmarks/phoronix-test-suite/files/patch-install-sh @@ -1,6 +1,6 @@ ---- install-sh.orig 2016-01-01 17:41:58.000000000 +0100 -+++ install-sh 2016-03-07 14:22:05.614854871 +0100 -@@ -47,16 +47,21 @@ +--- install-sh.orig 2016-01-01 16:41:58 UTC ++++ install-sh +@@ -47,16 +47,21 @@ then fi rm -rf $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/ @@ -25,7 +25,7 @@ #mkdir -p $DESTDIR$INSTALL_PREFIX/../usr/lib/systemd/system/ #mkdir -p $DESTDIR$INSTALL_PREFIX/../etc/init/ -@@ -69,15 +74,18 @@ +@@ -69,15 +74,18 @@ cp -r * $DESTDIR$INSTALL_PREFIX/share/do cd .. rm -rf $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/man-pages/ @@ -49,7 +49,7 @@ # mkdir -p $DESTDIR$INSTALL_PREFIX/../etc/init/ # cp pts-core/static/upstart/*.conf $DESTDIR$INSTALL_PREFIX/../etc/init/ -@@ -92,12 +100,13 @@ +@@ -92,12 +100,13 @@ rm -f $DESTDIR$INSTALL_PREFIX/share/phor rm -f $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/pts-core/static/images/openbenchmarking.png rm -f $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/pts-core/static/images/%phoronix-test-suite.png @@ -64,7 +64,7 @@ # XDG MIME OpenBenchmarking support if [ "X$DESTDIR" = "X" ] && which xdg-mime >/dev/null && which xdg-icon-resource >/dev/null then -@@ -112,15 +121,14 @@ +@@ -112,15 +121,14 @@ else cp pts-core/static/images/openbenchmarking.png $DESTDIR$INSTALL_PREFIX/share/icons/hicolor/64x64/mimetypes/application-x-openbenchmarking.png fi diff --git a/benchmarks/postal/files/patch-basictcp.cpp b/benchmarks/postal/files/patch-basictcp.cpp index a229d46c4e62..93215e9726d3 100644 --- a/benchmarks/postal/files/patch-basictcp.cpp +++ b/benchmarks/postal/files/patch-basictcp.cpp @@ -1,6 +1,6 @@ ---- basictcp.cpp.orig 2012-01-01 06:36:27.000000000 -0500 -+++ basictcp.cpp 2015-03-23 17:06:40.355148000 -0400 -@@ -102,10 +102,10 @@ +--- basictcp.cpp.orig 2012-01-01 11:36:27 UTC ++++ basictcp.cpp +@@ -102,10 +102,10 @@ int base_tcp::ConnectTLS() m_sslMeth = NULL; m_sslCtx = NULL; m_ssl = NULL; diff --git a/benchmarks/postal/files/patch-basictcp.h b/benchmarks/postal/files/patch-basictcp.h index c05414dc221b..b431e8dce3d3 100644 --- a/benchmarks/postal/files/patch-basictcp.h +++ b/benchmarks/postal/files/patch-basictcp.h @@ -1,6 +1,6 @@ ---- basictcp.h.orig 2013-12-08 18:49:04.000000000 +0900 -+++ basictcp.h 2013-12-08 18:49:33.000000000 +0900 -@@ -89,7 +89,11 @@ +--- basictcp.h.orig 2008-05-26 09:41:40 UTC ++++ basictcp.h +@@ -89,7 +89,11 @@ private: #ifdef USE_SSL #ifdef USE_OPENSSL diff --git a/benchmarks/postal/files/patch-bhm.cpp b/benchmarks/postal/files/patch-bhm.cpp index 9480bbfa8c0d..834d70062764 100644 --- a/benchmarks/postal/files/patch-bhm.cpp +++ b/benchmarks/postal/files/patch-bhm.cpp @@ -1,5 +1,5 @@ ---- bhm.cpp.orig Tue Feb 6 16:04:04 2007 -+++ bhm.cpp Tue Feb 6 16:05:12 2007 +--- bhm.cpp.orig 2012-01-14 12:09:31 UTC ++++ bhm.cpp @@ -3,27 +3,25 @@ #endif @@ -35,7 +35,7 @@ int processes = 0; int *thread_status; -@@ -47,7 +45,7 @@ +@@ -47,7 +45,7 @@ void usage(CPCCHAR msg = NULL) int maxMsgSize = 10240; results res; @@ -44,7 +44,7 @@ int exitCount = 0; -@@ -261,7 +259,7 @@ +@@ -261,7 +259,7 @@ int readCommand(base_tcp &t, char *buf, void do_work(thread_data *td) { @@ -53,7 +53,7 @@ #ifdef USE_SSL , td->ssl #endif -@@ -408,7 +406,7 @@ +@@ -408,7 +406,7 @@ int main(int argc, char **argv) #endif "\n"); diff --git a/benchmarks/postal/files/patch-bhmusers.cpp b/benchmarks/postal/files/patch-bhmusers.cpp index cc91f1345769..4d659c477718 100644 --- a/benchmarks/postal/files/patch-bhmusers.cpp +++ b/benchmarks/postal/files/patch-bhmusers.cpp @@ -1,4 +1,4 @@ ---- bhmusers.cpp.orig +--- bhmusers.cpp.orig 2008-04-10 01:36:27 UTC +++ bhmusers.cpp @@ -1,5 +1,6 @@ #include "bhmusers.h" diff --git a/benchmarks/postal/files/patch-bhmusers.h b/benchmarks/postal/files/patch-bhmusers.h index e667b8a2d90e..5feaa1234e19 100644 --- a/benchmarks/postal/files/patch-bhmusers.h +++ b/benchmarks/postal/files/patch-bhmusers.h @@ -1,6 +1,6 @@ ---- bhmusers.h.orig +--- bhmusers.h.orig 2006-09-28 15:20:28 UTC +++ bhmusers.h -@@ -6,12 +6,16 @@ +@@ -6,12 +6,16 @@ using namespace std; #include <string> #include "conf.h" @@ -17,7 +17,7 @@ #include "postal.h" -@@ -23,7 +27,12 @@ +@@ -23,7 +27,12 @@ typedef struct int sync_time; } BHM_DATA; @@ -30,7 +30,7 @@ { template<> struct hash< std::string > { -@@ -34,7 +43,11 @@ +@@ -34,7 +43,11 @@ namespace __gnu_cxx }; } diff --git a/benchmarks/postal/files/patch-postal.cpp b/benchmarks/postal/files/patch-postal.cpp index 4747b927aa62..ff6f908d592e 100644 --- a/benchmarks/postal/files/patch-postal.cpp +++ b/benchmarks/postal/files/patch-postal.cpp @@ -1,4 +1,4 @@ ---- postal.cpp.orig +--- postal.cpp.orig 2012-01-14 12:08:12 UTC +++ postal.cpp @@ -6,15 +6,11 @@ #include "smtp.h" diff --git a/benchmarks/postal/files/patch-rabid.cpp b/benchmarks/postal/files/patch-rabid.cpp index 32c4a245ef1e..cc7526af3e0e 100644 --- a/benchmarks/postal/files/patch-rabid.cpp +++ b/benchmarks/postal/files/patch-rabid.cpp @@ -1,4 +1,4 @@ ---- rabid.cpp.orig +--- rabid.cpp.orig 2012-01-14 12:08:49 UTC +++ rabid.cpp @@ -7,15 +7,14 @@ #include <cstdlib> @@ -6,11 +6,10 @@ #include <sys/wait.h> -#include <signal.h> -#include <stdio.h> --#include <strings.h> +#include <csignal> +#include <cstdio> +#include <cstring> -+#include <strings.h> + #include <strings.h> #include "postal.h" #include "logit.h" #ifdef USE_GNUTLS diff --git a/benchmarks/postal/files/patch-smtp.cpp b/benchmarks/postal/files/patch-smtp.cpp index 641dd5da19d2..d13924f39df7 100644 --- a/benchmarks/postal/files/patch-smtp.cpp +++ b/benchmarks/postal/files/patch-smtp.cpp @@ -1,4 +1,4 @@ ---- smtp.cpp.orig +--- smtp.cpp.orig 2012-01-14 12:38:45 UTC +++ smtp.cpp @@ -8,6 +8,7 @@ #include "userlist.h" diff --git a/benchmarks/postal/files/patch-smtp.h b/benchmarks/postal/files/patch-smtp.h index df9781045b72..0be7c57dba19 100644 --- a/benchmarks/postal/files/patch-smtp.h +++ b/benchmarks/postal/files/patch-smtp.h @@ -1,4 +1,4 @@ ---- smtp.h.orig +--- smtp.h.orig 2012-01-14 12:36:56 UTC +++ smtp.h @@ -4,14 +4,18 @@ using namespace std; @@ -20,7 +20,7 @@ #include "tcp.h" #include "mutex.h" -@@ -30,7 +34,11 @@ +@@ -30,7 +34,11 @@ struct eqlng } }; diff --git a/benchmarks/postal/files/patch-tcp.cpp b/benchmarks/postal/files/patch-tcp.cpp index 7d23b07af774..0d9abd3679b6 100644 --- a/benchmarks/postal/files/patch-tcp.cpp +++ b/benchmarks/postal/files/patch-tcp.cpp @@ -1,6 +1,6 @@ ---- tcp.cpp.orig 2012-01-01 06:24:45.000000000 -0500 -+++ tcp.cpp 2015-03-23 17:06:52.611229000 -0400 -@@ -178,10 +178,10 @@ +--- tcp.cpp.orig 2012-01-01 11:24:45 UTC ++++ tcp.cpp +@@ -178,10 +178,10 @@ int tcp::ConnectTLS() #ifdef USE_OPENSSL m_sslCtx = NULL; m_ssl = NULL; diff --git a/benchmarks/postal/files/patch-tcp.h b/benchmarks/postal/files/patch-tcp.h index 9447a2a72ef5..2096d1dade4e 100644 --- a/benchmarks/postal/files/patch-tcp.h +++ b/benchmarks/postal/files/patch-tcp.h @@ -1,6 +1,6 @@ ---- tcp.h.orig +--- tcp.h.orig 2007-01-12 07:12:10 UTC +++ tcp.h -@@ -100,7 +100,11 @@ +@@ -100,7 +100,11 @@ private: #ifdef USE_SSL #ifdef USE_OPENSSL diff --git a/benchmarks/ramspeed/files/patch-build.sh b/benchmarks/ramspeed/files/patch-build.sh index 9d703b275db5..06fef2d105c0 100644 --- a/benchmarks/ramspeed/files/patch-build.sh +++ b/benchmarks/ramspeed/files/patch-build.sh @@ -1,6 +1,6 @@ ---- build.sh.orig 2007-11-01 22:00:00.000000000 +0100 -+++ build.sh 2014-01-25 19:53:28.000000000 +0100 -@@ -15,6 +15,16 @@ +--- build.sh.orig 2007-11-01 21:00:00 UTC ++++ build.sh +@@ -15,6 +15,16 @@ fi if [ "$1" ]; then OS=$1; fi if [ "$2" ]; then ARCH=$2; fi @@ -17,7 +17,7 @@ case $OS in FreeBSD) -@@ -127,10 +137,20 @@ +@@ -127,10 +137,20 @@ case $OS in esac echo "building for $OS $RELEASE $ARCH" @@ -41,7 +41,7 @@ if [ $TARGET = "GENERIC" ] then echo "WARNING! BUILDING FOR AN UNSUPPORTED OPERATING SYSTEM AND\OR ARCHITECTURE!" -@@ -139,8 +159,10 @@ +@@ -139,8 +159,10 @@ then echo "WARNING! BUILDING FOR AN UNSU echo " " fi diff --git a/benchmarks/randomio/files/patch-Makefile b/benchmarks/randomio/files/patch-Makefile index 42d608d1bee0..84b2631e9e6f 100644 --- a/benchmarks/randomio/files/patch-Makefile +++ b/benchmarks/randomio/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2010-08-20 19:36:08.000000000 +0400 -+++ Makefile 2010-08-20 19:39:25.000000000 +0400 -@@ -5,3 +5,5 @@ +--- Makefile.orig 2006-11-11 04:39:36 UTC ++++ Makefile +@@ -5,3 +5,5 @@ randomio: randomio.o clean: rm -f *.o randomio diff --git a/benchmarks/scimark2c/files/patch-Makefile b/benchmarks/scimark2c/files/patch-Makefile index 7a688dc0f190..cffadc20c064 100644 --- a/benchmarks/scimark2c/files/patch-Makefile +++ b/benchmarks/scimark2c/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig 2006-07-26 21:30:46.000000000 +0200 -+++ Makefile 2010-10-11 21:48:39.000000000 +0200 +--- Makefile.orig 2006-07-26 19:30:46 UTC ++++ Makefile @@ -5,7 +5,7 @@ all: scimark2 diff --git a/benchmarks/scimark2c/files/patch-scimark2.c b/benchmarks/scimark2c/files/patch-scimark2.c index e28bade3b163..8810e9a1b3b4 100644 --- a/benchmarks/scimark2c/files/patch-scimark2.c +++ b/benchmarks/scimark2c/files/patch-scimark2.c @@ -1,6 +1,6 @@ ---- scimark2.c.orig Sat Apr 29 06:21:12 2000 -+++ scimark2.c Sat Apr 5 23:13:45 2003 -@@ -58,7 +58,7 @@ +--- scimark2.c.orig 2006-07-25 20:11:47 UTC ++++ scimark2.c +@@ -58,7 +58,7 @@ int main(int argc, char *argv[]) print_banner(); diff --git a/benchmarks/siege/files/patch-Makefile.am b/benchmarks/siege/files/patch-Makefile.am index 8ccd3132992e..aff6e9056b34 100644 --- a/benchmarks/siege/files/patch-Makefile.am +++ b/benchmarks/siege/files/patch-Makefile.am @@ -1,4 +1,4 @@ ---- Makefile.am.orig 2015-12-22 20:12:40 UTC +--- Makefile.am.orig 2016-05-20 11:41:06 UTC +++ Makefile.am @@ -20,6 +20,8 @@ ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. diff --git a/benchmarks/siege/files/patch-configure.ac b/benchmarks/siege/files/patch-configure.ac index 09e34d35f367..3985f520b755 100644 --- a/benchmarks/siege/files/patch-configure.ac +++ b/benchmarks/siege/files/patch-configure.ac @@ -1,4 +1,4 @@ ---- configure.ac.orig 2016-03-25 13:07:35 UTC +--- configure.ac.orig 2016-05-20 11:41:06 UTC +++ configure.ac @@ -12,6 +12,7 @@ AC_CONFIG_AUX_DIR(utils) AM_INIT_AUTOMAKE diff --git a/benchmarks/siege/files/patch-src_init.c b/benchmarks/siege/files/patch-src_init.c index a805d8487e92..e2d0c2ce2b78 100644 --- a/benchmarks/siege/files/patch-src_init.c +++ b/benchmarks/siege/files/patch-src_init.c @@ -1,6 +1,6 @@ ---- src/init.c.orig 2015-12-22 20:12:40 UTC +--- src/init.c.orig 2016-05-20 11:41:06 UTC +++ src/init.c -@@ -35,6 +35,9 @@ +@@ -39,6 +39,9 @@ #include <unistd.h> #include <errno.h> #include <stdlib.h> @@ -8,5 +8,5 @@ +#include <signal.h> +#endif - int - init_config( void ) + #define LINESZ 1024 + diff --git a/benchmarks/siege/files/patch-src_sock.c b/benchmarks/siege/files/patch-src_sock.c index b63a6099b02e..e61d2701b336 100644 --- a/benchmarks/siege/files/patch-src_sock.c +++ b/benchmarks/siege/files/patch-src_sock.c @@ -1,6 +1,6 @@ ---- src/sock.c.orig 2015-12-22 20:12:40 UTC +--- src/sock.c.orig 2016-05-20 11:41:06 UTC +++ src/sock.c -@@ -148,7 +148,7 @@ new_socket(CONN *C, const char *hostpara +@@ -149,7 +149,7 @@ new_socket(CONN *C, const char *hostpara hp = NULL; } } @@ -9,7 +9,7 @@ # ifdef HAVE_GETIPNODEBYNAME hp = getipnodebyname(hn, AF_INET, 0, &herrno); # else /* default use gethostbyname_r*/ -@@ -190,7 +190,7 @@ new_socket(CONN *C, const char *hostpara +@@ -191,7 +191,7 @@ new_socket(CONN *C, const char *hostpara memset((void*) &cli, 0, sizeof(cli)); memcpy(&cli.sin_addr, hp->h_addr, hp->h_length); diff --git a/benchmarks/smhasher/files/patch-smhasher-Platform.cpp b/benchmarks/smhasher/files/patch-Platform.cpp index f1fd73f87b8a..14311fb21cc2 100644 --- a/benchmarks/smhasher/files/patch-smhasher-Platform.cpp +++ b/benchmarks/smhasher/files/patch-Platform.cpp @@ -1,6 +1,6 @@ ---- Platform.cpp 2015-03-30 17:26:46.000000000 -0400 -+++ Platform.cpp.new 2015-03-30 17:26:56.000000000 -0400 -@@ -19,6 +19,38 @@ +--- Platform.cpp.orig 2014-04-22 21:40:50 UTC ++++ Platform.cpp +@@ -19,6 +19,38 @@ void SetAffinity ( int cpu ) SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_HIGHEST); } diff --git a/benchmarks/smhasher/files/patch-smhasher-Platform.h b/benchmarks/smhasher/files/patch-Platform.h index c2df8b7c99fa..fcbce0b38a5b 100644 --- a/benchmarks/smhasher/files/patch-smhasher-Platform.h +++ b/benchmarks/smhasher/files/patch-Platform.h @@ -1,6 +1,6 @@ ---- Platform.h 2015-03-30 17:28:57.000000000 -0400 -+++ Platform.h.new 2015-03-30 17:28:51.000000000 -0400 -@@ -39,6 +39,9 @@ +--- Platform.h.orig 2014-04-22 21:40:50 UTC ++++ Platform.h +@@ -39,6 +39,9 @@ void SetAffinity ( int cpu ); #else // defined(_MSC_VER) #include <stdint.h> diff --git a/benchmarks/spp/files/patch-Makefile b/benchmarks/spp/files/patch-Makefile index 60ef854fb7e8..30fa5a51f9a5 100644 --- a/benchmarks/spp/files/patch-Makefile +++ b/benchmarks/spp/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2013-05-22 01:50:24 UTC +--- Makefile.orig 2015-05-21 00:10:33 UTC +++ Makefile -@@ -39,8 +39,8 @@ +@@ -39,8 +39,8 @@ INCLUDES = $(SRCDIR)/crc32.h \ SLIBS= -pthread -lpcap BINDIR=./bin PROGRAM= $(BINDIR)/$(NAME) @@ -11,7 +11,7 @@ INSTALL= install -@@ -48,11 +48,11 @@ +@@ -48,11 +48,11 @@ INSTALL= install # If, for some reason, you don't want debugging info to bewww # logged, then comment the following line. # @@ -25,7 +25,7 @@ # turn on optimisation CFLAGS += -O2 -@@ -76,13 +76,10 @@ +@@ -79,13 +79,10 @@ clean: rm -f $(PROGRAM) *.o $(SRCDIR)/*.o *~ install: diff --git a/benchmarks/stress-ng/files/patch-stress-cpu.c b/benchmarks/stress-ng/files/patch-stress-cpu.c index c25e65e2fe80..b8a2a329d1ac 100644 --- a/benchmarks/stress-ng/files/patch-stress-cpu.c +++ b/benchmarks/stress-ng/files/patch-stress-cpu.c @@ -1,6 +1,6 @@ ---- stress-cpu.c.orig 2015-09-18 14:50:12 UTC +--- stress-cpu.c.orig 2016-07-15 14:26:33 UTC +++ stress-cpu.c -@@ -57,7 +58,6 @@ +@@ -57,7 +57,6 @@ #define ccosl ccos #define csinl csin #define cpow pow diff --git a/benchmarks/super-smack/files/patch-Makefile.in b/benchmarks/super-smack/files/patch-Makefile.in index 009606ef5fad..b0f1de511e6b 100644 --- a/benchmarks/super-smack/files/patch-Makefile.in +++ b/benchmarks/super-smack/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- ./Makefile.in.orig 2005-04-30 11:19:40.000000000 -0400 -+++ ./Makefile.in 2014-07-03 10:20:34.000000000 -0400 -@@ -379,8 +379,8 @@ +--- Makefile.in.orig 2005-04-30 15:19:40 UTC ++++ Makefile.in +@@ -379,8 +379,8 @@ mostlyclean distclean maintainer-clean install-data-local: diff --git a/benchmarks/super-smack/files/patch-query.cc b/benchmarks/super-smack/files/patch-src_query.cc index 339e7c1a7feb..ef4e688e8ea8 100644 --- a/benchmarks/super-smack/files/patch-query.cc +++ b/benchmarks/super-smack/files/patch-src_query.cc @@ -1,6 +1,6 @@ ---- src/query.cc.orig 2005-04-30 09:51:29.000000000 -0400 -+++ src/query.cc 2007-07-26 20:47:03.000000000 -0400 -@@ -197,7 +197,7 @@ +--- src/query.cc.orig 2005-04-30 13:51:29 UTC ++++ src/query.cc +@@ -197,7 +197,7 @@ void Query_report::fd_send(int fd) { string s((*i).first); int str_len = (*i).first.length(); @@ -9,7 +9,7 @@ { *p++ = (char) str_len; const char* q_type_name = s.c_str(); -@@ -216,7 +216,7 @@ +@@ -216,7 +216,7 @@ void Query_report::fd_send(int fd) die(0, "report buffer overflow -- too many query types"); } diff --git a/benchmarks/ttcp/files/patch-ttcp.c b/benchmarks/ttcp/files/patch-ttcp.c index 2acddbaa6e0d..a055bfeef7ee 100644 --- a/benchmarks/ttcp/files/patch-ttcp.c +++ b/benchmarks/ttcp/files/patch-ttcp.c @@ -1,4 +1,4 @@ ---- ttcp.c.orig 2015-11-23 14:04:04 UTC +--- ttcp.c.orig 2016-07-27 15:06:14 UTC +++ ttcp.c @@ -55,6 +55,9 @@ static char RCSid[] = "ttcp.c $Revision: #include <arpa/inet.h> diff --git a/benchmarks/ubench/files/patch-timeout-cpubench.c b/benchmarks/ubench/files/patch-cpubench.c index 88ad0dfbfca4..f020598b7378 100644 --- a/benchmarks/ubench/files/patch-timeout-cpubench.c +++ b/benchmarks/ubench/files/patch-cpubench.c @@ -1,6 +1,6 @@ ---- cpubench.c.orig 2000-05-28 20:21:13.000000000 -0700 -+++ cpubench.c 2010-11-23 14:20:52.000000000 -0800 -@@ -114,7 +114,7 @@ +--- cpubench.c.orig 2000-05-29 03:21:13 UTC ++++ cpubench.c +@@ -114,7 +114,7 @@ double cdt; return i; } /*****************************************************************************/ @@ -9,7 +9,7 @@ { int sv[2],i; int d=0; -@@ -126,7 +126,7 @@ +@@ -126,7 +126,7 @@ int cpubench() return 0; } cpu_score=0; @@ -18,7 +18,7 @@ switch ( (i=sigsetjmp(env,0xffff)) ) { case 0: -@@ -136,7 +136,7 @@ +@@ -136,7 +136,7 @@ int cpubench() if ( child ) exit(0); child_number=0; close(sv[0]); @@ -27,7 +27,7 @@ dlt=dlt/(double )CPUREFSCORE; cpu_score=dlt; fprintf(stdout,"Ubench CPU: %8d\n",cpu_score); -@@ -152,13 +152,13 @@ +@@ -152,13 +152,13 @@ int cpubench() itim=cpucalibrate(CPUREFTIME); if ( ONEflag ) { diff --git a/benchmarks/ubench/files/patch-timeout-diskbench.c b/benchmarks/ubench/files/patch-diskbench.c index c8957bbb5b75..f9aa483075fc 100644 --- a/benchmarks/ubench/files/patch-timeout-diskbench.c +++ b/benchmarks/ubench/files/patch-diskbench.c @@ -1,6 +1,6 @@ ---- diskbench.c.orig 2000-07-31 10:24:10.000000000 -0700 -+++ diskbench.c 2010-11-23 14:20:52.000000000 -0800 -@@ -103,7 +103,7 @@ +--- diskbench.c.orig 2000-07-31 17:24:10 UTC ++++ diskbench.c +@@ -103,7 +103,7 @@ double cdt; return i; } /*****************************************************************************/ @@ -9,7 +9,7 @@ { int sv[2],i; int d=0; -@@ -115,7 +115,7 @@ +@@ -115,7 +115,7 @@ int diskbench() return 0; } cpu_score=0; @@ -18,7 +18,7 @@ switch ( (i=sigsetjmp(env,0xffff)) ) { case 0: -@@ -124,7 +124,7 @@ +@@ -124,7 +124,7 @@ int diskbench() for (i=0;i<child_number;i++) kill(child_pid[i],SIGALRM); if ( child ) exit(0); close(sv[0]); @@ -27,7 +27,7 @@ dlt=dlt/(double )DISKREFSCORE; cpu_score=dlt; fprintf(stdout,"Ubench DISK: %d\n",cpu_score); -@@ -140,13 +140,13 @@ +@@ -140,13 +140,13 @@ int diskbench() itim=diskcalibrate(DISKREFTIME); if ( ONEflag ) { diff --git a/benchmarks/ubench/files/patch-timeout-membench.c b/benchmarks/ubench/files/patch-membench.c index f9fa3489af5c..66e203a8d6df 100644 --- a/benchmarks/ubench/files/patch-timeout-membench.c +++ b/benchmarks/ubench/files/patch-membench.c @@ -1,6 +1,6 @@ ---- membench.c.orig 2000-07-31 10:23:27.000000000 -0700 -+++ membench.c 2010-11-23 14:20:52.000000000 -0800 -@@ -102,7 +102,7 @@ +--- membench.c.orig 2000-07-31 17:23:27 UTC ++++ membench.c +@@ -102,7 +102,7 @@ double cdt; return i; } /*****************************************************************************/ @@ -9,7 +9,7 @@ { int sv[2],i; int d=0; -@@ -114,7 +114,7 @@ +@@ -114,7 +114,7 @@ int membench() return 0; } cpu_score=0; @@ -18,7 +18,7 @@ switch ( (i=sigsetjmp(env,0xffff)) ) { case 0: -@@ -123,7 +123,7 @@ +@@ -123,7 +123,7 @@ int membench() for (i=0;i<child_number;i++) kill(child_pid[i],SIGALRM); if ( child ) exit(0); close(sv[0]); @@ -27,7 +27,7 @@ dlt=dlt/(double )MEMREFSCORE; cpu_score=dlt; fprintf(stdout,"Ubench MEM: %8d\n",cpu_score); -@@ -139,13 +139,13 @@ +@@ -139,13 +139,13 @@ int membench() itim=memcalibrate(MEMREFTIME); if ( ONEflag ) { diff --git a/benchmarks/ubench/files/patch-timeout-netbench.c b/benchmarks/ubench/files/patch-netbench.c index d1979de4ded9..03e95afda982 100644 --- a/benchmarks/ubench/files/patch-timeout-netbench.c +++ b/benchmarks/ubench/files/patch-netbench.c @@ -1,5 +1,5 @@ ---- netbench.c.orig 2000-02-18 14:39:30.000000000 -0800 -+++ netbench.c 2010-11-23 14:20:52.000000000 -0800 +--- netbench.c.orig 2000-02-18 22:39:30 UTC ++++ netbench.c @@ -18,7 +18,7 @@ */ diff --git a/benchmarks/ubench/files/patch-timeout-ubench.c b/benchmarks/ubench/files/patch-ubench.c index 26d8d21c55e5..c56910dc05a3 100644 --- a/benchmarks/ubench/files/patch-timeout-ubench.c +++ b/benchmarks/ubench/files/patch-ubench.c @@ -1,6 +1,6 @@ ---- ubench.c.orig 2000-05-28 20:07:21.000000000 -0700 -+++ ubench.c 2010-11-23 14:20:52.000000000 -0800 -@@ -37,11 +37,11 @@ +--- ubench.c.orig 2000-05-29 03:07:21 UTC ++++ ubench.c +@@ -37,11 +37,11 @@ extern char *_sys_errlist[]; #define sys_errlist _sys_errlist #endif @@ -16,7 +16,7 @@ #endif void signalSetup(); -@@ -66,10 +66,10 @@ +@@ -66,10 +66,10 @@ void print_usage() { #ifdef DISKNETYES fprintf(stderr, @@ -29,7 +29,7 @@ #endif } /*****************************************************************************/ -@@ -81,6 +81,7 @@ +@@ -81,6 +81,7 @@ char *argc[]; int s = 1; int k = 1; int i = 1; @@ -37,7 +37,7 @@ while ( argc[i] ) if ( argc[i][0]=='-' ) -@@ -112,6 +113,17 @@ +@@ -112,6 +113,17 @@ prgs: switch ( argc[i][s] ) s++; ONEflag=1; goto prgs; @@ -55,7 +55,7 @@ default: print_version(); print_usage(); -@@ -156,11 +168,11 @@ +@@ -156,11 +168,11 @@ prgs: switch ( argc[i][s] ) #endif } i=0; |