Index: head/benchmarks/bonnie/files/patch-Bonnie.c =================================================================== --- head/benchmarks/bonnie/files/patch-Bonnie.c (revision 419177) +++ head/benchmarks/bonnie/files/patch-Bonnie.c (revision 419178) @@ -1,127 +1,127 @@ ---- 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 #include +#if !defined(SysV) +#include +#endif #include #include #include @@ -49,7 +52,7 @@ #define Seeks (4000) #define UpdateSeek (10) #define SeekProcCount (3) -#define Chunk (16384) +#define Chunk (8192) /* 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 */ -main( +int main( 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); - fprintf(stderr, "File '%s', size: %ld\n", name, size); + fprintf(stderr, "File '%s', size: %lld\n", name, size); /* 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); - if (lseek(fd, (off_t) 0, 0) == (off_t) -1) + if (lseek(fd, (off_t) 0, SEEK_SET) == (off_t) -1) 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++]++; - if (lseek(fd, (off_t) -words, 1) == -1) + if (lseek(fd, (off_t) -words, SEEK_CUR) == -1) 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); - if (lseek(fd, (off_t) 0, 0) == -1) + if (lseek(fd, (off_t) 0, SEEK_SET) == -1) 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 */ + close(0); 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 */ - doseek((long) (random() % (size / Chunk)), fd, + off_t seekto; + if (size / Chunk < (1 << 25)) + seekto = random() % (size / Chunk); + else + seekto = (((off_t)random() << 31) + random()) % (size / Chunk); + doseek(seekto, fd, ((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"); - printf("%-8.8s %4d ", machine, size / (1024 * 1024)); + printf("%-8.8s %4lld ", machine, size / (1024 * 1024)); 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]; - sprintf(buf, "Bonnie: drastic I/O error (%s)", message); + if((errno == EOVERFLOW) || (errno == EFBIG)) + sprintf(buf, "\nBonnie: drastic I/O error (%s): %s", message, strerror(errno)); + else + sprintf(buf, "\nBonnie: drastic I/O error (%s)", message); perror(buf); exit(1); } -@@ -557,7 +569,7 @@ +@@ -557,7 +569,7 @@ doseek( off_t size; probe = where * Chunk; - if (lseek(fd, probe, 0) != probe) + if (lseek(fd, (off_t)probe, SEEK_SET) != probe) 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]--; - if (lseek(fd, (long) probe, 0) != probe) + if (lseek(fd, (off_t)probe, SEEK_SET) != probe) io_error("lseek in doseek update"); if (write(fd, (char *) buf, size) == -1) io_error("write in doseek"); Index: head/benchmarks/bonnie++/files/patch-zcav_io.cpp =================================================================== --- head/benchmarks/bonnie++/files/patch-zcav_io.cpp (revision 419177) +++ head/benchmarks/bonnie++/files/patch-zcav_io.cpp (nonexistent) @@ -1,33 +0,0 @@ ---- 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 @@ - for(int loops = 0; !exiting && loops < max_loops; loops++) - { - int i = 0; --#ifdef _LARGEFILE64_SOURCE - if(start_offset) - { - OFF_TYPE real_offset = OFF_TYPE(start_offset) * OFF_TYPE(m_block_size) * OFF_TYPE(1<<20); -@@ -96,7 +95,6 @@ - i = start_offset; - } - else --#endif - if(lseek(m_fd, 0, SEEK_SET)) - { - fprintf(stderr, "Can't lseek().\n"); -@@ -224,14 +222,12 @@ - // Read/write a block of data - double ZcavRead::access_data(int skip) - { --#ifdef _LARGEFILE64_SOURCE - if(skip) - { - OFF_TYPE real_offset = OFF_TYPE(skip) * OFF_TYPE(m_block_size) * OFF_TYPE(1<<20); - if(file_lseek(m_fd, real_offset, SEEK_CUR) == OFF_TYPE(-1)) - return -1.0; - } --#endif - - m_dur.start(); - for(int i = 0; i < m_block_size; i+= m_chunk_size) Property changes on: head/benchmarks/bonnie++/files/patch-zcav_io.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/bonnie++/files/patch-Makefile.in =================================================================== --- head/benchmarks/bonnie++/files/patch-Makefile.in (revision 419177) +++ head/benchmarks/bonnie++/files/patch-Makefile.in (revision 419178) @@ -1,34 +1,34 @@ ---- 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) -CFLAGS=-O2 @debug@ -DNDEBUG $(WFLAGS) $(MORECFLAGS) +CFLAGS=${CXXFLAGS} -DNDEBUG $(WFLAGS) $(MORECFLAGS) 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) - mkdir -p $(eprefix)/bin $(eprefix)/sbin - @INSTALL_PROGRAM@ @stripping@ $(EXES) $(eprefix)/sbin - @INSTALL_PROGRAM@ @stripping@ $(EXE) $(eprefix)/bin - @INSTALL_SCRIPT@ $(SCRIPTS) $(eprefix)/bin + mkdir -p $(DESTDIR)$(eprefix)/bin $(DESTDIR)$(eprefix)/sbin + @INSTALL_PROGRAM@ @stripping@ $(EXES) $(DESTDIR)$(eprefix)/sbin + @INSTALL_PROGRAM@ @stripping@ $(EXE) $(DESTDIR)$(eprefix)/bin + @INSTALL_SCRIPT@ $(SCRIPTS) $(DESTDIR)$(eprefix)/bin install: install-bin - mkdir -p @mandir@/man1 @mandir@/man8 - @INSTALL_DATA@ $(MAN1) @mandir@/man1 - @INSTALL_DATA@ $(MAN8) @mandir@/man8 + mkdir -p $(DESTDIR)@mandir@/man1 $(DESTDIR)@mandir@/man8 + @INSTALL_DATA@ $(MAN1) $(DESTDIR)@mandir@/man1 + @INSTALL_DATA@ $(MAN8) $(DESTDIR)@mandir@/man8 %.o: %.cpp $(CXX) -c $< Index: head/benchmarks/bonnie++/files/patch-bonnie++.cpp =================================================================== --- head/benchmarks/bonnie++/files/patch-bonnie++.cpp (revision 419177) +++ head/benchmarks/bonnie++/files/patch-bonnie++.cpp (revision 419178) @@ -1,67 +1,67 @@ ---- 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) - { delete m_buf; m_buf = new char[__max(size, m_io_chunk_size)]; m_file_chunk_size = size; } + { delete m_buf; m_buf = new char[max(size, m_io_chunk_size)]; m_file_chunk_size = size; } // 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) { - pa_new(__max(m_io_chunk_size, m_file_chunk_size), m_buf, m_buf_pa); + pa_new(max(m_io_chunk_size, m_file_chunk_size), m_buf, m_buf_pa); SetName("."); } -@@ -294,11 +294,7 @@ +@@ -294,11 +294,7 @@ int main(int argc, char *argv[]) { char *sbuf = _strdup(optarg); char *size = strtok(sbuf, ":"); -#ifdef _LARGEFILE64_SOURCE file_size = size_from_str(size, "gt"); -#else - file_size = size_from_str(size, "g"); -#endif 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); } -#ifndef _LARGEFILE64_SOURCE - if(file_size == 2048) - file_size = 2047; - if(file_size > 2048) - { - fprintf(stderr, "Large File Support not present, can't do %dM.\n", file_size); - usage(); - } -#endif - globals.byte_io_size = __min(file_size, globals.byte_io_size); - globals.byte_io_size = __max(0, globals.byte_io_size); + globals.byte_io_size = min(file_size, globals.byte_io_size); + globals.byte_io_size = max(0, globals.byte_io_size); 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(); -#ifndef _LARGEFILE64_SOURCE - if(file_size > (1 << (31 - 20 + globals.io_chunk_bits)) ) - { - fprintf(stderr - , "The small chunk size and large IO size make this test impossible in 32bit.\n"); - usage(); - } -#endif if(file_size && globals.ram && (file_size * concurrency) < (globals.ram * 2) ) { fprintf(stderr Index: head/benchmarks/bonnie++/files/patch-bonnie.h.in =================================================================== --- head/benchmarks/bonnie++/files/patch-bonnie.h.in (revision 419177) +++ head/benchmarks/bonnie++/files/patch-bonnie.h.in (revision 419178) @@ -1,20 +1,20 @@ ---- 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 -using namespace std; - #define BON_VERSION "@version@" #define CSV_VERSION "@csv_version@" -@@ -12,6 +10,8 @@ +@@ -12,6 +10,8 @@ using namespace std; #include #include +using namespace std; + typedef FILE *PFILE; #define SemKey 4711 Index: head/benchmarks/bonnie++/files/patch-duration.cpp =================================================================== --- head/benchmarks/bonnie++/files/patch-duration.cpp (revision 419177) +++ head/benchmarks/bonnie++/files/patch-duration.cpp (revision 419178) @@ -1,26 +1,26 @@ ---- 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 #include "duration.h" -@@ -20,6 +18,8 @@ +@@ -20,6 +18,8 @@ using namespace std; #endif #endif +using namespace std; + 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; - m_max = __max(m_max, ret); + m_max = max(m_max, ret); return ret; } Index: head/benchmarks/bonnie++/files/patch-port.h.in =================================================================== --- head/benchmarks/bonnie++/files/patch-port.h.in (revision 419177) +++ head/benchmarks/bonnie++/files/patch-port.h.in (revision 419178) @@ -1,44 +1,44 @@ ---- 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" #ifndef HAVE_MIN_MAX -#if defined(HAVE_ALGO_H) || defined(HAVE_ALGO) -#ifdef HAVE_ALGO +#if defined(HAVE_ALGORITHM) +#include +#elif defined(HAVE_ALGO) #include -#else +#elif defined(HAVE_ALGO_H) #include -#endif #else #define min(XX,YY) ((XX) < (YY) ? (XX) : (YY)) #define max(XX,YY) ((XX) > (YY) ? (XX) : (YY)) @@ -19,14 +19,7 @@ @semun@ @bool@ @snprintf@ -#ifndef _LARGEFILE64_SOURCE -@large_file@ -#endif -#ifdef _LARGEFILE64_SOURCE -#define OFF_T_PRINTF "%lld" -#else -#define OFF_T_PRINTF "%d" -#endif +#define OFF_T_PRINTF "%ld" #if @true_false@ #define false 0 -@@ -49,8 +42,6 @@ +@@ -49,8 +42,6 @@ typedef struct timeval TIMEVAL_TYPE; #endif typedef int FILE_TYPE; -#define __min min -#define __max max typedef unsigned int UINT; typedef unsigned long ULONG; typedef const char * PCCHAR; Index: head/benchmarks/bonnie++/files/patch-rand.h =================================================================== --- head/benchmarks/bonnie++/files/patch-rand.h (revision 419177) +++ head/benchmarks/bonnie++/files/patch-rand.h (revision 419178) @@ -1,15 +1,15 @@ ---- 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 -using namespace std; #include "port.h" #include #include #include +using namespace std; class Rand { Index: head/benchmarks/bonnie++/files/patch-zcav.8 =================================================================== --- head/benchmarks/bonnie++/files/patch-zcav.8 (revision 419177) +++ head/benchmarks/bonnie++/files/patch-zcav.8 (revision 419178) @@ -1,12 +1,12 @@ ---- 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! +.SH "SEE ALSO" +.BR bonnie++ (8) + .SH "AUTHOR" This program, it's manual page, and the Debian package were written by Russell Coker . Index: head/benchmarks/bonnie++/files/patch-zcav.cpp =================================================================== --- head/benchmarks/bonnie++/files/patch-zcav.cpp (revision 419177) +++ head/benchmarks/bonnie++/files/patch-zcav.cpp (revision 419178) @@ -1,34 +1,34 @@ ---- 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" -#ifdef _LARGEFILE64_SOURCE " [-s skip rate]\n" -#endif " [-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" -#ifdef _LARGEFILE64_SOURCE "s:" -#endif "u:g:")) ) { switch(char(c)) -@@ -225,11 +221,9 @@ +@@ -225,11 +221,9 @@ int main(int argc, char *argv[]) } } break; -#ifdef _LARGEFILE64_SOURCE case 's': mz.setSkipRate(atoi(optarg)); break; -#endif case 'g': if(groupName) usage(); Index: head/benchmarks/bonnie++/files/patch-zcav__io.cpp =================================================================== --- head/benchmarks/bonnie++/files/patch-zcav__io.cpp (nonexistent) +++ head/benchmarks/bonnie++/files/patch-zcav__io.cpp (revision 419178) @@ -0,0 +1,33 @@ +--- 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; +-#ifdef _LARGEFILE64_SOURCE + if(start_offset) + { + OFF_TYPE real_offset = OFF_TYPE(start_offset) * OFF_TYPE(m_block_size) * OFF_TYPE(1<<20); +@@ -96,7 +95,6 @@ int ZcavRead::Read(int max_loops, int ma + i = start_offset; + } + else +-#endif + if(lseek(m_fd, 0, SEEK_SET)) + { + fprintf(stderr, "Can't lseek().\n"); +@@ -224,14 +222,12 @@ ssize_t ZcavRead::access_all(int count) + // Read/write a block of data + double ZcavRead::access_data(int skip) + { +-#ifdef _LARGEFILE64_SOURCE + if(skip) + { + OFF_TYPE real_offset = OFF_TYPE(skip) * OFF_TYPE(m_block_size) * OFF_TYPE(1<<20); + if(file_lseek(m_fd, real_offset, SEEK_CUR) == OFF_TYPE(-1)) + return -1.0; + } +-#endif + + m_dur.start(); + for(int i = 0; i < m_block_size; i+= m_chunk_size) Property changes on: head/benchmarks/bonnie++/files/patch-zcav__io.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/clpeak/files/patch-src_include_common.h =================================================================== --- head/benchmarks/clpeak/files/patch-src_include_common.h (revision 419177) +++ head/benchmarks/clpeak/files/patch-src_include_common.h (revision 419178) @@ -1,31 +1,31 @@ ---- 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 #endif +#ifdef __FreeBSD__ + #include +#endif + #include #include #include #define TAB " " #define NEWLINE "\n" +#ifndef __FreeBSD__ #define uint unsigned int +#endif #define MAX(X, Y) \ (X > Y)? X: Y; @@ -41,6 +47,8 @@ #elif defined(__arm__) #define OS_NAME "Linux ARM" #endif +#elif defined(__FreeBSD__) + #define OS_NAME "FreeBSD" #endif Index: head/benchmarks/dbench/files/patch-Makefile.in =================================================================== --- head/benchmarks/dbench/files/patch-Makefile.in (revision 419177) +++ head/benchmarks/dbench/files/patch-Makefile.in (revision 419178) @@ -1,21 +1,21 @@ ---- ./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 - ${INSTALLCMD} -d $(bindir) $(datadir) $(mandir) - ${INSTALLCMD} dbench tbench tbench_srv $(bindir) - ${INSTALLCMD} client.txt $(datadir) - ${INSTALLCMD} -m644 dbench.1 $(mandir) - ln -sf dbench.1 $(mandir)/tbench.1 - ln -sf dbench.1 $(mandir)/tbench_srv.1 + ${INSTALLCMD} -d $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) $(DESTDIR)$(mandir)/man1 + ${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)$(bindir) + ${INSTALLCMD} client.txt $(DESTDIR)$(datadir) + ${INSTALLCMD} -m644 dbench.1 $(DESTDIR)$(mandir)/man1 + ln -sf dbench.1 $(DESTDIR)$(mandir)/man1/tbench.1 + ln -sf dbench.1 $(DESTDIR)$(mandir)/man1/tbench_srv.1 clean: rm -f *.o *~ dbench tbench tbench_srv Index: head/benchmarks/dbench/files/patch-dbench.c =================================================================== --- head/benchmarks/dbench/files/patch-dbench.c (revision 419177) +++ head/benchmarks/dbench/files/patch-dbench.c (revision 419178) @@ -1,20 +1,20 @@ ---- ./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); } - semctl(barrier,0,IPC_RMID); + //semctl(barrier,0,IPC_RMID); 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); } - semctl(barrier,0,IPC_RMID); + //semctl(barrier,0,IPC_RMID); signal(SIGALRM, sig_alarm); alarm(PRINT_FREQ); Index: head/benchmarks/dbs/files/patch-src_tcp_trace.c =================================================================== --- head/benchmarks/dbs/files/patch-src_tcp_trace.c (revision 419177) +++ head/benchmarks/dbs/files/patch-src_tcp_trace.c (nonexistent) @@ -1,11 +0,0 @@ ---- 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 @@ - #ifdef _PATH_UNIX - system = _PATH_UNIX; - #else -- system = "/vmunix"; -+ system = "/kernel"; - #endif - #endif - Property changes on: head/benchmarks/dbs/files/patch-src_tcp_trace.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/dbs/files/patch-src_Makefile =================================================================== --- head/benchmarks/dbs/files/patch-src_Makefile (revision 419177) +++ head/benchmarks/dbs/files/patch-src_Makefile (revision 419178) @@ -1,33 +1,33 @@ ---- 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 # -BIN =/usr/local/etc +BIN = ${PREFIX}/bin #CC =gcc -CFLAGS =-O +CFLAGS +=-DHAVE_SYS_PARAM_H #CFLAGS =-g # debug #CFLAGS =-g -DDEBUGMODE -@@ -51,7 +51,7 @@ +@@ -51,7 +51,7 @@ all:: dbsc dbsd obj:: (cd ../obj/$(UNAME); make) -UNAME = `uname|tr -d '/'``uname -r|tr -d '/'` +UNAME = `uname|tr -d '/'` dir:: -@ mkdir ../obj -@ mkdir ../obj/$(UNAME) -@@ -74,7 +74,7 @@ +@@ -74,7 +74,7 @@ tags:: etags *.c *.h install:: - cp -p dbsc dbsd ../script/dbs_view $(BIN) + cp -p dbsc dbsd ../../script/dbs_view $(BIN) dbsc: dbsc.o scan.o dbs.o $(CC) $(BSTATIC) dbsc.o scan.o dbs.o -o $@ -lm $(LDFLAGS) Index: head/benchmarks/dbs/files/patch-src_dbsc.c =================================================================== --- head/benchmarks/dbs/files/patch-src_dbsc.c (revision 419177) +++ head/benchmarks/dbs/files/patch-src_dbsc.c (revision 419178) @@ -1,22 +1,22 @@ ---- 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 +#ifdef HAVE_SYS_PARAM_H +#include +#endif + #include #include #include @@ -69,7 +73,7 @@ #include #include -#if !defined(bsdi) +#if (!defined(BSD) || (BSD < 199306)) #include #endif Index: head/benchmarks/dbs/files/patch-src_dbsd.c =================================================================== --- head/benchmarks/dbs/files/patch-src_dbsd.c (revision 419177) +++ head/benchmarks/dbs/files/patch-src_dbsd.c (revision 419178) @@ -1,35 +1,35 @@ ---- 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 +#ifdef HAVE_SYS_PARAM_H +#include +#endif #include #include #include @@ -80,7 +83,7 @@ #include #endif -#if !defined(bsdi) +#if (!defined(BSD) || (BSD < 199306)) #include #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); +#if !defined(__FreeBSD_version) || (__FreeBSD_version < 400009) d[i].t_idle = htonl((int)rt.d[i].td_cb.t_idle); d[i].t_rtt = htonl((int)rt.d[i].td_cb.t_rtt); +#else + d[i].t_idle = htonl((int)rt.d[i].td_cb.t_rcvtime); + d[i].t_rtt = htonl((int)rt.d[i].td_cb.t_rtttime); +#endif d[i].t_rtseq = htonl((int)rt.d[i].td_cb.t_rtseq); d[i].t_srtt = htonl((int)rt.d[i].td_cb.t_srtt); d[i].t_rttvar = htonl((int)rt.d[i].td_cb.t_rttvar); Index: head/benchmarks/dbs/files/patch-src_record.h =================================================================== --- head/benchmarks/dbs/files/patch-src_record.h (revision 419177) +++ head/benchmarks/dbs/files/patch-src_record.h (revision 419178) @@ -1,12 +1,12 @@ ---- 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 #ifndef __linux__ +#ifndef __FreeBSD__ #include +#endif #include #include /*#define TCPSTATES*/ Index: head/benchmarks/dbs/files/patch-src_scan.c =================================================================== --- head/benchmarks/dbs/files/patch-src_scan.c (revision 419177) +++ head/benchmarks/dbs/files/patch-src_scan.c (revision 419178) @@ -1,22 +1,22 @@ ---- 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 $ *****************************************************************/ +#ifdef HAVE_SYS_PARAM_H +#include +#endif #include #include @@ -58,7 +61,8 @@ #include #endif -#if !defined(bsdi) +#if (!defined(BSD) || (BSD < 199306)) +#error BSD #include #endif Index: head/benchmarks/dbs/files/patch-src_sendrecv.c =================================================================== --- head/benchmarks/dbs/files/patch-src_sendrecv.c (revision 419177) +++ head/benchmarks/dbs/files/patch-src_sendrecv.c (revision 419178) @@ -1,35 +1,35 @@ ---- 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) -#define RECORD(NO,SIZE) (gettimeofday(&(rdp->tv), &tzp),\ +#define RECORD(NO,SIZE) (gettimeofday(&(rdp->tv), (struct timezone *)&tzp),\ rdp->packet_no = (NO),\ rdp->packet_size = (SIZE),\ rdp++, rd->n++) -#define RECORD2(NO,SIZE) (gettimeofday(&(rdp2->tv), &tzp),\ +#define RECORD2(NO,SIZE) (gettimeofday(&(rdp2->tv), (struct timezone *)&tzp),\ rdp2->packet_no = (NO),\ rdp2->packet_size = (SIZE),\ rdp2++, rd2->n++) @@ -87,7 +87,7 @@ _TP1.tv_usec %= 1000000;\ } -#define GETTIMEOFDAY(_TPP) gettimeofday(&tp, &tzp);\ +#define GETTIMEOFDAY(_TPP) gettimeofday(&tp, (struct timezone *)&tzp);\ tp.tv_sec = _TPP.tv_sec - tp.tv_sec;\ tp.tv_usec = _TPP.tv_usec - tp.tv_usec;\ if (tp.tv_usec < 0) {\ @@ -108,7 +108,7 @@ USLEEP(tp); /* before 0.00001s */ -#define WAIT_BEFORE(_TPP) gettimeofday(&tp, &tzp);\ +#define WAIT_BEFORE(_TPP) gettimeofday(&tp, (struct timezone *) &tzp);\ tp.tv_sec = _TPP.tv_sec - tp.tv_sec;\ tp.tv_usec = _TPP.tv_usec - tp.tv_usec - 1000;\ if (tp.tv_usec < 0) {\ Index: head/benchmarks/dbs/files/patch-src_tcp__trace.c =================================================================== --- head/benchmarks/dbs/files/patch-src_tcp__trace.c (nonexistent) +++ head/benchmarks/dbs/files/patch-src_tcp__trace.c (revision 419178) @@ -0,0 +1,11 @@ +--- 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 +- system = "/vmunix"; ++ system = "/kernel"; + #endif + #endif + Property changes on: head/benchmarks/dbs/files/patch-src_tcp__trace.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/dkftpbench/files/patch-Makefile.in =================================================================== --- head/benchmarks/dkftpbench/files/patch-Makefile.in (revision 419177) +++ head/benchmarks/dkftpbench/files/patch-Makefile.in (revision 419178) @@ -1,40 +1,40 @@ ---- 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 -noinst_PROGRAMS = $(TESTS) $(HAND_TESTS) dklimits Poller_bench profile - -lib_LIBRARIES = libPoller.a -pkginclude_HEADERS = \ - Poller.h \ - Poller_devpoll.h \ - Poller_poll.h \ - Poller_select.h \ - Poller_sigio.h \ - Poller_sigfd.h \ - Poller_kqueue.h - - # 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 -install-data-am: install-info-am install-pkgincludeHEADERS +install-data-am: install-info-am 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) \ - $(DESTDIR)$(infodir) $(DESTDIR)$(pkgincludedir) + $(DESTDIR)$(infodir) mostlyclean-generic: Index: head/benchmarks/dkftpbench/files/patch-Platoon.cc =================================================================== --- head/benchmarks/dkftpbench/files/patch-Platoon.cc (revision 419177) +++ head/benchmarks/dkftpbench/files/patch-Platoon.cc (revision 419178) @@ -1,8 +1,8 @@ ---- 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 + #include "Platoon.h" #include "dprint.h" Index: head/benchmarks/filebench/files/patch-parser__gram.c =================================================================== --- head/benchmarks/filebench/files/patch-parser__gram.c (revision 419177) +++ head/benchmarks/filebench/files/patch-parser__gram.c (revision 419178) @@ -1,11 +1,11 @@ ---- 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 */ char *execname; -static int dofile = DOFILE_FALSE; +int dofile = DOFILE_FALSE; static FILE *parentscript; static char *fbbasepath = FILEBENCHDIR; Index: head/benchmarks/himenobench/files/patch-himenobmtxp__l.f =================================================================== --- head/benchmarks/himenobench/files/patch-himenobmtxp__l.f (revision 419177) +++ head/benchmarks/himenobench/files/patch-himenobmtxp__l.f (revision 419178) @@ -1,10 +1,10 @@ ---- 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 C to use UNIX libraries. Please remove it if your system is UNIX. C ------------------- - use portlib IMPLICIT REAL*4(a-h,o-z) C PARAMETER (mimax=513,mjmax=257,mkmax=257) Index: head/benchmarks/himenobench/files/patch-himenobmtxp__m.f =================================================================== --- head/benchmarks/himenobench/files/patch-himenobmtxp__m.f (revision 419177) +++ head/benchmarks/himenobench/files/patch-himenobmtxp__m.f (revision 419178) @@ -1,10 +1,10 @@ ---- 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 C to use UNIX libraries. Please remove it if your system is UNIX. C ------------------- - use portlib IMPLICIT REAL*4(a-h,o-z) C C PARAMETER (mimax=513,mjmax=257,mkmax=257) Index: head/benchmarks/himenobench/files/patch-himenobmtxp__s.f =================================================================== --- head/benchmarks/himenobench/files/patch-himenobmtxp__s.f (revision 419177) +++ head/benchmarks/himenobench/files/patch-himenobmtxp__s.f (revision 419178) @@ -1,10 +1,10 @@ ---- 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 C to use UNIX libraries. Please remove it if your system is UNIX. C ------------------- - use portlib IMPLICIT REAL*4(a-h,o-z) C C PARAMETER (mimax=513,mjmax=257,mkmax=257) Index: head/benchmarks/himenobench/files/patch-himenobmtxp__xl.f =================================================================== --- head/benchmarks/himenobench/files/patch-himenobmtxp__xl.f (revision 419177) +++ head/benchmarks/himenobench/files/patch-himenobmtxp__xl.f (revision 419178) @@ -1,10 +1,10 @@ ---- 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 C to use UNIX libraries. Please remove it if your system is UNIX. C ------------------- - use portlib IMPLICIT REAL*4(a-h,o-z) C PARAMETER (mimax=1025,mjmax=513,mkmax=513) Index: head/benchmarks/himenobench/files/patch-himenobmtxps.c =================================================================== --- head/benchmarks/himenobench/files/patch-himenobmtxps.c (revision 419177) +++ head/benchmarks/himenobench/files/patch-himenobmtxps.c (revision 419178) @@ -1,18 +1,18 @@ ---- 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 @@ ********************************************************************/ #include +#include #ifdef SSMALL #define MIMAX 33 @@ -245,7 +246,6 @@ mflops(int nn,double cpu,double flop) double second() { -#include struct timeval tm; double t ; Index: head/benchmarks/imb/files/patch-src-IMB_declare.h =================================================================== --- head/benchmarks/imb/files/patch-src-IMB_declare.h (revision 419177) +++ head/benchmarks/imb/files/patch-src-IMB_declare.h (nonexistent) @@ -1,10 +0,0 @@ ---- 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 @@ - #include - #include - #include --#include - #include - #include "IMB_appl_errors.h" - #include "IMB_err_check.h" Property changes on: head/benchmarks/imb/files/patch-src-IMB_declare.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/imb/files/patch-src-make_mpich =================================================================== --- head/benchmarks/imb/files/patch-src-make_mpich (revision 419177) +++ head/benchmarks/imb/files/patch-src-make_mpich (nonexistent) @@ -1,18 +0,0 @@ ---- make_mpich.orig Thu Jun 22 09:43:10 2006 -+++ make_mpich Sun Nov 19 14:11:11 2006 -@@ -1,5 +1,5 @@ - # Enter root directory of mpich install --MPI_HOME= -+#MPI_HOME= - - MPICC=$(shell find ${MPI_HOME} -name mpicc -print) - -@@ -12,7 +12,7 @@ - LIB_PATH = - LIBS = - CC = ${MPI_HOME}/bin/mpicc --OPTFLAGS = -O3 -+OPTFLAGS = ${CFLAGS} - CLINKER = ${CC} - LDFLAGS = - CPPFLAGS = Property changes on: head/benchmarks/imb/files/patch-src-make_mpich ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/imb/files/patch-IMB__declare.h =================================================================== --- head/benchmarks/imb/files/patch-IMB__declare.h (nonexistent) +++ head/benchmarks/imb/files/patch-IMB__declare.h (revision 419178) @@ -0,0 +1,10 @@ +--- 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 + #include + #include +-#include + #include + #include "IMB_appl_errors.h" + #include "IMB_err_check.h" Property changes on: head/benchmarks/imb/files/patch-IMB__declare.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/imb/files/patch-make__mpich =================================================================== --- head/benchmarks/imb/files/patch-make__mpich (nonexistent) +++ head/benchmarks/imb/files/patch-make__mpich (revision 419178) @@ -0,0 +1,18 @@ +--- make_mpich.orig 2016-07-27 14:58:51 UTC ++++ make_mpich +@@ -1,5 +1,5 @@ + # Enter root directory of mpich install +-MPI_HOME= ++#MPI_HOME= + + MPICC=$(shell find ${MPI_HOME} -name mpicc -print) + +@@ -12,7 +12,7 @@ endif + LIB_PATH = + LIBS = + CC = ${MPI_HOME}/bin/mpicc +-OPTFLAGS = -O3 ++OPTFLAGS = ${CFLAGS} + CLINKER = ${CC} + LDFLAGS = + CPPFLAGS = Property changes on: head/benchmarks/imb/files/patch-make__mpich ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/iorate/files/patch-ior_mach.c =================================================================== --- head/benchmarks/iorate/files/patch-ior_mach.c (revision 419177) +++ head/benchmarks/iorate/files/patch-ior_mach.c (nonexistent) @@ -1,40 +0,0 @@ ---- 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 @@ - }; - - #else -+#if defined(IOR_LARGE_FILES) && defined(__FreeBSD__) -+#define IOR_SET_LOCK_FLAG F_SETLK -+ struct flock d_lock; /* lock command to run */ -+#else - #ifdef IOR_LARGE_FILES - #define IOR_SET_LOCK_FLAG F_SETLK64 - struct flock64 d_lock; /* lock command to run */ -@@ -418,6 +422,7 @@ - #define IOR_SET_LOCK_FLAG F_SETLK - struct flock d_lock; /* lock command to run */ - #endif -+#endif - - result = 0; /* all OK so far */ - -@@ -486,6 +491,10 @@ - }; - - #else -+#if defined(IOR_LARGE_FILES) && defined(__FreeBSD__) -+#define IOR_SET_LOCK_FLAG F_SETLK -+ struct flock d_lock; /* lock command to run */ -+#else - #ifdef IOR_LARGE_FILES - #define IOR_SET_LOCK_FLAG F_SETLK64 - struct flock64 d_lock; /* lock command to run */ -@@ -493,6 +502,7 @@ - #define IOR_SET_LOCK_FLAG F_SETLK - struct flock d_lock; /* lock command to run */ - #endif -+#endif - - result = 0; /* all OK so far */ - Property changes on: head/benchmarks/iorate/files/patch-ior_mach.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/iorate/files/patch-ior_mach.h =================================================================== --- head/benchmarks/iorate/files/patch-ior_mach.h (revision 419177) +++ head/benchmarks/iorate/files/patch-ior_mach.h (nonexistent) @@ -1,36 +0,0 @@ ---- ior_mach.h_orig 2013-01-27 01:03:32.000000000 +0200 -+++ ior_mach.h 2013-01-27 01:53:51.000000000 +0200 -@@ -142,7 +142,6 @@ - #define IOR_MAX_SEEK (HUGE)(4398046511104LL) /* 4 TB */ - #endif - -- - /************************ OS is LINUX? ************************/ - /* - * Since RedHat uses their own version, check for it -@@ -203,6 +202,16 @@ - #endif - - -+/************************ OS is FreeBSD? ***********************/ -+#ifdef __FreeBSD__ -+#include -+#ifdef IOR_LARGE_FILES -+#define HUGE __off_t -+#define IOR_SEEK lseek -+#define IOR_MAX_SEEK (HUGE)(4398046511104LL) /* 4 TB */ -+#endif -+#endif -+ - /************************ OS is unknown? ************************/ - /* - * OK, not a known type, or did not set up large file support -@@ -240,7 +249,7 @@ - /* - * process exit status - */ --#if defined( _AIX ) || defined( HPUX ) || defined( __CYGWIN__ ) -+#if defined( _AIX ) || defined( HPUX ) || defined( __CYGWIN__ ) || defined(__FreeBSD__) - #include - #else - #include Property changes on: head/benchmarks/iorate/files/patch-ior_mach.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/iorate/files/patch-ior__mach.c =================================================================== --- head/benchmarks/iorate/files/patch-ior__mach.c (nonexistent) +++ head/benchmarks/iorate/files/patch-ior__mach.c (revision 419178) @@ -0,0 +1,40 @@ +--- 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 ++#if defined(IOR_LARGE_FILES) && defined(__FreeBSD__) ++#define IOR_SET_LOCK_FLAG F_SETLK ++ struct flock d_lock; /* lock command to run */ ++#else + #ifdef IOR_LARGE_FILES + #define IOR_SET_LOCK_FLAG F_SETLK64 + struct flock64 d_lock; /* lock command to run */ +@@ -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 ++#endif + + result = 0; /* all OK so far */ + +@@ -486,6 +491,10 @@ int ior_dev_unlock( ior_config *cfg, lon + }; + + #else ++#if defined(IOR_LARGE_FILES) && defined(__FreeBSD__) ++#define IOR_SET_LOCK_FLAG F_SETLK ++ struct flock d_lock; /* lock command to run */ ++#else + #ifdef IOR_LARGE_FILES + #define IOR_SET_LOCK_FLAG F_SETLK64 + struct flock64 d_lock; /* lock command to run */ +@@ -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 ++#endif + + result = 0; /* all OK so far */ + Property changes on: head/benchmarks/iorate/files/patch-ior__mach.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/iorate/files/patch-ior__mach.h =================================================================== --- head/benchmarks/iorate/files/patch-ior__mach.h (nonexistent) +++ head/benchmarks/iorate/files/patch-ior__mach.h (revision 419178) @@ -0,0 +1,36 @@ +--- 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 + +- + /************************ OS is LINUX? ************************/ + /* + * Since RedHat uses their own version, check for it +@@ -203,6 +202,16 @@ + #endif + + ++/************************ OS is FreeBSD? ***********************/ ++#ifdef __FreeBSD__ ++#include ++#ifdef IOR_LARGE_FILES ++#define HUGE __off_t ++#define IOR_SEEK lseek ++#define IOR_MAX_SEEK (HUGE)(4398046511104LL) /* 4 TB */ ++#endif ++#endif ++ + /************************ OS is unknown? ************************/ + /* + * OK, not a known type, or did not set up large file support +@@ -240,7 +249,7 @@ + /* + * process exit status + */ +-#if defined( _AIX ) || defined( HPUX ) || defined( __CYGWIN__ ) ++#if defined( _AIX ) || defined( HPUX ) || defined( __CYGWIN__ ) || defined(__FreeBSD__) + #include + #else + #include Property changes on: head/benchmarks/iorate/files/patch-ior__mach.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/iozone21/files/patch-Makefile =================================================================== --- head/benchmarks/iozone21/files/patch-Makefile (revision 419177) +++ head/benchmarks/iozone21/files/patch-Makefile (revision 419178) @@ -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 Index: head/benchmarks/iperf/files/patch-src__Client.cpp =================================================================== --- head/benchmarks/iperf/files/patch-src__Client.cpp (revision 419177) +++ head/benchmarks/iperf/files/patch-src__Client.cpp (nonexistent) @@ -1,16 +0,0 @@ -# -# If the network card's buffer is full, send returns -1 and sets -# 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 @@ - - // perform write - currLen = write( mSettings->mSock, mBuf, mSettings->mBufLen ); -- if ( currLen < 0 ) { -+ if ( currLen < 0 && errno != ENOBUFS ) { - WARN_errno( currLen < 0, "write2" ); - break; - } Property changes on: head/benchmarks/iperf/files/patch-src__Client.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/iperf/files/patch-src_Client.cpp =================================================================== --- head/benchmarks/iperf/files/patch-src_Client.cpp (nonexistent) +++ head/benchmarks/iperf/files/patch-src_Client.cpp (revision 419178) @@ -0,0 +1,16 @@ +# +# If the network card's buffer is full, send returns -1 and sets +# errno to ENOBUFS, which causes issues with the UDP bandwidth tests. +# Check if errno != ENOBUFS after write(2). +# +--- 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 ); +- if ( currLen < 0 ) { ++ if ( currLen < 0 && errno != ENOBUFS ) { + WARN_errno( currLen < 0, "write2" ); + break; + } Property changes on: head/benchmarks/iperf/files/patch-src_Client.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/libmicro/files/patch-cascade_cond.c =================================================================== --- head/benchmarks/libmicro/files/patch-cascade_cond.c (revision 419177) +++ head/benchmarks/libmicro/files/patch-cascade_cond.c (nonexistent) @@ -1,36 +0,0 @@ ---- 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 @@ - - (void) sprintf(lm_usage, - " [-o] (do signal outside mutex)\n" -- " [-s] (force PTHREAD_PROCESS_SHARED)\n" - "notes: thread cascade using pthread_conds\n"); - - return (0); -@@ -101,9 +100,6 @@ - case 'o': - opto = 1; - break; -- case 's': -- opts = 1; -- break; - default: - return (-1); - } -@@ -152,6 +148,7 @@ - - (void) pthread_mutexattr_init(&ma); - (void) pthread_condattr_init(&ca); -+#if !defined(__FreeBSD__) - if (lm_optP > 1 || opts) { - (void) pthread_mutexattr_setpshared(&ma, - PTHREAD_PROCESS_SHARED); -@@ -163,6 +160,7 @@ - (void) pthread_condattr_setpshared(&ca, - PTHREAD_PROCESS_PRIVATE); - } -+#endif - - for (i = 0; i < nlocks; i++) { - (void) pthread_mutex_init(&mxs[i], &ma); Property changes on: head/benchmarks/libmicro/files/patch-cascade_cond.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/libmicro/files/patch-mmpa.c =================================================================== --- head/benchmarks/libmicro/files/patch-mmpa.c (revision 419177) +++ head/benchmarks/libmicro/files/patch-mmpa.c (nonexistent) @@ -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 - #include - #include - #include Property changes on: head/benchmarks/libmicro/files/patch-mmpa.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/libmicro/files/patch-cascade_mutex.c =================================================================== --- head/benchmarks/libmicro/files/patch-cascade_mutex.c (revision 419177) +++ head/benchmarks/libmicro/files/patch-cascade_mutex.c (nonexistent) @@ -1,36 +0,0 @@ ---- 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 @@ - lm_defN = "cscd_mutex"; - - (void) sprintf(lm_usage, -- " [-s] (force PTHREAD_PROCESS_SHARED)\n" - "notes: thread cascade using pthread_mutexes\n"); - - return (0); -@@ -94,9 +93,6 @@ - benchmark_optswitch(int opt, char *optarg) - { - switch (opt) { -- case 's': -- opts = 1; -- break; - default: - return (-1); - } -@@ -123,6 +119,7 @@ - } - - (void) pthread_mutexattr_init(&ma); -+#if !defined(__FreeBSD__) - if (lm_optP > 1 || opts) { - (void) pthread_mutexattr_setpshared(&ma, - PTHREAD_PROCESS_SHARED); -@@ -130,6 +127,7 @@ - (void) pthread_mutexattr_setpshared(&ma, - PTHREAD_PROCESS_PRIVATE); - } -+#endif - - for (i = 0; i < nlocks; i++) { - (void) pthread_mutex_init(&locks[i], &ma); Property changes on: head/benchmarks/libmicro/files/patch-cascade_mutex.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/libmicro/files/patch-Makefile =================================================================== --- head/benchmarks/libmicro/files/patch-Makefile (revision 419177) +++ head/benchmarks/libmicro/files/patch-Makefile (revision 419178) @@ -1,11 +1,11 @@ ---- 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 -default $(ALL) run cstyle lint tattle: $(BINS) +all $(ALL) run cstyle lint tattle: $(BINS) @cp bench.sh bench @cp multiview.sh multiview @cp wrapper.sh wrapper Index: head/benchmarks/libmicro/files/patch-Makefile.FreeBSD =================================================================== --- head/benchmarks/libmicro/files/patch-Makefile.FreeBSD (revision 419177) +++ head/benchmarks/libmicro/files/patch-Makefile.FreeBSD (revision 419178) @@ -1,45 +1,45 @@ ---- /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 +# +# The contents of this file are subject to the terms +# of the Common Development and Distribution License +# (the "License"). You may not use this file except +# in compliance with the License. +# +# You can obtain a copy of the license at +# src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing +# permissions and limitations under the License. +# +# When distributing Covered Code, include this CDDL +# HEADER in each file and include the License file at +# usr/src/OPENSOLARIS.LICENSE. If applicable, +# add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your +# own identifying information: Portions Copyright [yyyy] +# [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# ident "@(#)Makefile.FreeBSD 1.5 05/08/04 SMI" +# + +#CFLAGS= -O -DUSE_SEMOP +CPPFLAGS= -D_REENTRANT +MATHLIB= -lm + +ELIDED_BENCHMARKS= \ + cachetocache \ + atomic + + +include ../Makefile.com Index: head/benchmarks/libmicro/files/patch-bench.sh =================================================================== --- head/benchmarks/libmicro/files/patch-bench.sh (revision 419177) +++ head/benchmarks/libmicro/files/patch-bench.sh (revision 419178) @@ -1,32 +1,32 @@ ---- 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 -ARCH=`arch -k` +ARCH=`uname -p` # 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 +if [ F"`uname -s`" = F"FreeBSD" ] ; then + p_count=`sysctl -n hw.ncpu` + p_mhz=`sysctl -n hw.clockrate` + p_type=`sysctl -n hw.model` +fi + 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 -memset $OPTS -N "memsetP2_10m" -s 10m -P 2 -I 2000000 memrand $OPTS -N "memrand" -s 128m -B 10000 cachetocache $OPTS -N "cachetocache" -s 100k -T 2 -I 200 Index: head/benchmarks/libmicro/files/patch-cascade__cond.c =================================================================== --- head/benchmarks/libmicro/files/patch-cascade__cond.c (nonexistent) +++ head/benchmarks/libmicro/files/patch-cascade__cond.c (revision 419178) @@ -0,0 +1,36 @@ +--- 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" +- " [-s] (force PTHREAD_PROCESS_SHARED)\n" + "notes: thread cascade using pthread_conds\n"); + + return (0); +@@ -97,9 +96,6 @@ benchmark_optswitch(int opt, char *optar + case 'o': + opto = 1; + break; +- case 's': +- opts = 1; +- break; + default: + return (-1); + } +@@ -148,6 +144,7 @@ benchmark_initrun() + + (void) pthread_mutexattr_init(&ma); + (void) pthread_condattr_init(&ca); ++#if !defined(__FreeBSD__) + if (lm_optP > 1 || opts) { + (void) pthread_mutexattr_setpshared(&ma, + PTHREAD_PROCESS_SHARED); +@@ -159,6 +156,7 @@ benchmark_initrun() + (void) pthread_condattr_setpshared(&ca, + PTHREAD_PROCESS_PRIVATE); + } ++#endif + + for (i = 0; i < nlocks; i++) { + (void) pthread_mutex_init(&mxs[i], &ma); Property changes on: head/benchmarks/libmicro/files/patch-cascade__cond.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/libmicro/files/patch-cascade__mutex.c =================================================================== --- head/benchmarks/libmicro/files/patch-cascade__mutex.c (nonexistent) +++ head/benchmarks/libmicro/files/patch-cascade__mutex.c (revision 419178) @@ -0,0 +1,36 @@ +--- 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, +- " [-s] (force PTHREAD_PROCESS_SHARED)\n" + "notes: thread cascade using pthread_mutexes\n"); + + return (0); +@@ -90,9 +89,6 @@ int + benchmark_optswitch(int opt, char *optarg) + { + switch (opt) { +- case 's': +- opts = 1; +- break; + default: + return (-1); + } +@@ -119,6 +115,7 @@ benchmark_initrun() + } + + (void) pthread_mutexattr_init(&ma); ++#if !defined(__FreeBSD__) + if (lm_optP > 1 || opts) { + (void) pthread_mutexattr_setpshared(&ma, + PTHREAD_PROCESS_SHARED); +@@ -126,6 +123,7 @@ benchmark_initrun() + (void) pthread_mutexattr_setpshared(&ma, + PTHREAD_PROCESS_PRIVATE); + } ++#endif + + for (i = 0; i < nlocks; i++) { + (void) pthread_mutex_init(&locks[i], &ma); Property changes on: head/benchmarks/libmicro/files/patch-cascade__mutex.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/libmicro/files/patch-getcontext.c =================================================================== --- head/benchmarks/libmicro/files/patch-getcontext.c (revision 419177) +++ head/benchmarks/libmicro/files/patch-getcontext.c (revision 419178) @@ -1,10 +1,10 @@ ---- 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 #include #include +#include #include #include "libmicro.h" Index: head/benchmarks/libmicro/files/patch-getrusage.c =================================================================== --- head/benchmarks/libmicro/files/patch-getrusage.c (revision 419177) +++ head/benchmarks/libmicro/files/patch-getrusage.c (revision 419178) @@ -1,10 +1,10 @@ ---- 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 #include #include +#include #include #include "libmicro.h" Index: head/benchmarks/libmicro/files/patch-libmicro.c =================================================================== --- head/benchmarks/libmicro/files/patch-libmicro.c (revision 419177) +++ head/benchmarks/libmicro/files/patch-libmicro.c (revision 419178) @@ -1,17 +1,17 @@ ---- 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); +#if !defined(__FreeBSD__) (void) pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED); +#endif (void) pthread_condattr_init(&cattr); +#if !defined(__FreeBSD__) (void) pthread_condattr_setpshared(&cattr, PTHREAD_PROCESS_SHARED); +#endif (void) pthread_mutex_init(&b->ba_lock, &attr); (void) pthread_cond_init(&b->ba_cv, &cattr); Index: head/benchmarks/libmicro/files/patch-longjmp.c =================================================================== --- head/benchmarks/libmicro/files/patch-longjmp.c (revision 419177) +++ head/benchmarks/libmicro/files/patch-longjmp.c (revision 419178) @@ -1,11 +1,11 @@ ---- 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) { - int i = 0; + volatile int i = 0; jmp_buf env; (void) setjmp(env); Index: head/benchmarks/libmicro/files/patch-mmap.c =================================================================== --- head/benchmarks/libmicro/files/patch-mmap.c (nonexistent) +++ head/benchmarks/libmicro/files/patch-mmap.c (revision 419178) @@ -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 + #include + #include + #include Property changes on: head/benchmarks/libmicro/files/patch-mmap.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/libmicro/files/patch-msync.c =================================================================== --- head/benchmarks/libmicro/files/patch-msync.c (revision 419177) +++ head/benchmarks/libmicro/files/patch-msync.c (revision 419178) @@ -1,10 +1,10 @@ ---- 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 #include #include #include Index: head/benchmarks/libmicro/files/patch-multiview.sh =================================================================== --- head/benchmarks/libmicro/files/patch-multiview.sh (revision 419177) +++ head/benchmarks/libmicro/files/patch-multiview.sh (revision 419178) @@ -1,39 +1,39 @@ ---- 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 -/bin/nawk ' BEGIN { +/usr/bin/awk ' BEGIN { benchmark_count = 0; header_count = 0; } /^#/ { - continue; + next; } /errors/ { - continue; + next; } /^\!/ { split($0, A_header, ":"); -@@ -59,7 +59,7 @@ +@@ -57,7 +57,7 @@ header_names[name] = ++header_count; headers[header_count] = name; } - continue; + next; } { -@@ -136,7 +136,7 @@ +@@ -136,7 +136,7 @@ END { for (j = 2; j < ARGC; j++) printf("%s\n", "not computed"); - continue; + next; } for (j = 2; j < ARGC; j++) { Index: head/benchmarks/libmicro/files/patch-mutex.c =================================================================== --- head/benchmarks/libmicro/files/patch-mutex.c (revision 419177) +++ head/benchmarks/libmicro/files/patch-mutex.c (revision 419178) @@ -1,14 +1,14 @@ ---- 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); +#if !defined(__FreeBSD__) if (optp) (void) pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED); +#endif if (pthread_mutex_init(lock, &attr) != 0) errors++; Index: head/benchmarks/libmicro/files/patch-setcontext.c =================================================================== --- head/benchmarks/libmicro/files/patch-setcontext.c (revision 419177) +++ head/benchmarks/libmicro/files/patch-setcontext.c (revision 419178) @@ -1,10 +1,10 @@ ---- 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 #include #include +#include #include #include "libmicro.h" Index: head/benchmarks/libmicro/files/patch-siglongjmp.c =================================================================== --- head/benchmarks/libmicro/files/patch-siglongjmp.c (revision 419177) +++ head/benchmarks/libmicro/files/patch-siglongjmp.c (revision 419178) @@ -1,11 +1,11 @@ ---- 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; - int i = 0; + volatile int i = 0; (void) sigsetjmp(ts->ts_env, 1); Index: head/benchmarks/libmicro/files/patch-writev.c =================================================================== --- head/benchmarks/libmicro/files/patch-writev.c (revision 419177) +++ head/benchmarks/libmicro/files/patch-writev.c (revision 419178) @@ -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 #include #include #include - #include +@@ -35,6 +36,10 @@ #include #include -+ + +#ifndef UIO_MAXIOV +#define UIO_MAXIOV 1024 +#endif - ++ #ifndef IOV_MAX #define IOV_MAX UIO_MAXIOV + #endif Index: head/benchmarks/lmbench/files/patch-results__Makefile =================================================================== --- head/benchmarks/lmbench/files/patch-results__Makefile (revision 419177) +++ head/benchmarks/lmbench/files/patch-results__Makefile (nonexistent) @@ -1,43 +0,0 @@ ---- ./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 @@ - echo .ps 12 >> summary.roff - echo .po .35i >> summary.roff - echo .sp .5i >> summary.roff -- make LIST="$(LIST)" summary >> summary.roff -+ ${MAKE} LIST="$(LIST)" summary >> summary.roff - echo .bp >> summary.roff - echo .sp .5i >> summary.roff -- make LIST="$(LIST)" percent >> summary.roff -+ ${MAKE} LIST="$(LIST)" percent >> summary.roff - - list: - @echo $(LIST) -@@ -185,11 +185,11 @@ - # XXX - this has to be made incremental, doing everything over from - # scratch makes you want a Ghz machine. - html: dirs -- -make clean -+ -${MAKE} clean - #$(SCRIPTS)bghtml $(BG) - $(SCRIPTS)html-list $(LIST) - $(MK) LIST="$(LIST)" summary > HTML/summary.out 2> HTML/summary.errs -- #make LIST="$(LIST)" percent > HTML/percent.out 2> HTML/percent.errs -+ #${MAKE} LIST="$(LIST)" percent > HTML/percent.out 2> HTML/percent.errs - $(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 @@ - rm HTML/*.pbm HTML/___tmp* - - htmltest: dirs -- -make clean -+ -${MAKE} clean - #$(SCRIPTS)bghtml $(BG) - $(SCRIPTS)html-list $(LIST) - $(MK) LIST="$(LIST)" summary > HTML/summary.out 2> HTML/summary.errs -- #make LIST="$(LIST)" percent > HTML/percent.out 2> HTML/percent.errs -+ #${MAKE} LIST="$(LIST)" percent > HTML/percent.out 2> HTML/percent.errs - $(MK) LIST="$(LIST)" SIZE= PRINT="$(PS)" \ - GMEM="$(GMEM) -cut -gthk1" GCTX="$(GCTX) -cut -gthk1" print - Property changes on: head/benchmarks/lmbench/files/patch-results__Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/lmbench/files/patch-scripts__config-run =================================================================== --- head/benchmarks/lmbench/files/patch-scripts__config-run (revision 419177) +++ head/benchmarks/lmbench/files/patch-scripts__config-run (nonexistent) @@ -1,11 +0,0 @@ ---- ./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 @@ - fi - fi - if [ X$MB = X ] --then $ECHON "Probing system for available memory: $ECHOC" -+then echo $ECHON "Probing system for available memory: $ECHOC" - MB=`../bin/$OS/memsize 4096` - fi - TOTAL_MEM=$MB Property changes on: head/benchmarks/lmbench/files/patch-scripts__config-run ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/lmbench/files/patch-src__Makefile =================================================================== --- head/benchmarks/lmbench/files/patch-src__Makefile (revision 419177) +++ head/benchmarks/lmbench/files/patch-src__Makefile (nonexistent) @@ -1,20 +0,0 @@ ---- ./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 @@ - cp $(EXES) $(BASE)/bin - cp $(INCS) $(BASE)/include - cp $O/lmbench.a $(BASE)/lib/libmbench.a -- cd ../doc; env MAKEFLAGS="$(MAKEFLAGS)" make CC="${CC}" OS="${OS}" BASE="$(BASE)" install -+ cd ../doc; env MAKEFLAGS="$(MAKEFLAGS)" ${MAKE} CC="${CC}" OS="${OS}" BASE="$(BASE)" install - - - # No special handling for all these -@@ -239,7 +239,7 @@ - $(COMPILE) -c getopt.c -o $O/getopt.o - - $(UTILS) : -- -cd ../scripts; make get -+ -cd ../scripts; ${MAKE} get - - # Do not remove the next line, $(MAKE) depend needs it - # MAKEDEPEND follows Property changes on: head/benchmarks/lmbench/files/patch-src__Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/lmbench/files/patch-scripts__getpercent =================================================================== --- head/benchmarks/lmbench/files/patch-scripts__getpercent (revision 419177) +++ head/benchmarks/lmbench/files/patch-scripts__getpercent (nonexistent) @@ -1,11 +0,0 @@ ---- ./scripts/getpercent.orig 2009-06-25 13:59:43.000000000 -0400 -+++ ./scripts/getpercent 2009-06-25 14:04:59.000000000 -0400 -@@ -5,7 +5,7 @@ - # Hacked into existence by Larry McVoy (lm@sun.com now lm@sgi.com). - # Copyright (c) 1994 Larry McVoy. GPLed software. - # $Id$ --eval 'exec perl -Ssw $0 "$@"' -+eval 'exec perl -Ss $0 "$@"' - if 0; - - $n = 0; # apparently, hpux doesn't init to 0???? Property changes on: head/benchmarks/lmbench/files/patch-scripts__getpercent ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/lmbench/files/patch-results_Makefile =================================================================== --- head/benchmarks/lmbench/files/patch-results_Makefile (nonexistent) +++ head/benchmarks/lmbench/files/patch-results_Makefile (revision 419178) @@ -0,0 +1,43 @@ +--- 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 +- make LIST="$(LIST)" summary >> summary.roff ++ ${MAKE} LIST="$(LIST)" summary >> summary.roff + echo .bp >> summary.roff + echo .sp .5i >> summary.roff +- make LIST="$(LIST)" percent >> summary.roff ++ ${MAKE} LIST="$(LIST)" percent >> summary.roff + + list: + @echo $(LIST) +@@ -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 +- -make clean ++ -${MAKE} clean + #$(SCRIPTS)bghtml $(BG) + $(SCRIPTS)html-list $(LIST) + $(MK) LIST="$(LIST)" summary > HTML/summary.out 2> HTML/summary.errs +- #make LIST="$(LIST)" percent > HTML/percent.out 2> HTML/percent.errs ++ #${MAKE} LIST="$(LIST)" percent > HTML/percent.out 2> HTML/percent.errs + $(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 @@ html: dirs + rm HTML/*.pbm HTML/___tmp* + + htmltest: dirs +- -make clean ++ -${MAKE} clean + #$(SCRIPTS)bghtml $(BG) + $(SCRIPTS)html-list $(LIST) + $(MK) LIST="$(LIST)" summary > HTML/summary.out 2> HTML/summary.errs +- #make LIST="$(LIST)" percent > HTML/percent.out 2> HTML/percent.errs ++ #${MAKE} LIST="$(LIST)" percent > HTML/percent.out 2> HTML/percent.errs + $(MK) LIST="$(LIST)" SIZE= PRINT="$(PS)" \ + GMEM="$(GMEM) -cut -gthk1" GCTX="$(GCTX) -cut -gthk1" print + Property changes on: head/benchmarks/lmbench/files/patch-results_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/lmbench/files/patch-scripts_config-run =================================================================== --- head/benchmarks/lmbench/files/patch-scripts_config-run (nonexistent) +++ head/benchmarks/lmbench/files/patch-scripts_config-run (revision 419178) @@ -0,0 +1,11 @@ +--- 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 ] +-then $ECHON "Probing system for available memory: $ECHOC" ++then echo $ECHON "Probing system for available memory: $ECHOC" + MB=`../bin/$OS/memsize 4096` + fi + TOTAL_MEM=$MB Property changes on: head/benchmarks/lmbench/files/patch-scripts_config-run ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/lmbench/files/patch-scripts_getpercent =================================================================== --- head/benchmarks/lmbench/files/patch-scripts_getpercent (nonexistent) +++ head/benchmarks/lmbench/files/patch-scripts_getpercent (revision 419178) @@ -0,0 +1,11 @@ +--- 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. + # $Id$ +-eval 'exec perl -Ssw $0 "$@"' ++eval 'exec perl -Ss $0 "$@"' + if 0; + + $n = 0; # apparently, hpux doesn't init to 0???? Property changes on: head/benchmarks/lmbench/files/patch-scripts_getpercent ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/lmbench/files/patch-src_Makefile =================================================================== --- head/benchmarks/lmbench/files/patch-src_Makefile (nonexistent) +++ head/benchmarks/lmbench/files/patch-src_Makefile (revision 419178) @@ -0,0 +1,20 @@ +--- 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 +- cd ../doc; env MAKEFLAGS="$(MAKEFLAGS)" make CC="${CC}" OS="${OS}" BASE="$(BASE)" install ++ cd ../doc; env MAKEFLAGS="$(MAKEFLAGS)" ${MAKE} CC="${CC}" OS="${OS}" BASE="$(BASE)" install + + + # No special handling for all these +@@ -239,7 +239,7 @@ $O/getopt.o : getopt.c $(INCS) + $(COMPILE) -c getopt.c -o $O/getopt.o + + $(UTILS) : +- -cd ../scripts; make get ++ -cd ../scripts; ${MAKE} get + + # Do not remove the next line, $(MAKE) depend needs it + # MAKEDEPEND follows Property changes on: head/benchmarks/lmbench/files/patch-src_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/netio/files/patch-Makefile =================================================================== --- head/benchmarks/netio/files/patch-Makefile (revision 419177) +++ head/benchmarks/netio/files/patch-Makefile (revision 419178) @@ -1,11 +1,11 @@ ---- 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 .SUFFIXES: .c $O .c$O: - $(CC) $(CFLAGS) $(INC) -c $*.c + $(CC) $(OUT) $@ $(CFLAGS) $(INC) -c $*.c netio$O: netio.c getopt.h getopt$O: getopt.c getopt.h Index: head/benchmarks/netio/files/patch-netio.c =================================================================== --- head/benchmarks/netio/files/patch-netio.c (revision 419177) +++ head/benchmarks/netio/files/patch-netio.c (revision 419178) @@ -1,335 +1,335 @@ ---- 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 #include #if defined(UNIX) || defined(DJGPP) +#include #include #include #include @@ -546,7 +547,7 @@ int send_data(int socket, void *buffer, int recv_data(int socket, void *buffer, size_t size, int flags) { - size_t rc = recv(socket, buffer, size, flags); + ssize_t rc = recv(socket, buffer, size, flags); if (rc < 0) { @@ -563,8 +564,13 @@ int recv_data(int socket, void *buffer, const int sobufsize = 131072; int nPort = DEFAULTPORT; int nAuxPort = DEFAULTPORT + 1; +#ifdef USE_IPV6 +struct in6_addr addr_server; +struct in6_addr addr_local; +#else struct in_addr addr_server; struct in_addr addr_local; +#endif int udpsocket, udpd; unsigned long nUDPCount; @@ -577,7 +583,11 @@ THREAD TCP_Server(void *arg) TIMER nTimer; long nTime; long long nData; +#ifdef USE_IPV6 + struct sockaddr_in6 sa_server, sa_client; +#else struct sockaddr_in sa_server, sa_client; +#endif int server, client; socklen_type length; struct timeval tv; @@ -591,7 +601,11 @@ THREAD TCP_Server(void *arg) return THREADRESULT; } +#ifdef USE_IPV6 + if ((server = socket(PF_INET6, SOCK_STREAM, 0)) < 0) +#else if ((server = socket(PF_INET, SOCK_STREAM, 0)) < 0) +#endif { psock_errno("socket()"); free(cBuffer); @@ -601,9 +615,15 @@ THREAD TCP_Server(void *arg) setsockopt(server, SOL_SOCKET, SO_RCVBUF, (char *) &sobufsize, sizeof(sobufsize)); setsockopt(server, SOL_SOCKET, SO_SNDBUF, (char *) &sobufsize, sizeof(sobufsize)); +#ifdef USE_IPV6 + sa_server.sin6_family = AF_INET6; + sa_server.sin6_port = htons(nPort); + sa_server.sin6_addr = addr_local; +#else sa_server.sin_family = AF_INET; sa_server.sin_port = htons(nPort); sa_server.sin_addr = addr_local; +#endif if (bind(server, (struct sockaddr *) &sa_server, sizeof(sa_server)) < 0) { @@ -753,7 +773,11 @@ void TCP_Bench(void *arg) long nTime; long long nData; int i; +#ifdef USE_IPV6 + struct sockaddr_in6 sa_server, sa_client; +#else struct sockaddr_in sa_server, sa_client; +#endif int server; int rc; int nByte; @@ -764,7 +788,11 @@ void TCP_Bench(void *arg) return; } +#ifdef USE_IPV6 + if ((server = socket(PF_INET6, SOCK_STREAM, 0)) < 0) +#else if ((server = socket(PF_INET, SOCK_STREAM, 0)) < 0) +#endif { psock_errno("socket()"); free(cBuffer); @@ -774,21 +802,33 @@ void TCP_Bench(void *arg) setsockopt(server, SOL_SOCKET, SO_RCVBUF, (char *) &sobufsize, sizeof(sobufsize)); setsockopt(server, SOL_SOCKET, SO_SNDBUF, (char *) &sobufsize, sizeof(sobufsize)); +#ifdef USE_IPV6 + sa_client.sin6_family = AF_INET6; + sa_client.sin6_port = htons(0); + sa_client.sin6_addr = addr_local; +#else sa_client.sin_family = AF_INET; sa_client.sin_port = htons(0); sa_client.sin_addr = addr_local; +#endif if (bind(server, (struct sockaddr *) &sa_client, sizeof(sa_client)) < 0) { psock_errno("bind()"); soclose(server); free(cBuffer); - return THREADRESULT; + return; } +#ifdef USE_IPV6 + sa_server.sin6_family = AF_INET6; + sa_server.sin6_port = htons(nPort); + sa_server.sin6_addr = addr_server; +#else sa_server.sin_family = AF_INET; sa_server.sin_port = htons(nPort); sa_server.sin_addr = addr_server; +#endif if (connect(server, (struct sockaddr *) &sa_server, sizeof(sa_server)) < 0) { @@ -911,7 +951,11 @@ void TCP_Bench(void *arg) THREAD UDP_Receiver(void *arg) { char *cBuffer; +#ifdef USE_IPV6 + struct sockaddr_in6 sa_server, sa_client; +#else struct sockaddr_in sa_server, sa_client; +#endif int rc; socklen_type nBytes; @@ -921,7 +965,11 @@ THREAD UDP_Receiver(void *arg) return THREADRESULT; } +#ifdef USE_IPV6 + if ((udpsocket = socket(PF_INET6, SOCK_DGRAM, 0)) < 0) +#else if ((udpsocket = socket(PF_INET, SOCK_DGRAM, 0)) < 0) +#endif { psock_errno("socket(DGRAM)"); free(cBuffer); @@ -931,9 +979,15 @@ THREAD UDP_Receiver(void *arg) setsockopt(udpsocket, SOL_SOCKET, SO_RCVBUF, (char *) &sobufsize, sizeof(sobufsize)); setsockopt(udpsocket, SOL_SOCKET, SO_SNDBUF, (char *) &sobufsize, sizeof(sobufsize)); +#ifdef USE_IPV6 + sa_server.sin6_family = AF_INET6; + sa_server.sin6_port = htons(nAuxPort); + sa_server.sin6_addr = addr_local; +#else sa_server.sin_family = AF_INET; sa_server.sin_port = htons(nAuxPort); sa_server.sin_addr = addr_local; +#endif if (bind(udpsocket, (struct sockaddr *) &sa_server, sizeof(sa_server)) < 0) { @@ -973,7 +1027,11 @@ THREAD UDP_Server(void *arg) TIMER nTimer; long nTime; long long nData; +#ifdef USE_IPV6 + struct sockaddr_in6 sa_server, sa_client; +#else struct sockaddr_in sa_server, sa_client; +#endif int server, client; struct timeval tv; fd_set fds; @@ -986,7 +1044,11 @@ THREAD UDP_Server(void *arg) return THREADRESULT; } +#ifdef USE_IPV6 + if ((server = socket(PF_INET6, SOCK_STREAM, 0)) < 0) +#else if ((server = socket(PF_INET, SOCK_STREAM, 0)) < 0) +#endif { psock_errno("socket(STREAM)"); free(cBuffer); @@ -996,9 +1058,15 @@ THREAD UDP_Server(void *arg) setsockopt(server, SOL_SOCKET, SO_RCVBUF, (char *) &sobufsize, sizeof(sobufsize)); setsockopt(server, SOL_SOCKET, SO_SNDBUF, (char *) &sobufsize, sizeof(sobufsize)); +#ifdef USE_IPV6 + sa_server.sin6_family = AF_INET6; + sa_server.sin6_port = htons(nAuxPort); + sa_server.sin6_addr = addr_local; +#else sa_server.sin_family = AF_INET; sa_server.sin_port = htons(nAuxPort); sa_server.sin_addr = addr_local; +#endif if (bind(server, (struct sockaddr *) &sa_server, sizeof(sa_server)) < 0) { @@ -1044,7 +1112,11 @@ THREAD UDP_Server(void *arg) printf("UDP connection established ... "); fflush(stdout); +#ifdef USE_IPV6 + sa_client.sin6_port = htons(nAuxPort); +#else sa_client.sin_port = htons(nAuxPort); +#endif for (;;) { @@ -1160,7 +1232,11 @@ void UDP_Bench(void *arg) long nResult; long long nData; int i; +#ifdef USE_IPV6 + struct sockaddr_in6 sa_server, sa_client; +#else struct sockaddr_in sa_server, sa_client; +#endif int server; int rc, nByte; @@ -1170,7 +1246,11 @@ void UDP_Bench(void *arg) return; } +#ifdef USE_IPV6 + if ((server = socket(PF_INET6, SOCK_STREAM, 0)) < 0) +#else if ((server = socket(PF_INET, SOCK_STREAM, 0)) < 0) +#endif { psock_errno("socket()"); free(cBuffer); @@ -1180,21 +1260,33 @@ void UDP_Bench(void *arg) setsockopt(server, SOL_SOCKET, SO_RCVBUF, (char *) &sobufsize, sizeof(sobufsize)); setsockopt(server, SOL_SOCKET, SO_SNDBUF, (char *) &sobufsize, sizeof(sobufsize)); +#ifdef USE_IPV6 + sa_client.sin6_family = AF_INET6; + sa_client.sin6_port = htons(0); + sa_client.sin6_addr = addr_local; +#else sa_client.sin_family = AF_INET; sa_client.sin_port = htons(0); sa_client.sin_addr = addr_local; +#endif if (bind(server, (struct sockaddr *) &sa_client, sizeof(sa_client)) < 0) { psock_errno("bind(STREAM)"); soclose(server); free(cBuffer); - return THREADRESULT; + return; } +#ifdef USE_IPV6 + sa_server.sin6_family = AF_INET6; + sa_server.sin6_port = htons(nAuxPort); + sa_server.sin6_addr = addr_server; +#else sa_server.sin_family = AF_INET; sa_server.sin_port = htons(nAuxPort); sa_server.sin_addr = addr_server; +#endif if (connect(server, (struct sockaddr *) &sa_server, sizeof(sa_server)) < 0) { @@ -1425,17 +1517,29 @@ int main(int argc, char **argv) return psock_errno("sock_init()"), 1; if (szLocal == 0) +#ifdef USE_IPV6 + addr_local = in6addr_any; +#else addr_local.s_addr = INADDR_ANY; +#endif else { if (isdigit(*szLocal)) +#ifdef USE_IPV6 + inet_pton(AF_INET6, szLocal, &addr_local); +#else addr_local.s_addr = inet_addr(szLocal); +#endif else { if ((host = gethostbyname(szLocal)) == NULL) return psock_errno("gethostbyname()"), 1; +#ifdef USE_IPV6 + addr_local = * (struct in6_addr *) (host->h_addr); +#else addr_local = * (struct in_addr *) (host->h_addr); +#endif } } @@ -1445,13 +1549,21 @@ int main(int argc, char **argv) usage(); if (isdigit(*argv[optind])) +#ifdef USE_IPV6 + inet_pton(AF_INET6, argv[optind], &addr_server); +#else addr_server.s_addr = inet_addr(argv[optind]); +#endif else { if ((host = gethostbyname(argv[optind])) == NULL) return psock_errno("gethostbyname()"), 1; +#ifdef USE_IPV6 + addr_server = * (struct in6_addr *) (host->h_addr); +#else addr_server = * (struct in_addr *) (host->h_addr); +#endif } } } Index: head/benchmarks/netperf/files/patch-packet_byte_script =================================================================== --- head/benchmarks/netperf/files/patch-packet_byte_script (revision 419177) +++ head/benchmarks/netperf/files/patch-packet_byte_script (nonexistent) @@ -1,11 +0,0 @@ ---- 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 @@ - fi - - # where is netperf --NETPERF_DIR=${NETPERF_DIR:=/opt/netperf2/bin} -+NETPERF_DIR=${NETPERF_DIR:=%%PREFIX%%/bin} - - - # at what port will netserver be waiting? If you decide to run Property changes on: head/benchmarks/netperf/files/patch-packet_byte_script ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-sctp_stream_script =================================================================== --- head/benchmarks/netperf/files/patch-sctp_stream_script (revision 419177) +++ head/benchmarks/netperf/files/patch-sctp_stream_script (nonexistent) @@ -1,11 +0,0 @@ ---- 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 @@ - # 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 Property changes on: head/benchmarks/netperf/files/patch-sctp_stream_script ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-tcp_range_script =================================================================== --- head/benchmarks/netperf/files/patch-tcp_range_script (revision 419177) +++ head/benchmarks/netperf/files/patch-tcp_range_script (nonexistent) @@ -1,11 +0,0 @@ ---- 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 @@ - # where is netperf, and are there any "constant" options such as - # the netserver port number - #NETHOME=/usr/etc/net_perf --NETHOME="." -+NETHOME="%%PREFIX%%/bin" - NETPERF=$NETHOME/netperf $PORT - - # How accurate we want the estimate of performance: Property changes on: head/benchmarks/netperf/files/patch-tcp_range_script ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-bloat.sh =================================================================== --- head/benchmarks/netperf/files/patch-bloat.sh (revision 419177) +++ head/benchmarks/netperf/files/patch-bloat.sh (nonexistent) @@ -1,34 +0,0 @@ ---- 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 -@@ -3,12 +3,7 @@ - # buffer bloat on latency. We assume that netperf has been compiled - # with demo-mode enabled via ./configure --enable-demo - --NETPERF=`which netperf` --if [ $? -ne 0 ] --then -- echo "Unable to find a netperf binary." -- exit -1 --fi -+NETPERF="%%PREFIX%%/bin/netperf" - - CHUNK=60 - -@@ -20,7 +15,7 @@ - # in more accurate demo intervals once the STREAM test kicks-in, but a - # somewhat lower transaction rate. not unlike enabling histogram - # mode. --netperf -H $1 -l 7200 -t TCP_RR -D -0.5 -v 2 -- -r 1 2>&1 > netperf_rr.out & -+$NETPERF -H $1 -l 7200 -t TCP_RR -D -0.5 -v 2 -- -r 1 2>&1 > netperf_rr.out & - - # sleep CHUNK seconds - sleep $CHUNK -@@ -29,7 +24,7 @@ - - STREAM_START=`date +%s` - echo "Starting netperf TCP_STREAM test at $STREAM_START" | tee -a bloat.log --netperf -H $1 -l `expr $CHUNK \* 2` -t TCP_STREAM -D 0.25 -v 2 -- -m 1K 2>&1 > netperf_stream.out -+$NETPERF -H $1 -l `expr $CHUNK \* 2` -t TCP_STREAM -D 0.25 -v 2 -- -m 1K 2>&1 > netperf_stream.out - STREAM_STOP=`date +%s` - echo "Netperf TCP_STREAM test stopped at $STREAM_STOP" | tee -a bloat.log - Property changes on: head/benchmarks/netperf/files/patch-bloat.sh ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-runemomniagg2.sh =================================================================== --- head/benchmarks/netperf/files/patch-runemomniagg2.sh (revision 419177) +++ head/benchmarks/netperf/files/patch-runemomniagg2.sh (nonexistent) @@ -1,69 +0,0 @@ ---- 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 -@@ -1,4 +1,7 @@ - #set -x -+ -+NETPERF="%%PREFIX%%/bin/netperf" -+ - # edit and add to this array as necessary - # the hosts you will use should be contiguous - # starting at index zero -@@ -84,11 +87,11 @@ - echo TCP_STREAM - for i in $concurrent_sessions; do - j=0; -- NETUUID=`netperf -t uuid`; -+ NETUUID=`$NETPERF -t uuid`; - echo $i concurrent streams id $NETUUID; - while [ $j -lt $i ]; do - client=`expr $j % $num_cli` ; -- netperf $HDR -t omni -c -C -H ${remote_hosts[$client]} -l $length $confidence -- $CSV -H ${remote_hosts[$client]} $socket_sizes -m 64K -u $NETUUID & HDR="-P 0"; -+ $NETPERF $HDR -t omni -c -C -H ${remote_hosts[$client]} -l $length $confidence -- $CSV -H ${remote_hosts[$client]} $socket_sizes -m 64K -u $NETUUID & HDR="-P 0"; - j=`expr $j + 1`; - done; - wait; -@@ -99,11 +102,11 @@ - echo TCP_MAERTS - for i in $concurrent_sessions; do - j=0; -- NETUUID=`netperf -t uuid`; -+ NETUUID=`$NETPERF -t uuid`; - echo $i concurrent streams id $NETUUID; - while [ $j -lt $i ]; do - client=`expr $j % $num_cli` ; -- netperf $HDR -t omni -c -C -H ${remote_hosts[$client]} -l $length $confidence -- $CSV -H ${remote_hosts[$client]} $socket_sizes -M ,64K -u $NETUUID & HDR="-P 0"; -+ $NETPERF $HDR -t omni -c -C -H ${remote_hosts[$client]} -l $length $confidence -- $CSV -H ${remote_hosts[$client]} $socket_sizes -M ,64K -u $NETUUID & HDR="-P 0"; - j=`expr $j + 1`; - done; - wait; -@@ -115,11 +118,11 @@ - HDR="-P 1" - for i in $concurrent_sessions; - do j=0; -- NETUUID=`netperf -t uuid`; -+ NETUUID=`$NETPERF -t uuid`; - echo $i concurrent streams id $NETUUID; - while [ $j -lt $i ]; do - client=`expr $j % $num_cli` ; -- netperf $HDR -t omni -f m -c -C -H ${remote_hosts[$client]} -l $length $confidence -- $CSV -H ${remote_hosts[$client]} -s 1M -S 1M -r 64K -b 12 -u $NETUUID & HDR="-P 0"; -+ $NETPERF $HDR -t omni -f m -c -C -H ${remote_hosts[$client]} -l $length $confidence -- $CSV -H ${remote_hosts[$client]} -s 1M -S 1M -r 64K -b 12 -u $NETUUID & HDR="-P 0"; - j=`expr $j + 1`; - done; - wait; -@@ -130,14 +133,14 @@ - echo TCP_RR aggregates - HDR="-P 1" - for i in $concurrent_sessions; do -- NETUUID=`netperf -t uuid`; -+ NETUUID=`$NETPERF -t uuid`; - echo $i concurrent streams id $NETUUID; - for b in $burst_sizes; do - echo burst of $b; - j=0; - while [ $j -lt $i ]; do - client=`expr $j % $num_cli` ; -- netperf $HDR -t omni -f x -c -C -H ${remote_hosts[$client]} -l $length $confidence -- $CSV -H ${remote_hosts[$client]} -r 1 -b $b -D -u $NETUUID & HDR="-P 0"; -+ $NETPERF $HDR -t omni -f x -c -C -H ${remote_hosts[$client]} -l $length $confidence -- $CSV -H ${remote_hosts[$client]} -r 1 -b $b -D -u $NETUUID & HDR="-P 0"; - j=`expr $j + 1`; - done; - wait; Property changes on: head/benchmarks/netperf/files/patch-runemomniagg2.sh ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-runemomni.sh =================================================================== --- head/benchmarks/netperf/files/patch-runemomni.sh (revision 419177) +++ head/benchmarks/netperf/files/patch-runemomni.sh (nonexistent) @@ -1,74 +0,0 @@ ---- 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 -@@ -1,6 +1,8 @@ - # a script to run a set of single-instance netperf tests - # between two machines - -+NETPERF="%%PREFIX%%/bin/netperf" -+ - # 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 @@ - fi - for j in $set - do -- netperf $HDR -T $i,$j -t omni -c -C -H $control_host -l $length $confidence -- $CSV -H $data -m 64K;HDR="-P 0"; -+ $NETPERF $HDR -T $i,$j -t omni -c -C -H $control_host -l $length $confidence -- $CSV -H $data -m 64K;HDR="-P 0"; - done - done - fi -@@ -100,7 +102,7 @@ - fi - for j in $set - do -- netperf $HDR -T $i,$j -t omni -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -m 64K;HDR="-P 0"; -+ $NETPERF $HDR -T $i,$j -t omni -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -m 64K;HDR="-P 0"; - done - done - fi -@@ -119,7 +121,7 @@ - fi - for j in $set - do -- netperf $HDR -T $i,$j -t omni -f m -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -r 64K -b 12; HDR="-P 0"; -+ $NETPERF $HDR -T $i,$j -t omni -f m -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -r 64K -b 12; HDR="-P 0"; - done - done - fi -@@ -138,7 +140,7 @@ - fi - for j in $set - do -- netperf $HDR -T $i,$j -t omni -c -C -H $control_host -l $length $confidence -- $CSV -H $data -r 1; HDR="-P 0"; -+ $NETPERF $HDR -T $i,$j -t omni -c -C -H $control_host -l $length $confidence -- $CSV -H $data -r 1; HDR="-P 0"; - done - done - fi -@@ -151,7 +153,7 @@ - do - for req in $reqs; do - for burst in $bursts; do -- netperf $HDR -T $i -t omni -f m -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -r $req -b $burst -D;HDR=-"P 0"; -+ $NETPERF $HDR -T $i -t omni -f m -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -r $req -b $burst -D;HDR=-"P 0"; - done - done - done -@@ -165,7 +167,7 @@ - do - for req in $reqs; do - for burst in $bursts; do -- netperf $HDR -T $i -t omni -f m -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -r $req -b $burst -T udp;HDR=-"P 0"; -+ $NETPERF $HDR -T $i -t omni -f m -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -r $req -b $burst -T udp;HDR=-"P 0"; - done - done - done -@@ -180,7 +182,7 @@ - for i in $netperf_CPUs - do - for req in $reqs; do -- netperf $HDR -T $i -t omni -f m -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -m $req -T udp;HDR=-"P 0"; -+ $NETPERF $HDR -T $i -t omni -f m -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -m $req -T udp;HDR=-"P 0"; - done - done - fi Property changes on: head/benchmarks/netperf/files/patch-runemomni.sh ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-netcpu_sysctl.c =================================================================== --- head/benchmarks/netperf/files/patch-netcpu_sysctl.c (revision 419177) +++ head/benchmarks/netperf/files/patch-netcpu_sysctl.c (nonexistent) @@ -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 -+#include -+#include - #include - - #if HAVE_INTTYPES_H Property changes on: head/benchmarks/netperf/files/patch-netcpu_sysctl.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-snapshot_script =================================================================== --- head/benchmarks/netperf/files/patch-snapshot_script (revision 419177) +++ head/benchmarks/netperf/files/patch-snapshot_script (nonexistent) @@ -1,11 +0,0 @@ ---- 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 -@@ -37,7 +37,7 @@ - # - # where is netperf installed, there are a few possible places: - --NETPERF_CMD=${NETPERF_CMD:=/opt/netperf/netperf} -+NETPERF_CMD=${NETPERF_CMD:=%%PREFIX%%/bin/netperf} - - - # there should be no more than two parms passed Property changes on: head/benchmarks/netperf/files/patch-snapshot_script ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-tcp_rr_script =================================================================== --- head/benchmarks/netperf/files/patch-tcp_rr_script (revision 419177) +++ head/benchmarks/netperf/files/patch-tcp_rr_script (nonexistent) @@ -1,13 +0,0 @@ ---- 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 - - # 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 Property changes on: head/benchmarks/netperf/files/patch-tcp_rr_script ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-udp_rr_script =================================================================== --- head/benchmarks/netperf/files/patch-udp_rr_script (revision 419177) +++ head/benchmarks/netperf/files/patch-udp_rr_script (nonexistent) @@ -1,13 +0,0 @@ ---- 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 - - #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 Property changes on: head/benchmarks/netperf/files/patch-udp_rr_script ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-tcp_stream_script =================================================================== --- head/benchmarks/netperf/files/patch-tcp_stream_script (revision 419177) +++ head/benchmarks/netperf/files/patch-tcp_stream_script (nonexistent) @@ -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 Property changes on: head/benchmarks/netperf/files/patch-tcp_stream_script ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-udp_stream_script =================================================================== --- head/benchmarks/netperf/files/patch-udp_stream_script (revision 419177) +++ head/benchmarks/netperf/files/patch-udp_stream_script (nonexistent) @@ -1,13 +0,0 @@ ---- 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 - - #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 Property changes on: head/benchmarks/netperf/files/patch-udp_stream_script ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-runemomniaggdemo.sh =================================================================== --- head/benchmarks/netperf/files/patch-runemomniaggdemo.sh (revision 419177) +++ head/benchmarks/netperf/files/patch-runemomniaggdemo.sh (nonexistent) @@ -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 Property changes on: head/benchmarks/netperf/files/patch-runemomniaggdemo.sh ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-arr_script =================================================================== --- head/benchmarks/netperf/files/patch-arr_script (revision 419177) +++ head/benchmarks/netperf/files/patch-arr_script (nonexistent) @@ -1,12 +0,0 @@ ---- 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 @@ - TOLERANCE=15 - MAX_RETRIES=3 - -- NETPERF="/usr/local/netperf/netperf" -- NETPERF="./netperf" -+ NETPERF="%%PREFIX%%/bin/netperf" - - NPROC_LIST="" - RR_SIZES="" Property changes on: head/benchmarks/netperf/files/patch-arr_script ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-netperf.man =================================================================== --- head/benchmarks/netperf/files/patch-netperf.man (revision 419177) +++ head/benchmarks/netperf/files/patch-netperf.man (nonexistent) @@ -1,12 +0,0 @@ ---- 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 @@ - .TP - .B \-D [secs,units] (*) - Display interim results at least every secs seconds uning units as the --initial guess for units per second. This is only available when --netperf has been configured with --enable-demo. -+initial guess for units per second. - .TP - .B \-f GMKgmk - Change the units of measure for *_STREAM tests. Capital letters are Property changes on: head/benchmarks/netperf/files/patch-netperf.man ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-nettest_unix.c =================================================================== --- head/benchmarks/netperf/files/patch-nettest_unix.c (revision 419177) +++ head/benchmarks/netperf/files/patch-nettest_unix.c (nonexistent) @@ -1,10 +0,0 @@ ---- 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 @@ - that sort of rot... */ - - #ifdef WANT_INTERVALS -- kept_times[MAX_KEPT_TIMES] = 0; - time_index = 0; - while (time_index < MAX_KEPT_TIMES) { - if (kept_times[time_index] > 0) { Property changes on: head/benchmarks/netperf/files/patch-nettest_unix.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-dscp.c =================================================================== --- head/benchmarks/netperf/files/patch-dscp.c (revision 419177) +++ head/benchmarks/netperf/files/patch-dscp.c (nonexistent) @@ -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 - #include - #endif - #if HAVE_NETINET_IP_H Property changes on: head/benchmarks/netperf/files/patch-dscp.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-configure =================================================================== --- head/benchmarks/netperf/files/patch-configure (revision 419177) +++ head/benchmarks/netperf/files/patch-configure (revision 419178) @@ -1,20 +1,20 @@ ---- ./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 - *-*-freebsd78.*) + *-*-freebsd[7-9].* | *-*-freebsd[1-9][0-9].*) # 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" ;; - *-*-freebsd[4-8].* | *-*-netbsd[1-9].* ) + *-*-freebsd[4-9].* | *-*-freebsd[1-9][0-9].* | *-*-netbsd[1-9].* ) use_cpuutil=true $as_echo "#define USE_SYSCTL /**/" >>confdefs.h Index: head/benchmarks/netperf/files/patch-doc_examples_arr__script =================================================================== --- head/benchmarks/netperf/files/patch-doc_examples_arr__script (nonexistent) +++ head/benchmarks/netperf/files/patch-doc_examples_arr__script (revision 419178) @@ -0,0 +1,12 @@ +--- 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 + +- NETPERF="/usr/local/netperf/netperf" +- NETPERF="./netperf" ++ NETPERF="%%PREFIX%%/bin/netperf" + + NPROC_LIST="" + RR_SIZES="" Property changes on: head/benchmarks/netperf/files/patch-doc_examples_arr__script ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-doc_examples_bloat.sh =================================================================== --- head/benchmarks/netperf/files/patch-doc_examples_bloat.sh (nonexistent) +++ head/benchmarks/netperf/files/patch-doc_examples_bloat.sh (revision 419178) @@ -0,0 +1,34 @@ +--- 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 + +-NETPERF=`which netperf` +-if [ $? -ne 0 ] +-then +- echo "Unable to find a netperf binary." +- exit -1 +-fi ++NETPERF="%%PREFIX%%/bin/netperf" + + CHUNK=60 + +@@ -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. +-netperf -H $1 -l 7200 -t TCP_RR -D -0.5 -v 2 -- -r 1 2>&1 > netperf_rr.out & ++$NETPERF -H $1 -l 7200 -t TCP_RR -D -0.5 -v 2 -- -r 1 2>&1 > netperf_rr.out & + + # sleep CHUNK seconds + sleep $CHUNK +@@ -29,7 +24,7 @@ sleep $CHUNK + + STREAM_START=`date +%s` + echo "Starting netperf TCP_STREAM test at $STREAM_START" | tee -a bloat.log +-netperf -H $1 -l `expr $CHUNK \* 2` -t TCP_STREAM -D 0.25 -v 2 -- -m 1K 2>&1 > netperf_stream.out ++$NETPERF -H $1 -l `expr $CHUNK \* 2` -t TCP_STREAM -D 0.25 -v 2 -- -m 1K 2>&1 > netperf_stream.out + STREAM_STOP=`date +%s` + echo "Netperf TCP_STREAM test stopped at $STREAM_STOP" | tee -a bloat.log + Property changes on: head/benchmarks/netperf/files/patch-doc_examples_bloat.sh ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-doc_examples_packet__byte__script =================================================================== --- head/benchmarks/netperf/files/patch-doc_examples_packet__byte__script (nonexistent) +++ head/benchmarks/netperf/files/patch-doc_examples_packet__byte__script (revision 419178) @@ -0,0 +1,11 @@ +--- 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 +-NETPERF_DIR=${NETPERF_DIR:=/opt/netperf2/bin} ++NETPERF_DIR=${NETPERF_DIR:=%%PREFIX%%/bin} + + + # at what port will netserver be waiting? If you decide to run Property changes on: head/benchmarks/netperf/files/patch-doc_examples_packet__byte__script ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-doc_examples_runemomni.sh =================================================================== --- head/benchmarks/netperf/files/patch-doc_examples_runemomni.sh (nonexistent) +++ head/benchmarks/netperf/files/patch-doc_examples_runemomni.sh (revision 419178) @@ -0,0 +1,74 @@ +--- 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 + ++NETPERF="%%PREFIX%%/bin/netperf" ++ + # 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 @@ do + fi + for j in $set + do +- netperf $HDR -T $i,$j -t omni -c -C -H $control_host -l $length $confidence -- $CSV -H $data -m 64K;HDR="-P 0"; ++ $NETPERF $HDR -T $i,$j -t omni -c -C -H $control_host -l $length $confidence -- $CSV -H $data -m 64K;HDR="-P 0"; + done + done + fi +@@ -100,7 +102,7 @@ do + fi + for j in $set + do +- netperf $HDR -T $i,$j -t omni -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -m 64K;HDR="-P 0"; ++ $NETPERF $HDR -T $i,$j -t omni -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -m 64K;HDR="-P 0"; + done + done + fi +@@ -119,7 +121,7 @@ do + fi + for j in $set + do +- netperf $HDR -T $i,$j -t omni -f m -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -r 64K -b 12; HDR="-P 0"; ++ $NETPERF $HDR -T $i,$j -t omni -f m -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -r 64K -b 12; HDR="-P 0"; + done + done + fi +@@ -138,7 +140,7 @@ do + fi + for j in $set + do +- netperf $HDR -T $i,$j -t omni -c -C -H $control_host -l $length $confidence -- $CSV -H $data -r 1; HDR="-P 0"; ++ $NETPERF $HDR -T $i,$j -t omni -c -C -H $control_host -l $length $confidence -- $CSV -H $data -r 1; HDR="-P 0"; + done + done + fi +@@ -151,7 +153,7 @@ do + do + for req in $reqs; do + for burst in $bursts; do +- netperf $HDR -T $i -t omni -f m -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -r $req -b $burst -D;HDR=-"P 0"; ++ $NETPERF $HDR -T $i -t omni -f m -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -r $req -b $burst -D;HDR=-"P 0"; + done + done + done +@@ -165,7 +167,7 @@ do + do + for req in $reqs; do + for burst in $bursts; do +- netperf $HDR -T $i -t omni -f m -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -r $req -b $burst -T udp;HDR=-"P 0"; ++ $NETPERF $HDR -T $i -t omni -f m -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -r $req -b $burst -T udp;HDR=-"P 0"; + done + done + done +@@ -180,7 +182,7 @@ do + for i in $netperf_CPUs + do + for req in $reqs; do +- netperf $HDR -T $i -t omni -f m -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -m $req -T udp;HDR=-"P 0"; ++ $NETPERF $HDR -T $i -t omni -f m -c -C -H $control_host -l $length $confidence -- $CSV -H $data -s 1M -S 1M -m $req -T udp;HDR=-"P 0"; + done + done + fi Property changes on: head/benchmarks/netperf/files/patch-doc_examples_runemomni.sh ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-doc_examples_runemomniagg2.sh =================================================================== --- head/benchmarks/netperf/files/patch-doc_examples_runemomniagg2.sh (nonexistent) +++ head/benchmarks/netperf/files/patch-doc_examples_runemomniagg2.sh (revision 419178) @@ -0,0 +1,69 @@ +--- doc/examples/runemomniagg2.sh.orig 2011-07-28 18:37:22 UTC ++++ doc/examples/runemomniagg2.sh +@@ -1,4 +1,7 @@ + #set -x ++ ++NETPERF="%%PREFIX%%/bin/netperf" ++ + # edit and add to this array as necessary + # the hosts you will use should be contiguous + # starting at index zero +@@ -84,11 +87,11 @@ echo four dl585 G5 clients rh5.2, each w + echo TCP_STREAM + for i in $concurrent_sessions; do + j=0; +- NETUUID=`netperf -t uuid`; ++ NETUUID=`$NETPERF -t uuid`; + echo $i concurrent streams id $NETUUID; + while [ $j -lt $i ]; do + client=`expr $j % $num_cli` ; +- netperf $HDR -t omni -c -C -H ${remote_hosts[$client]} -l $length $confidence -- $CSV -H ${remote_hosts[$client]} $socket_sizes -m 64K -u $NETUUID & HDR="-P 0"; ++ $NETPERF $HDR -t omni -c -C -H ${remote_hosts[$client]} -l $length $confidence -- $CSV -H ${remote_hosts[$client]} $socket_sizes -m 64K -u $NETUUID & HDR="-P 0"; + j=`expr $j + 1`; + done; + wait; +@@ -99,11 +102,11 @@ echo four dl585 G5 clients rh5.2, each w + echo TCP_MAERTS + for i in $concurrent_sessions; do + j=0; +- NETUUID=`netperf -t uuid`; ++ NETUUID=`$NETPERF -t uuid`; + echo $i concurrent streams id $NETUUID; + while [ $j -lt $i ]; do + client=`expr $j % $num_cli` ; +- netperf $HDR -t omni -c -C -H ${remote_hosts[$client]} -l $length $confidence -- $CSV -H ${remote_hosts[$client]} $socket_sizes -M ,64K -u $NETUUID & HDR="-P 0"; ++ $NETPERF $HDR -t omni -c -C -H ${remote_hosts[$client]} -l $length $confidence -- $CSV -H ${remote_hosts[$client]} $socket_sizes -M ,64K -u $NETUUID & HDR="-P 0"; + j=`expr $j + 1`; + done; + wait; +@@ -115,11 +118,11 @@ echo four dl585 G5 clients rh5.2, each w + HDR="-P 1" + for i in $concurrent_sessions; + do j=0; +- NETUUID=`netperf -t uuid`; ++ NETUUID=`$NETPERF -t uuid`; + echo $i concurrent streams id $NETUUID; + while [ $j -lt $i ]; do + client=`expr $j % $num_cli` ; +- netperf $HDR -t omni -f m -c -C -H ${remote_hosts[$client]} -l $length $confidence -- $CSV -H ${remote_hosts[$client]} -s 1M -S 1M -r 64K -b 12 -u $NETUUID & HDR="-P 0"; ++ $NETPERF $HDR -t omni -f m -c -C -H ${remote_hosts[$client]} -l $length $confidence -- $CSV -H ${remote_hosts[$client]} -s 1M -S 1M -r 64K -b 12 -u $NETUUID & HDR="-P 0"; + j=`expr $j + 1`; + done; + wait; +@@ -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 +- NETUUID=`netperf -t uuid`; ++ NETUUID=`$NETPERF -t uuid`; + echo $i concurrent streams id $NETUUID; + for b in $burst_sizes; do + echo burst of $b; + j=0; + while [ $j -lt $i ]; do + client=`expr $j % $num_cli` ; +- netperf $HDR -t omni -f x -c -C -H ${remote_hosts[$client]} -l $length $confidence -- $CSV -H ${remote_hosts[$client]} -r 1 -b $b -D -u $NETUUID & HDR="-P 0"; ++ $NETPERF $HDR -t omni -f x -c -C -H ${remote_hosts[$client]} -l $length $confidence -- $CSV -H ${remote_hosts[$client]} -r 1 -b $b -D -u $NETUUID & HDR="-P 0"; + j=`expr $j + 1`; + done; + wait; Property changes on: head/benchmarks/netperf/files/patch-doc_examples_runemomniagg2.sh ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-doc_examples_runemomniaggdemo.sh =================================================================== --- head/benchmarks/netperf/files/patch-doc_examples_runemomniaggdemo.sh (nonexistent) +++ head/benchmarks/netperf/files/patch-doc_examples_runemomniaggdemo.sh (revision 419178) @@ -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 Property changes on: head/benchmarks/netperf/files/patch-doc_examples_runemomniaggdemo.sh ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-doc_examples_sctp__stream__script =================================================================== --- head/benchmarks/netperf/files/patch-doc_examples_sctp__stream__script (nonexistent) +++ head/benchmarks/netperf/files/patch-doc_examples_sctp__stream__script (revision 419178) @@ -0,0 +1,11 @@ +--- 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" +-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 Property changes on: head/benchmarks/netperf/files/patch-doc_examples_sctp__stream__script ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-doc_examples_snapshot__script =================================================================== --- head/benchmarks/netperf/files/patch-doc_examples_snapshot__script (nonexistent) +++ head/benchmarks/netperf/files/patch-doc_examples_snapshot__script (revision 419178) @@ -0,0 +1,11 @@ +--- 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: + +-NETPERF_CMD=${NETPERF_CMD:=/opt/netperf/netperf} ++NETPERF_CMD=${NETPERF_CMD:=%%PREFIX%%/bin/netperf} + + + # there should be no more than two parms passed Property changes on: head/benchmarks/netperf/files/patch-doc_examples_snapshot__script ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-doc_examples_tcp__range__script =================================================================== --- head/benchmarks/netperf/files/patch-doc_examples_tcp__range__script (nonexistent) +++ head/benchmarks/netperf/files/patch-doc_examples_tcp__range__script (revision 419178) @@ -0,0 +1,11 @@ +--- 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 +-NETHOME="." ++NETHOME="%%PREFIX%%/bin" + NETPERF=$NETHOME/netperf $PORT + + # How accurate we want the estimate of performance: Property changes on: head/benchmarks/netperf/files/patch-doc_examples_tcp__range__script ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-doc_examples_tcp__rr__script =================================================================== --- head/benchmarks/netperf/files/patch-doc_examples_tcp__rr__script (nonexistent) +++ head/benchmarks/netperf/files/patch-doc_examples_tcp__rr__script (revision 419178) @@ -0,0 +1,11 @@ +--- 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" +-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 Property changes on: head/benchmarks/netperf/files/patch-doc_examples_tcp__rr__script ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-doc_examples_tcp__stream__script =================================================================== --- head/benchmarks/netperf/files/patch-doc_examples_tcp__stream__script (nonexistent) +++ head/benchmarks/netperf/files/patch-doc_examples_tcp__stream__script (revision 419178) @@ -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 Property changes on: head/benchmarks/netperf/files/patch-doc_examples_tcp__stream__script ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-doc_examples_udp__rr__script =================================================================== --- head/benchmarks/netperf/files/patch-doc_examples_udp__rr__script (nonexistent) +++ head/benchmarks/netperf/files/patch-doc_examples_udp__rr__script (revision 419178) @@ -0,0 +1,11 @@ +--- 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" +-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 Property changes on: head/benchmarks/netperf/files/patch-doc_examples_udp__rr__script ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-doc_examples_udp__stream__script =================================================================== --- head/benchmarks/netperf/files/patch-doc_examples_udp__stream__script (nonexistent) +++ head/benchmarks/netperf/files/patch-doc_examples_udp__stream__script (revision 419178) @@ -0,0 +1,11 @@ +--- 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" +-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 Property changes on: head/benchmarks/netperf/files/patch-doc_examples_udp__stream__script ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-doc_netperf.man =================================================================== --- head/benchmarks/netperf/files/patch-doc_netperf.man (nonexistent) +++ head/benchmarks/netperf/files/patch-doc_netperf.man (revision 419178) @@ -0,0 +1,12 @@ +--- 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 +-initial guess for units per second. This is only available when +-netperf has been configured with --enable-demo. ++initial guess for units per second. + .TP + .B \-f GMKgmk + Change the units of measure for *_STREAM tests. Capital letters are Property changes on: head/benchmarks/netperf/files/patch-doc_netperf.man ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-src_dscp.c =================================================================== --- head/benchmarks/netperf/files/patch-src_dscp.c (nonexistent) +++ head/benchmarks/netperf/files/patch-src_dscp.c (revision 419178) @@ -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 + #include + #endif + #if HAVE_NETINET_IP_H Property changes on: head/benchmarks/netperf/files/patch-src_dscp.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-src_netcpu__sysctl.c =================================================================== --- head/benchmarks/netperf/files/patch-src_netcpu__sysctl.c (nonexistent) +++ head/benchmarks/netperf/files/patch-src_netcpu__sysctl.c (revision 419178) @@ -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 ++#include ++#include + #include + + #if HAVE_INTTYPES_H Property changes on: head/benchmarks/netperf/files/patch-src_netcpu__sysctl.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/netperf/files/patch-src_nettest__unix.c =================================================================== --- head/benchmarks/netperf/files/patch-src_nettest__unix.c (nonexistent) +++ head/benchmarks/netperf/files/patch-src_nettest__unix.c (revision 419178) @@ -0,0 +1,10 @@ +--- 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 +- kept_times[MAX_KEPT_TIMES] = 0; + time_index = 0; + while (time_index < MAX_KEPT_TIMES) { + if (kept_times[time_index] > 0) { Property changes on: head/benchmarks/netperf/files/patch-src_nettest__unix.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/netpipe/files/patch-dox-netpipe.1 =================================================================== --- head/benchmarks/netpipe/files/patch-dox-netpipe.1 (revision 419177) +++ head/benchmarks/netpipe/files/patch-dox-netpipe.1 (nonexistent) @@ -1,46 +0,0 @@ ---- 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 @@ - .IB E valuator - - .SH SYNOPSIS --.B NPtcp -+.B "NPtcp|NPtcp6" - [\c - .BI \-h \ receiver_hostname\fR\c - ] -@@ -124,9 +124,9 @@ - - - --.SH TESTING TCP -+.SH TESTING TCP/TCP6 - .PP --NPtcp can now be launched in two ways, by manually starting NPtcp on -+NPtcp can now be launched in two ways, by manually starting NPtcp or NPtcp6 on - 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 @@ - 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. -- -+.PP -+The NPtcp6 program is launched in a similar manner. -+.PP - 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 @@ - .ne 3 - - .TP -+.BI \-P \ \fIport\fR -+Set the port number used by the TCP and TCP6 tests to \fIport\fR. -+.ne 3 -+ -+.TP - .B \-r - This option resets the TCP sockets after every test (TCP module only). - It is necessary for some streaming tests to get good measurements Property changes on: head/benchmarks/netpipe/files/patch-dox-netpipe.1 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/netpipe/files/patch-dox_netpipe.1 =================================================================== --- head/benchmarks/netpipe/files/patch-dox_netpipe.1 (nonexistent) +++ head/benchmarks/netpipe/files/patch-dox_netpipe.1 (revision 419178) @@ -0,0 +1,46 @@ +--- dox/netpipe.1.orig 2010-08-19 20:34:26 UTC ++++ dox/netpipe.1 +@@ -26,7 +26,7 @@ NetPIPE \- + .IB E valuator + + .SH SYNOPSIS +-.B NPtcp ++.B "NPtcp|NPtcp6" + [\c + .BI \-h \ receiver_hostname\fR\c + ] +@@ -124,9 +124,9 @@ by using the existing modules as example + + + +-.SH TESTING TCP ++.SH TESTING TCP/TCP6 + .PP +-NPtcp can now be launched in two ways, by manually starting NPtcp on ++NPtcp can now be launched in two ways, by manually starting NPtcp or NPtcp6 on + 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 @@ 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. +- ++.PP ++The NPtcp6 program is launched in a similar manner. ++.PP + 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 @@ off using + .ne 3 + + .TP ++.BI \-P \ \fIport\fR ++Set the port number used by the TCP and TCP6 tests to \fIport\fR. ++.ne 3 ++ ++.TP + .B \-r + This option resets the TCP sockets after every test (TCP module only). + It is necessary for some streaming tests to get good measurements Property changes on: head/benchmarks/netpipe/files/patch-dox_netpipe.1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/nttcp/files/patch-Makefile =================================================================== --- head/benchmarks/nttcp/files/patch-Makefile (revision 419177) +++ head/benchmarks/nttcp/files/patch-Makefile (revision 419178) @@ -1,13 +1,13 @@ ---- 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 LIB= -OPT= -O2 -CC= cc +#OPT= -O2 +#CC= cc DBG= INC= Index: head/benchmarks/phoronix-test-suite/files/patch-install-sh =================================================================== --- head/benchmarks/phoronix-test-suite/files/patch-install-sh (revision 419177) +++ head/benchmarks/phoronix-test-suite/files/patch-install-sh (revision 419178) @@ -1,83 +1,83 @@ ---- 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/ -rm -rf $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/ mkdir -p $DESTDIR$INSTALL_PREFIX/bin/ +if [ -z "$WITHOUT_X11" ] +then mkdir -p $DESTDIR$INSTALL_PREFIX/share/appdata/ mkdir -p $DESTDIR$INSTALL_PREFIX/share/applications/ mkdir -p $DESTDIR$INSTALL_PREFIX/share/icons/hicolor/48x48/apps/ -mkdir -p $DESTDIR$INSTALL_PREFIX/share/man/man1/ +fi +mkdir -p $DESTDIR$INSTALL_PREFIX/man/man1/ mkdir -p $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/ mkdir -p $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/ -mkdir -p $DESTDIR$INSTALL_PREFIX/../etc/bash_completion.d/ +if [ -n "$WITH_BASH_COMPLETIONS" ] +then +mkdir -p $DESTDIR$INSTALL_PREFIX/etc/bash_completion.d/ +fi #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/ -cp documentation/man-pages/*.1 $DESTDIR$INSTALL_PREFIX/share/man/man1/ -cp pts-core/static/bash_completion $DESTDIR$INSTALL_PREFIX/../etc/bash_completion.d/phoronix-test-suite +cp documentation/man-pages/*.1 $DESTDIR$INSTALL_PREFIX/man/man1/ +if [ -n "$WITH_BASH_COMPLETIONS" ] +then +cp pts-core/static/bash_completion $DESTDIR$INSTALL_PREFIX/etc/bash_completion.d/phoronix-test-suite +fi +if [ -z "$WITHOUT_X11" ] +then cp pts-core/static/images/phoronix-test-suite.png $DESTDIR$INSTALL_PREFIX/share/icons/hicolor/48x48/apps/phoronix-test-suite.png cp pts-core/static/phoronix-test-suite.desktop $DESTDIR$INSTALL_PREFIX/share/applications/ cp pts-core/static/phoronix-test-suite-launcher.desktop $DESTDIR$INSTALL_PREFIX/share/applications/ cp pts-core/static/phoronix-test-suite.appdata.xml $DESTDIR$INSTALL_PREFIX/share/appdata/ - -mkdir -p $DESTDIR$INSTALL_PREFIX/../usr/lib/systemd/system/ -cp deploy/*-systemd/*.service $DESTDIR$INSTALL_PREFIX/../usr/lib/systemd/system/ +fi # 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 - sed 's:PTS_DIR=`pwd`:PTS_DIR='"$INSTALL_PREFIX"'\/share\/phoronix-test-suite:g' phoronix-test-suite > $DESTDIR$INSTALL_PREFIX/bin/phoronix-test-suite chmod +x $DESTDIR$INSTALL_PREFIX/bin/phoronix-test-suite # sed 's:\$url = PTS_PATH . \"documentation\/index.html\";:\$url = \"'"$INSTALL_PREFIX"'\/share\/doc\/packages\/phoronix-test-suite\/index.html\";:g' pts-core/commands/gui_gtk.php > $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/pts-core/commands/gui_gtk.php +if [ -z "$WITHOUT_X11" ] +then # 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 +fi echo -e "\nPhoronix Test Suite Installation Completed\n Executable File: $INSTALL_PREFIX/bin/phoronix-test-suite -Documentation: $INSTALL_PREFIX/share/doc/phoronix-test-suite/ Phoronix Test Suite Files: $INSTALL_PREFIX/share/phoronix-test-suite/\n" if [ "X$DESTDIR" != "X" ] then echo "Installed to chroot: $DESTDIR" - echo "Please update your desktop and mime-database manually" fi Index: head/benchmarks/postal/files/patch-basictcp.cpp =================================================================== --- head/benchmarks/postal/files/patch-basictcp.cpp (revision 419177) +++ head/benchmarks/postal/files/patch-basictcp.cpp (revision 419178) @@ -1,15 +1,15 @@ ---- 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; - m_sslMeth = SSLv2_client_method(); + m_sslMeth = SSLv3_client_method(); if(m_sslMeth == NULL) { - fprintf(stderr, "Can't get SSLv2_client_method.\n"); + fprintf(stderr, "Can't get SSLv3_client_method.\n"); return 2; } m_sslCtx = SSL_CTX_new(m_sslMeth); Index: head/benchmarks/postal/files/patch-basictcp.h =================================================================== --- head/benchmarks/postal/files/patch-basictcp.h (revision 419177) +++ head/benchmarks/postal/files/patch-basictcp.h (revision 419178) @@ -1,14 +1,14 @@ ---- 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 +#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L + const SSL_METHOD *m_sslMeth; +#else SSL_METHOD *m_sslMeth; +#endif SSL_CTX* m_sslCtx; SSL *m_ssl; #else Index: head/benchmarks/postal/files/patch-bhm.cpp =================================================================== --- head/benchmarks/postal/files/patch-bhm.cpp (revision 419177) +++ head/benchmarks/postal/files/patch-bhm.cpp (revision 419178) @@ -1,64 +1,64 @@ ---- 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 #include "bhmusers.h" -#include -#include +#include +#include #include #include -#include -#include +#include +#include +#include #include #include #include #include +#ifndef __FreeBSD__ #include +#endif #include "postal.h" #include "logit.h" #include "results.h" #include "basictcp.h" -#ifdef USE_GNUTLS -#include -#include -GCRY_THREAD_OPTION_PTHREAD_IMPL; -#endif int processes = 0; int *thread_status; -@@ -47,7 +45,7 @@ +@@ -47,7 +45,7 @@ void usage(CPCCHAR msg = NULL) int maxMsgSize = 10240; results res; -Logit *log; +Logit *bhm_log; int exitCount = 0; -@@ -261,7 +259,7 @@ +@@ -261,7 +259,7 @@ int readCommand(base_tcp &t, char *buf, void do_work(thread_data *td) { - base_tcp t(td->fd, log, td->debug, &res + base_tcp t(td->fd, bhm_log, td->debug, &res #ifdef USE_SSL , td->ssl #endif -@@ -408,7 +406,7 @@ +@@ -408,7 +406,7 @@ int main(int argc, char **argv) #endif "\n"); - log = new Logit("bhm.log", allLog, false, 0); + bhm_log = new Logit("bhm.log", allLog, false, 0); Logit *debug = NULL; if(debugName) Index: head/benchmarks/postal/files/patch-bhmusers.cpp =================================================================== --- head/benchmarks/postal/files/patch-bhmusers.cpp (revision 419177) +++ head/benchmarks/postal/files/patch-bhmusers.cpp (revision 419178) @@ -1,10 +1,10 @@ ---- bhmusers.cpp.orig +--- bhmusers.cpp.orig 2008-04-10 01:36:27 UTC +++ bhmusers.cpp @@ -1,5 +1,6 @@ #include "bhmusers.h" -#include +#include +#include #include #include "expand.h" Index: head/benchmarks/postal/files/patch-bhmusers.h =================================================================== --- head/benchmarks/postal/files/patch-bhmusers.h (revision 419177) +++ head/benchmarks/postal/files/patch-bhmusers.h (revision 419178) @@ -1,44 +1,44 @@ ---- 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 #include "conf.h" +#if defined(_LIBCPP_VERSION) +#include +#else #ifdef HAVE_EXT_HASH_MAP using namespace __gnu_cxx; #include #else #include #endif +#endif #include "postal.h" -@@ -23,7 +27,12 @@ +@@ -23,7 +27,12 @@ typedef struct int sync_time; } BHM_DATA; + +#if defined(_LIBCPP_VERSION) +namespace std +#else namespace __gnu_cxx +#endif { template<> struct hash< std::string > { -@@ -34,7 +43,11 @@ +@@ -34,7 +43,11 @@ namespace __gnu_cxx }; } +#if defined(_LIBCPP_VERSION) +typedef std::unordered_map > NAME_MAP; +#else typedef hash_map > NAME_MAP; +#endif class BHMUsers { Index: head/benchmarks/postal/files/patch-postal.cpp =================================================================== --- head/benchmarks/postal/files/patch-postal.cpp (revision 419177) +++ head/benchmarks/postal/files/patch-postal.cpp (revision 419178) @@ -1,21 +1,21 @@ ---- postal.cpp.orig +--- postal.cpp.orig 2012-01-14 12:08:12 UTC +++ postal.cpp @@ -6,15 +6,11 @@ #include "smtp.h" #include #include -#include -#include +#include +#include +#include #include "postal.h" #include "logit.h" -#ifdef USE_GNUTLS -#include -#include -GCRY_THREAD_OPTION_PTHREAD_IMPL; -#endif void usage() { Index: head/benchmarks/postal/files/patch-rabid.cpp =================================================================== --- head/benchmarks/postal/files/patch-rabid.cpp (revision 419177) +++ head/benchmarks/postal/files/patch-rabid.cpp (revision 419178) @@ -1,23 +1,22 @@ ---- rabid.cpp.orig +--- rabid.cpp.orig 2012-01-14 12:08:49 UTC +++ rabid.cpp @@ -7,15 +7,14 @@ #include #include #include -#include -#include --#include +#include +#include +#include -+#include + #include #include "postal.h" #include "logit.h" #ifdef USE_GNUTLS -#include -#include -GCRY_THREAD_OPTION_PTHREAD_IMPL; +#include #endif void usage() Index: head/benchmarks/postal/files/patch-smtp.cpp =================================================================== --- head/benchmarks/postal/files/patch-smtp.cpp (revision 419177) +++ head/benchmarks/postal/files/patch-smtp.cpp (revision 419178) @@ -1,10 +1,10 @@ ---- smtp.cpp.orig +--- smtp.cpp.orig 2012-01-14 12:38:45 UTC +++ smtp.cpp @@ -8,6 +8,7 @@ #include "userlist.h" #include "logit.h" #include "results.h" +#include #include smtpData::smtpData() Index: head/benchmarks/postal/files/patch-smtp.h =================================================================== --- head/benchmarks/postal/files/patch-smtp.h (revision 419177) +++ head/benchmarks/postal/files/patch-smtp.h (revision 419178) @@ -1,34 +1,34 @@ ---- smtp.h.orig +--- smtp.h.orig 2012-01-14 12:36:56 UTC +++ smtp.h @@ -4,14 +4,18 @@ using namespace std; #include #include -#include +#include #include "conf.h" +#if defined(_LIBCPP_VERSION) +#include +#else #ifdef HAVE_EXT_HASH_MAP using namespace __gnu_cxx; #include #else #include #endif +#endif #include "tcp.h" #include "mutex.h" -@@ -30,7 +34,11 @@ +@@ -30,7 +34,11 @@ struct eqlng } }; +#if defined(_LIBCPP_VERSION) +typedef std::unordered_map, eqlng> NAME_MAP; +#else typedef hash_map, eqlng> NAME_MAP; +#endif class smtpData { Index: head/benchmarks/postal/files/patch-tcp.cpp =================================================================== --- head/benchmarks/postal/files/patch-tcp.cpp (revision 419177) +++ head/benchmarks/postal/files/patch-tcp.cpp (revision 419178) @@ -1,15 +1,15 @@ ---- 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; - m_sslMeth = SSLv2_client_method(); + m_sslMeth = SSLv3_client_method(); if(m_sslMeth == NULL) { - fprintf(stderr, "Can't get SSLv2_client_method.\n"); + fprintf(stderr, "Can't get SSLv3_client_method.\n"); error(); return 2; } Index: head/benchmarks/postal/files/patch-tcp.h =================================================================== --- head/benchmarks/postal/files/patch-tcp.h (revision 419177) +++ head/benchmarks/postal/files/patch-tcp.h (revision 419178) @@ -1,14 +1,14 @@ ---- 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 +#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L + const SSL_METHOD *m_sslMeth; +#else SSL_METHOD *m_sslMeth; +#endif SSL_CTX* m_sslCtx; SSL *m_ssl; #else Index: head/benchmarks/ramspeed/files/patch-build.sh =================================================================== --- head/benchmarks/ramspeed/files/patch-build.sh (revision 419177) +++ head/benchmarks/ramspeed/files/patch-build.sh (revision 419178) @@ -1,56 +1,56 @@ ---- 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 +# respect the user's options patch here +echo " " +echo "=== this is RAMspeed's build script ====================================" +echo " " +if [ -n "$CC" -a \( -n "$LD" -o -n "$AS" -o -n "$CFLAGS" -o -n "$LDFLAGS" \) ] +then + _CC=$CC;_LD=$LD;_AS=$AS;_CFLAGS=$CFLAGS;_LDFLAGS=$LDFLAGS;_respect=yes +fi +# end of patch + case $OS in FreeBSD) -@@ -127,10 +137,20 @@ +@@ -127,10 +137,20 @@ case $OS in esac echo "building for $OS $RELEASE $ARCH" -echo "compiler is $CC, linker is $LD, assembler is $AS" -echo "compiler's flags are $CFLAGS" -echo "linker's flags are $LFLAGS" +echo "compiler is '$CC', linker is '$LD', assembler is '$AS'" +echo "compiler's flags are '$CFLAGS'" +echo "linker's flags are '$LFLAGS'" echo " " +# respect the user's options patch here +if [ X"$_respect" = Xyes ] ; then + CC=$_CC;LD=$_CC;AS=${_AS:-$AS};CFLAGS=$_CFLAGS;LFLAGS=$_LDFLAGS + echo "OVERRIDING build script defaults with your system's defaults:" + echo "compiler is '$CC', linker is '$LD', assembler is '$AS'" + echo "compiler's flags are '$CFLAGS'" + echo "linker's flags are '$LFLAGS'" + echo " " +fi +# end of patch 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 -echo "press Enter to continue or Control-C to abort" -read ANS +if [ X"$_respect" != Xyes -a -t 0 -a -t 1 ] ; then + echo "press Enter to continue or Control-C to abort" + read ANS +fi case $TARGET in Index: head/benchmarks/randomio/files/patch-Makefile =================================================================== --- head/benchmarks/randomio/files/patch-Makefile (revision 419177) +++ head/benchmarks/randomio/files/patch-Makefile (revision 419178) @@ -1,8 +1,8 @@ ---- 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 + +all: randomio Index: head/benchmarks/scimark2c/files/patch-Makefile =================================================================== --- head/benchmarks/scimark2c/files/patch-Makefile (revision 419177) +++ head/benchmarks/scimark2c/files/patch-Makefile (revision 419178) @@ -1,11 +1,11 @@ ---- 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 -CC = cc +#CC = cc LDFLAGS = OBJS = FFT.o kernel.o Stopwatch.o Random.o SOR.o SparseCompRow.o \ Index: head/benchmarks/scimark2c/files/patch-scimark2.c =================================================================== --- head/benchmarks/scimark2c/files/patch-scimark2.c (revision 419177) +++ head/benchmarks/scimark2c/files/patch-scimark2.c (revision 419178) @@ -1,11 +1,11 @@ ---- 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(); - printf("Using %10.2f seconds min time per kenel.\n", min_time); + printf("Using %10.2f seconds min time per kernel.\n", min_time); res[1] = kernel_measureFFT( FFT_size, min_time, R); res[2] = kernel_measureSOR( SOR_size, min_time, R); Index: head/benchmarks/siege/files/patch-Makefile.am =================================================================== --- head/benchmarks/siege/files/patch-Makefile.am (revision 419177) +++ head/benchmarks/siege/files/patch-Makefile.am (revision 419178) @@ -1,11 +1,11 @@ ---- 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. ## +ACLOCAL_AMFLAGS = -I m4 + AUTOMAKE_OPTIONS = foreign no-dependencies WARN_CFLAGS = @WARN_CFLAGS@ Index: head/benchmarks/siege/files/patch-configure.ac =================================================================== --- head/benchmarks/siege/files/patch-configure.ac (revision 419177) +++ head/benchmarks/siege/files/patch-configure.ac (revision 419178) @@ -1,18 +1,18 @@ ---- 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 AC_CONFIG_SRCDIR([src/setup.h]) AC_CONFIG_HEADERS(include/config.h) +AC_CONFIG_MACRO_DIRS([m4]) dnl canonicalize the host AC_CANONICAL_HOST @@ -41,7 +42,6 @@ dnl dnl Program support dnl AC_PATH_PROG( PERL, perl, false ) -AC_PROG_SHELL AC_PROG_MAKE_SET AC_PROG_INSTALL case "$host_os" in Index: head/benchmarks/siege/files/patch-src_init.c =================================================================== --- head/benchmarks/siege/files/patch-src_init.c (revision 419177) +++ head/benchmarks/siege/files/patch-src_init.c (revision 419178) @@ -1,12 +1,12 @@ ---- 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 #include #include +#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) +#include +#endif - int - init_config( void ) + #define LINESZ 1024 + Index: head/benchmarks/siege/files/patch-src_sock.c =================================================================== --- head/benchmarks/siege/files/patch-src_sock.c (revision 419177) +++ head/benchmarks/siege/files/patch-src_sock.c (revision 419178) @@ -1,20 +1,20 @@ ---- 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; } } -#elif defined(sun) +#elif defined(sun) || defined(__FreeBSD__) # 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); -#if defined(sun) +#if defined(sun) || defined(__FreeBSD__) # ifdef HAVE_FREEHOSTENT freehostent(hp); # endif/*HAVE_FREEHOSTENT*/ Index: head/benchmarks/smhasher/files/patch-smhasher-Platform.cpp =================================================================== --- head/benchmarks/smhasher/files/patch-smhasher-Platform.cpp (revision 419177) +++ head/benchmarks/smhasher/files/patch-smhasher-Platform.cpp (nonexistent) @@ -1,41 +0,0 @@ ---- 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 @@ - SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_HIGHEST); - } - -+#elif __FreeBSD__ -+ -+#include -+#include -+#include -+#include -+#include -+ -+void -+SetAffinity(int cpu) -+{ -+ cpuset_t mask; -+ unsigned int i; -+ -+ fprintf(stdout, "SetAffinity called with arg %d\n", cpu); -+ -+ CPU_ZERO(&mask); -+ i = 0; -+ do { -+ if (cpu & 1) { -+ CPU_SET(i, &mask); -+ } -+ i++; -+ cpu >>= 1; -+ } while (cpu); -+ -+ if (cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, sizeof(cpuset_t), &mask) == -1) -+ { -+ fprintf(stderr, "SetAffinity() failed. %s", strerror(errno)); -+ } -+} -+ - #else - - #include Property changes on: head/benchmarks/smhasher/files/patch-smhasher-Platform.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/smhasher/files/patch-smhasher-Platform.h =================================================================== --- head/benchmarks/smhasher/files/patch-smhasher-Platform.h (revision 419177) +++ head/benchmarks/smhasher/files/patch-smhasher-Platform.h (nonexistent) @@ -1,12 +0,0 @@ ---- 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 @@ - #else // defined(_MSC_VER) - - #include -+#if defined(__FreeBSD__) -+#include -+#endif - - #define FORCE_INLINE inline __attribute__((always_inline)) - #define NEVER_INLINE __attribute__((noinline)) Property changes on: head/benchmarks/smhasher/files/patch-smhasher-Platform.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/smhasher/files/patch-Platform.cpp =================================================================== --- head/benchmarks/smhasher/files/patch-Platform.cpp (nonexistent) +++ head/benchmarks/smhasher/files/patch-Platform.cpp (revision 419178) @@ -0,0 +1,41 @@ +--- 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); + } + ++#elif __FreeBSD__ ++ ++#include ++#include ++#include ++#include ++#include ++ ++void ++SetAffinity(int cpu) ++{ ++ cpuset_t mask; ++ unsigned int i; ++ ++ fprintf(stdout, "SetAffinity called with arg %d\n", cpu); ++ ++ CPU_ZERO(&mask); ++ i = 0; ++ do { ++ if (cpu & 1) { ++ CPU_SET(i, &mask); ++ } ++ i++; ++ cpu >>= 1; ++ } while (cpu); ++ ++ if (cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, sizeof(cpuset_t), &mask) == -1) ++ { ++ fprintf(stderr, "SetAffinity() failed. %s", strerror(errno)); ++ } ++} ++ + #else + + #include Property changes on: head/benchmarks/smhasher/files/patch-Platform.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/smhasher/files/patch-Platform.h =================================================================== --- head/benchmarks/smhasher/files/patch-Platform.h (nonexistent) +++ head/benchmarks/smhasher/files/patch-Platform.h (revision 419178) @@ -0,0 +1,12 @@ +--- 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 ++#if defined(__FreeBSD__) ++#include ++#endif + + #define FORCE_INLINE inline __attribute__((always_inline)) + #define NEVER_INLINE __attribute__((noinline)) Property changes on: head/benchmarks/smhasher/files/patch-Platform.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/spp/files/patch-Makefile =================================================================== --- head/benchmarks/spp/files/patch-Makefile (revision 419177) +++ head/benchmarks/spp/files/patch-Makefile (revision 419178) @@ -1,43 +1,43 @@ ---- 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) -CFLAGS += -I/usr/local/include -LDFLAGS += -L/usr/local/lib +CFLAGS += -I$(LOCALBASE)/include +LDFLAGS += -L$(LOCALBASE)/lib 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. # -CFLAGS+= -DDEBUG +#CFLAGS+= -DDEBUG # If you want the program with support for debuggers # (gdb, etc), then uncomment the following line -CFLAGS+= -g +#CFLAGS+= -g # turn on optimisation CFLAGS += -O2 -@@ -76,13 +76,10 @@ +@@ -79,13 +79,10 @@ clean: rm -f $(PROGRAM) *.o $(SRCDIR)/*.o *~ install: - @if test "`id -u`" != "0" ; then \ - echo "You must be root to install" && exit 1 ; \ - fi ; @echo "Installing spp binary" - $(INSTALL) -c -m 755 $(PROGRAM) /usr/local/bin/ + $(BSD_INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(PREFIX)/bin/ @echo "Installing manual page" - $(INSTALL) -c -m 644 doc/spp.1 /usr/local/man/man1/ + $(BSD_INSTALL_MAN) doc/spp.1 $(DESTDIR)$(PREFIX)/man/man1/ # target 'distro' # Index: head/benchmarks/stress-ng/files/patch-stress-cpu.c =================================================================== --- head/benchmarks/stress-ng/files/patch-stress-cpu.c (revision 419177) +++ head/benchmarks/stress-ng/files/patch-stress-cpu.c (revision 419178) @@ -1,10 +1,10 @@ ---- 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 -#define powl pow #endif /* Index: head/benchmarks/super-smack/files/patch-query.cc =================================================================== --- head/benchmarks/super-smack/files/patch-query.cc (revision 419177) +++ head/benchmarks/super-smack/files/patch-query.cc (nonexistent) @@ -1,20 +0,0 @@ ---- 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 @@ - { - string s((*i).first); - int str_len = (*i).first.length(); -- if((unsigned)p + str_len + 3 *sizeof(int) < (unsigned)p_end ) -+ if(p + str_len + 3 *sizeof(int) < p_end ) - { - *p++ = (char) str_len; - const char* q_type_name = s.c_str(); -@@ -216,7 +216,7 @@ - die(0, "report buffer overflow -- too many query types"); - } - -- len = (unsigned)p - (unsigned)buf; -+ len = p - buf; - *(buf) = num_recs; - - if(write(fd, buf, len) != len) Property changes on: head/benchmarks/super-smack/files/patch-query.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/super-smack/files/patch-Makefile.in =================================================================== --- head/benchmarks/super-smack/files/patch-Makefile.in (revision 419177) +++ head/benchmarks/super-smack/files/patch-Makefile.in (revision 419178) @@ -1,13 +1,13 @@ ---- ./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: - $(mkinstalldirs) $(SMACKS_DIR) $(DATADIR) - cp -rp $(srcdir)/smacks/* $(SMACKS_DIR) + $(mkinstalldirs) $(DESTDIR)$(SMACKS_DIR) $(DESTDIR)$(DATADIR) + cp -rp $(srcdir)/smacks/* $(DESTDIR)$(SMACKS_DIR) dist-hook: mkdir -p $(distdir)/smacks Index: head/benchmarks/super-smack/files/patch-src_query.cc =================================================================== --- head/benchmarks/super-smack/files/patch-src_query.cc (nonexistent) +++ head/benchmarks/super-smack/files/patch-src_query.cc (revision 419178) @@ -0,0 +1,20 @@ +--- 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(); +- if((unsigned)p + str_len + 3 *sizeof(int) < (unsigned)p_end ) ++ if(p + str_len + 3 *sizeof(int) < p_end ) + { + *p++ = (char) str_len; + const char* q_type_name = s.c_str(); +@@ -216,7 +216,7 @@ void Query_report::fd_send(int fd) + die(0, "report buffer overflow -- too many query types"); + } + +- len = (unsigned)p - (unsigned)buf; ++ len = p - buf; + *(buf) = num_recs; + + if(write(fd, buf, len) != len) Property changes on: head/benchmarks/super-smack/files/patch-src_query.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/ttcp/files/patch-ttcp.c =================================================================== --- head/benchmarks/ttcp/files/patch-ttcp.c (revision 419177) +++ head/benchmarks/ttcp/files/patch-ttcp.c (revision 419178) @@ -1,257 +1,257 @@ ---- 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 #include #include /* struct timeval */ +#include +#include +#include #if defined(SYSV) #include @@ -133,7 +136,7 @@ double cput, realt; /* user, real time void err(); void mes(); -int pattern(); +void pattern(); void prep_timer(); double read_timer(); int Nread(); @@ -147,6 +150,7 @@ sigpipe() { } +int main(argc,argv) int argc; char **argv; @@ -249,6 +253,7 @@ char **argv; #endif /* cray */ } sinhim.sin_port = htons(port); + sinme.sin_family = AF_INET; /* Solaris needs this */ sinme.sin_port = 0; /* free choice */ } else { /* rcvr */ @@ -263,29 +268,31 @@ char **argv; if ( (buf = (char *)malloc(buflen+bufalign)) == (char *)NULL) err("malloc"); if (bufalign != 0) - buf +=(bufalign - ((int)buf % bufalign) + bufoffset) % bufalign; + buf += (bufalign + -((unsigned long)buf % bufalign) + + bufoffset) % bufalign; if (trans) { - fprintf(stdout, + fprintf(stderr, "ttcp-t: buflen=%d, nbuf=%d, align=%d/%d, port=%d", buflen, nbuf, bufalign, bufoffset, port); if (sockbufsize) - fprintf(stdout, ", sockbufsize=%d", sockbufsize); - fprintf(stdout, " %s -> %s\n", udp?"udp":"tcp", host); + fprintf(stderr, ", sockbufsize=%d", sockbufsize); + fprintf(stderr, " %s -> %s\n", udp?"udp":"tcp", host); } else { - fprintf(stdout, + fprintf(stderr, "ttcp-r: buflen=%d, nbuf=%d, align=%d/%d, port=%d", buflen, nbuf, bufalign, bufoffset, port); if (sockbufsize) - fprintf(stdout, ", sockbufsize=%d", sockbufsize); - fprintf(stdout, " %s\n", udp?"udp":"tcp"); + fprintf(stderr, ", sockbufsize=%d", sockbufsize); + fprintf(stderr, " %s\n", udp?"udp":"tcp"); } if ((fd = socket(AF_INET, udp?SOCK_DGRAM:SOCK_STREAM, 0)) < 0) err("socket"); mes("socket"); - if (bind(fd, &sinme, sizeof(sinme)) < 0) + if (bind(fd, (struct sockaddr *) &sinme, sizeof(sinme)) < 0) err("bind"); #if defined(SO_SNDBUF) || defined(SO_RCVBUF) @@ -326,7 +333,7 @@ char **argv; mes("nodelay"); } #endif - if(connect(fd, &sinhim, sizeof(sinhim) ) < 0) + if(connect(fd, (struct sockaddr*)&sinhim, sizeof(sinhim) ) < 0) err("connect"); mes("connect"); } else { @@ -348,11 +355,11 @@ char **argv; } fromlen = sizeof(frominet); domain = AF_INET; - if((fd=accept(fd, &frominet, &fromlen) ) < 0) + if((fd=accept(fd, (struct sockaddr*)&frominet, &fromlen) ) < 0) err("accept"); { struct sockaddr_in peer; int peerlen = sizeof(peer); - if (getpeername(fd, (struct sockaddr_in *) &peer, + if (getpeername(fd, (struct sockaddr*) &peer, &peerlen) < 0) { err("getpeername"); } @@ -412,25 +419,25 @@ char **argv; } if( cput <= 0.0 ) cput = 0.001; if( realt <= 0.0 ) realt = 0.001; - fprintf(stdout, + fprintf(stderr, "ttcp%s: %.0f bytes in %.2f real seconds = %s/sec +++\n", trans?"-t":"-r", nbytes, realt, outfmt(nbytes/realt)); if (verbose) { - fprintf(stdout, + fprintf(stderr, "ttcp%s: %.0f bytes in %.2f CPU seconds = %s/cpu sec\n", trans?"-t":"-r", nbytes, cput, outfmt(nbytes/cput)); } - fprintf(stdout, + fprintf(stderr, "ttcp%s: %d I/O calls, msec/call = %.2f, calls/sec = %.2f\n", trans?"-t":"-r", numCalls, 1024.0 * realt/((double)numCalls), ((double)numCalls)/realt); - fprintf(stdout,"ttcp%s: %s\n", trans?"-t":"-r", stats); + fprintf(stderr,"ttcp%s: %s\n", trans?"-t":"-r", stats); if (verbose) { - fprintf(stdout, + fprintf(stderr, "ttcp%s: buffer address %#x\n", trans?"-t":"-r", buf); @@ -459,6 +466,7 @@ char *s; fprintf(stderr,"ttcp%s: %s\n", trans?"-t":"-r", s); } +void pattern( cp, cnt ) register char *cp; register int cnt; @@ -614,13 +622,13 @@ prusage(r0, r1, e, b, outp) case 'U': tvsub(&tdiff, &r1->ru_utime, &r0->ru_utime); - sprintf(outp,"%d.%01d", tdiff.tv_sec, tdiff.tv_usec/100000); + sprintf(outp,"%ld.%01ld", tdiff.tv_sec, tdiff.tv_usec/100000); END(outp); break; case 'S': tvsub(&tdiff, &r1->ru_stime, &r0->ru_stime); - sprintf(outp,"%d.%01d", tdiff.tv_sec, tdiff.tv_usec/100000); + sprintf(outp,"%ld.%01ld", tdiff.tv_sec, tdiff.tv_usec/100000); END(outp); break; @@ -642,49 +650,49 @@ prusage(r0, r1, e, b, outp) break; case 'X': - sprintf(outp,"%d", t == 0 ? 0 : (r1->ru_ixrss-r0->ru_ixrss)/t); + sprintf(outp,"%ld", t == 0 ? 0 : (r1->ru_ixrss-r0->ru_ixrss)/t); END(outp); break; case 'D': - sprintf(outp,"%d", t == 0 ? 0 : + sprintf(outp,"%ld", t == 0 ? 0 : (r1->ru_idrss+r1->ru_isrss-(r0->ru_idrss+r0->ru_isrss))/t); END(outp); break; case 'K': - sprintf(outp,"%d", t == 0 ? 0 : + sprintf(outp,"%ld", t == 0 ? 0 : ((r1->ru_ixrss+r1->ru_isrss+r1->ru_idrss) - (r0->ru_ixrss+r0->ru_idrss+r0->ru_isrss))/t); END(outp); break; case 'M': - sprintf(outp,"%d", r1->ru_maxrss/2); + sprintf(outp,"%ld", r1->ru_maxrss/2); END(outp); break; case 'F': - sprintf(outp,"%d", r1->ru_majflt-r0->ru_majflt); + sprintf(outp,"%ld", r1->ru_majflt-r0->ru_majflt); END(outp); break; case 'R': - sprintf(outp,"%d", r1->ru_minflt-r0->ru_minflt); + sprintf(outp,"%ld", r1->ru_minflt-r0->ru_minflt); END(outp); break; case 'I': - sprintf(outp,"%d", r1->ru_inblock-r0->ru_inblock); + sprintf(outp,"%ld", r1->ru_inblock-r0->ru_inblock); END(outp); break; case 'O': - sprintf(outp,"%d", r1->ru_oublock-r0->ru_oublock); + sprintf(outp,"%ld", r1->ru_oublock-r0->ru_oublock); END(outp); break; case 'C': - sprintf(outp,"%d+%d", r1->ru_nvcsw-r0->ru_nvcsw, + sprintf(outp,"%ld+%ld", r1->ru_nvcsw-r0->ru_nvcsw, r1->ru_nivcsw-r0->ru_nivcsw ); END(outp); break; @@ -743,6 +751,7 @@ register char *cp; /* * N R E A D */ +int Nread( fd, buf, count ) int fd; void *buf; @@ -752,7 +761,7 @@ int count; int len = sizeof(from); register int cnt; if( udp ) { - cnt = recvfrom( fd, buf, count, 0, &from, &len ); + cnt = recvfrom( fd, buf, count, 0, (struct sockaddr *)&from, &len ); numCalls++; } else { if( b_flag ) @@ -774,6 +783,7 @@ int count; /* * N W R I T E */ +int Nwrite( fd, buf, count ) int fd; void *buf; @@ -782,7 +792,7 @@ int count; register int cnt; if( udp ) { again: - cnt = sendto( fd, buf, count, 0, &sinhim, sizeof(sinhim) ); + cnt = sendto( fd, buf, count, 0, (struct sockaddr *)&sinhim, sizeof(sinhim) ); numCalls++; if( cnt<0 && errno == ENOBUFS ) { delay(18000); @@ -803,7 +813,7 @@ delay(us) tv.tv_sec = 0; tv.tv_usec = us; - (void)select( 1, (char *)0, (char *)0, (char *)0, &tv ); + (void)select( 1, NULL, NULL, NULL, &tv ); } /* Index: head/benchmarks/ubench/files/patch-timeout-membench.c =================================================================== --- head/benchmarks/ubench/files/patch-timeout-membench.c (revision 419177) +++ head/benchmarks/ubench/files/patch-timeout-membench.c (nonexistent) @@ -1,45 +0,0 @@ ---- 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 @@ - return i; - } - /*****************************************************************************/ --int membench() -+int membench(int membench_time) - { - int sv[2],i; - int d=0; -@@ -114,7 +114,7 @@ - return 0; - } - cpu_score=0; -- alarm(MEMBENCH_TIME); -+ alarm(membench_time); - switch ( (i=sigsetjmp(env,0xffff)) ) - { - case 0: -@@ -123,7 +123,7 @@ - for (i=0;i