summaryrefslogtreecommitdiff
path: root/benchmarks/libmicro/files
diff options
context:
space:
mode:
Diffstat (limited to 'benchmarks/libmicro/files')
-rw-r--r--benchmarks/libmicro/files/patch-Makefile6
-rw-r--r--benchmarks/libmicro/files/patch-Makefile.FreeBSD4
-rw-r--r--benchmarks/libmicro/files/patch-bench.sh10
-rw-r--r--benchmarks/libmicro/files/patch-cascade__cond.c (renamed from benchmarks/libmicro/files/patch-cascade_cond.c)12
-rw-r--r--benchmarks/libmicro/files/patch-cascade__mutex.c (renamed from benchmarks/libmicro/files/patch-cascade_mutex.c)12
-rw-r--r--benchmarks/libmicro/files/patch-getcontext.c6
-rw-r--r--benchmarks/libmicro/files/patch-getrusage.c6
-rw-r--r--benchmarks/libmicro/files/patch-libmicro.c6
-rw-r--r--benchmarks/libmicro/files/patch-longjmp.c6
-rw-r--r--benchmarks/libmicro/files/patch-mmap.c10
-rw-r--r--benchmarks/libmicro/files/patch-mmpa.c10
-rw-r--r--benchmarks/libmicro/files/patch-msync.c10
-rw-r--r--benchmarks/libmicro/files/patch-multiview.sh10
-rw-r--r--benchmarks/libmicro/files/patch-mutex.c6
-rw-r--r--benchmarks/libmicro/files/patch-setcontext.c6
-rw-r--r--benchmarks/libmicro/files/patch-siglongjmp.c6
-rw-r--r--benchmarks/libmicro/files/patch-writev.c17
17 files changed, 72 insertions, 71 deletions
diff --git a/benchmarks/libmicro/files/patch-Makefile b/benchmarks/libmicro/files/patch-Makefile
index 1ac9bb80b091..d9a0d03e8e20 100644
--- a/benchmarks/libmicro/files/patch-Makefile
+++ b/benchmarks/libmicro/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig Tue Jan 8 12:11:55 2008
-+++ Makefile Tue Jan 8 12:12:21 2008
-@@ -68,7 +68,7 @@
+--- Makefile.orig 2011-05-11 00:58:23 UTC
++++ Makefile
+@@ -68,7 +68,7 @@ TARBALL_CONTENTS = \
wrapper.sh \
README
diff --git a/benchmarks/libmicro/files/patch-Makefile.FreeBSD b/benchmarks/libmicro/files/patch-Makefile.FreeBSD
index a0d1ce593fb6..7ebbab0d424d 100644
--- a/benchmarks/libmicro/files/patch-Makefile.FreeBSD
+++ b/benchmarks/libmicro/files/patch-Makefile.FreeBSD
@@ -1,5 +1,5 @@
---- /dev/null Sat Aug 6 14:00:00 2005
-+++ Makefile.FreeBSD Sat Aug 6 14:00:04 2005
+--- Makefile.FreeBSD.orig 2016-07-27 14:59:58 UTC
++++ Makefile.FreeBSD
@@ -0,0 +1,42 @@
+#
+# CDDL HEADER START
diff --git a/benchmarks/libmicro/files/patch-bench.sh b/benchmarks/libmicro/files/patch-bench.sh
index 01ec71af5be0..c1a5ec606086 100644
--- a/benchmarks/libmicro/files/patch-bench.sh
+++ b/benchmarks/libmicro/files/patch-bench.sh
@@ -1,6 +1,6 @@
---- bench.sh.orig 2008-01-12 14:26:38.000000000 +0100
-+++ bench.sh 2008-01-12 14:26:59.000000000 +0100
-@@ -65,7 +65,7 @@
+--- bench.sh.orig 2011-05-11 00:58:23 UTC
++++ bench.sh
+@@ -65,7 +65,7 @@ mkdir -p $VDIR1 $VDIR2
touch $IFILE
@@ -9,7 +9,7 @@
# produce benchmark header for easier comparisons
-@@ -83,6 +83,12 @@
+@@ -83,6 +83,12 @@ if [ -f /proc/cpuinfo ]; then
p_type=`awk -F: '/model name/{print $2; exit}' /proc/cpuinfo`
fi
@@ -22,7 +22,7 @@
printf "!Libmicro_#: %30s\n" $libmicro_version
printf "!Options: %30s\n" "$OPTS"
printf "!Machine_name: %30s\n" $hostname
-@@ -154,7 +160,6 @@
+@@ -154,7 +160,6 @@ memset $OPTS -N "memset_4k_uc" -s 4k
memset $OPTS -N "memset_10k" -s 10k -I 600
memset $OPTS -N "memset_1m" -s 1m -I 200000
memset $OPTS -N "memset_10m" -s 10m -I 2000000
diff --git a/benchmarks/libmicro/files/patch-cascade_cond.c b/benchmarks/libmicro/files/patch-cascade__cond.c
index 3671c36a7b9a..752205f8f085 100644
--- a/benchmarks/libmicro/files/patch-cascade_cond.c
+++ b/benchmarks/libmicro/files/patch-cascade__cond.c
@@ -1,6 +1,6 @@
---- cascade_cond.c.orig Sat Aug 6 14:12:15 2005
-+++ cascade_cond.c Sat Aug 6 14:13:17 2005
-@@ -87,7 +87,6 @@
+--- cascade_cond.c.orig 2011-05-11 00:58:23 UTC
++++ cascade_cond.c
+@@ -83,7 +83,6 @@ benchmark_init()
(void) sprintf(lm_usage,
" [-o] (do signal outside mutex)\n"
@@ -8,7 +8,7 @@
"notes: thread cascade using pthread_conds\n");
return (0);
-@@ -101,9 +100,6 @@
+@@ -97,9 +96,6 @@ benchmark_optswitch(int opt, char *optar
case 'o':
opto = 1;
break;
@@ -18,7 +18,7 @@
default:
return (-1);
}
-@@ -152,6 +148,7 @@
+@@ -148,6 +144,7 @@ benchmark_initrun()
(void) pthread_mutexattr_init(&ma);
(void) pthread_condattr_init(&ca);
@@ -26,7 +26,7 @@
if (lm_optP > 1 || opts) {
(void) pthread_mutexattr_setpshared(&ma,
PTHREAD_PROCESS_SHARED);
-@@ -163,6 +160,7 @@
+@@ -159,6 +156,7 @@ benchmark_initrun()
(void) pthread_condattr_setpshared(&ca,
PTHREAD_PROCESS_PRIVATE);
}
diff --git a/benchmarks/libmicro/files/patch-cascade_mutex.c b/benchmarks/libmicro/files/patch-cascade__mutex.c
index a76c97822fdd..f4867a3328bd 100644
--- a/benchmarks/libmicro/files/patch-cascade_mutex.c
+++ b/benchmarks/libmicro/files/patch-cascade__mutex.c
@@ -1,6 +1,6 @@
---- cascade_mutex.c.orig Sat Aug 6 14:10:03 2005
-+++ cascade_mutex.c Sat Aug 6 14:11:53 2005
-@@ -83,7 +83,6 @@
+--- cascade_mutex.c.orig 2011-05-11 00:58:23 UTC
++++ cascade_mutex.c
+@@ -79,7 +79,6 @@ benchmark_init()
lm_defN = "cscd_mutex";
(void) sprintf(lm_usage,
@@ -8,7 +8,7 @@
"notes: thread cascade using pthread_mutexes\n");
return (0);
-@@ -94,9 +93,6 @@
+@@ -90,9 +89,6 @@ int
benchmark_optswitch(int opt, char *optarg)
{
switch (opt) {
@@ -18,7 +18,7 @@
default:
return (-1);
}
-@@ -123,6 +119,7 @@
+@@ -119,6 +115,7 @@ benchmark_initrun()
}
(void) pthread_mutexattr_init(&ma);
@@ -26,7 +26,7 @@
if (lm_optP > 1 || opts) {
(void) pthread_mutexattr_setpshared(&ma,
PTHREAD_PROCESS_SHARED);
-@@ -130,6 +127,7 @@
+@@ -126,6 +123,7 @@ benchmark_initrun()
(void) pthread_mutexattr_setpshared(&ma,
PTHREAD_PROCESS_PRIVATE);
}
diff --git a/benchmarks/libmicro/files/patch-getcontext.c b/benchmarks/libmicro/files/patch-getcontext.c
index c5cb8fd88a08..6fada96c3a5f 100644
--- a/benchmarks/libmicro/files/patch-getcontext.c
+++ b/benchmarks/libmicro/files/patch-getcontext.c
@@ -1,6 +1,6 @@
---- getcontext.c.orig Sat Aug 6 16:11:21 2005
-+++ getcontext.c Sat Aug 6 16:11:45 2005
-@@ -39,6 +39,7 @@
+--- getcontext.c.orig 2011-05-11 00:58:23 UTC
++++ getcontext.c
+@@ -35,6 +35,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/benchmarks/libmicro/files/patch-getrusage.c b/benchmarks/libmicro/files/patch-getrusage.c
index cd3d852eef28..d7b9ff0d3fc7 100644
--- a/benchmarks/libmicro/files/patch-getrusage.c
+++ b/benchmarks/libmicro/files/patch-getrusage.c
@@ -1,6 +1,6 @@
---- getrusage.c.orig Sat Aug 6 16:12:36 2005
-+++ getrusage.c Sat Aug 6 16:12:57 2005
-@@ -40,6 +40,7 @@
+--- getrusage.c.orig 2011-05-11 00:58:23 UTC
++++ getrusage.c
+@@ -36,6 +36,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
diff --git a/benchmarks/libmicro/files/patch-libmicro.c b/benchmarks/libmicro/files/patch-libmicro.c
index e91108900451..a518842f8257 100644
--- a/benchmarks/libmicro/files/patch-libmicro.c
+++ b/benchmarks/libmicro/files/patch-libmicro.c
@@ -1,6 +1,6 @@
---- libmicro.c.orig Sat Aug 6 14:15:04 2005
-+++ libmicro.c Sat Aug 6 14:15:52 2005
-@@ -854,10 +854,14 @@
+--- libmicro.c.orig 2011-05-11 00:58:23 UTC
++++ libmicro.c
+@@ -859,10 +859,14 @@ barrier_create(int hwm, int datasize)
b->ba_flag = 0;
(void) pthread_mutexattr_init(&attr);
diff --git a/benchmarks/libmicro/files/patch-longjmp.c b/benchmarks/libmicro/files/patch-longjmp.c
index 1c190b574c94..f665ad50618d 100644
--- a/benchmarks/libmicro/files/patch-longjmp.c
+++ b/benchmarks/libmicro/files/patch-longjmp.c
@@ -1,6 +1,6 @@
---- longjmp.c.orig Wed Aug 31 11:53:48 2005
-+++ longjmp.c Wed Aug 31 11:55:10 2005
-@@ -55,7 +55,7 @@
+--- longjmp.c.orig 2011-05-11 00:58:23 UTC
++++ longjmp.c
+@@ -51,7 +51,7 @@ benchmark_init()
int
benchmark(void *tsd, result_t *res)
{
diff --git a/benchmarks/libmicro/files/patch-mmap.c b/benchmarks/libmicro/files/patch-mmap.c
new file mode 100644
index 000000000000..52a741cc7a75
--- /dev/null
+++ b/benchmarks/libmicro/files/patch-mmap.c
@@ -0,0 +1,10 @@
+--- mmap.c.orig 2011-05-11 00:58:23 UTC
++++ mmap.c
+@@ -28,6 +28,7 @@
+ * Use is subject to license terms.
+ */
+
++#include <sys/types.h>
+ #include <sys/mman.h>
+ #include <unistd.h>
+ #include <stdlib.h>
diff --git a/benchmarks/libmicro/files/patch-mmpa.c b/benchmarks/libmicro/files/patch-mmpa.c
deleted file mode 100644
index f559f94ac2ad..000000000000
--- a/benchmarks/libmicro/files/patch-mmpa.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- mmap.c.orig Sat Aug 6 16:13:46 2005
-+++ mmap.c Sat Aug 6 16:14:01 2005
-@@ -7,6 +7,7 @@
- #pragma ident "@(#)mmap.c 1.6 05/08/04 SMI"
- #endif
-
-+#include <sys/types.h>
- #include <sys/mman.h>
- #include <unistd.h>
- #include <stdlib.h>
diff --git a/benchmarks/libmicro/files/patch-msync.c b/benchmarks/libmicro/files/patch-msync.c
index d4debe66749f..86dd9bbd1ad0 100644
--- a/benchmarks/libmicro/files/patch-msync.c
+++ b/benchmarks/libmicro/files/patch-msync.c
@@ -1,8 +1,8 @@
---- msync.c.orig Sat Aug 6 16:14:27 2005
-+++ msync.c Sat Aug 6 16:14:45 2005
-@@ -7,6 +7,7 @@
- #pragma ident "@(#)msync.c 1.1 05/08/04 SMI"
- #endif
+--- msync.c.orig 2011-05-11 00:58:23 UTC
++++ msync.c
+@@ -28,6 +28,7 @@
+ * Use is subject to license terms.
+ */
+#include <sys/types.h>
#include <sys/mman.h>
diff --git a/benchmarks/libmicro/files/patch-multiview.sh b/benchmarks/libmicro/files/patch-multiview.sh
index f7f5dfd6cb92..3a576247e718 100644
--- a/benchmarks/libmicro/files/patch-multiview.sh
+++ b/benchmarks/libmicro/files/patch-multiview.sh
@@ -1,6 +1,6 @@
---- multiview.sh.orig Wed Aug 17 22:48:57 2005
-+++ multiview.sh Wed Aug 17 22:49:00 2005
-@@ -40,15 +40,15 @@
+--- multiview.sh.orig 2011-05-11 00:58:23 UTC
++++ multiview.sh
+@@ -38,15 +38,15 @@
# the redder the color, the slower the result, the greener the
# faster
@@ -19,7 +19,7 @@
}
/^\!/ {
split($0, A_header, ":");
-@@ -59,7 +59,7 @@
+@@ -57,7 +57,7 @@
header_names[name] = ++header_count;
headers[header_count] = name;
}
@@ -28,7 +28,7 @@
}
{
-@@ -136,7 +136,7 @@
+@@ -136,7 +136,7 @@ END {
for (j = 2; j < ARGC; j++)
printf("<td>%s</td>\n", "not computed");
diff --git a/benchmarks/libmicro/files/patch-mutex.c b/benchmarks/libmicro/files/patch-mutex.c
index 8ff00c197695..c2f6d9463b8f 100644
--- a/benchmarks/libmicro/files/patch-mutex.c
+++ b/benchmarks/libmicro/files/patch-mutex.c
@@ -1,6 +1,6 @@
---- mutex.c.orig Sat Aug 6 14:17:43 2005
-+++ mutex.c Sat Aug 6 14:18:26 2005
-@@ -125,9 +125,11 @@
+--- mutex.c.orig 2011-05-11 00:58:23 UTC
++++ mutex.c
+@@ -121,9 +121,11 @@ benchmark_initrun()
errors++;
} else {
(void) pthread_mutexattr_init(&attr);
diff --git a/benchmarks/libmicro/files/patch-setcontext.c b/benchmarks/libmicro/files/patch-setcontext.c
index eaf46be3a8a2..f522e925a4fa 100644
--- a/benchmarks/libmicro/files/patch-setcontext.c
+++ b/benchmarks/libmicro/files/patch-setcontext.c
@@ -1,6 +1,6 @@
---- setcontext.c.orig Sat Aug 6 16:15:12 2005
-+++ setcontext.c Sat Aug 6 16:15:31 2005
-@@ -36,6 +36,7 @@
+--- setcontext.c.orig 2011-05-11 00:58:23 UTC
++++ setcontext.c
+@@ -31,6 +31,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/benchmarks/libmicro/files/patch-siglongjmp.c b/benchmarks/libmicro/files/patch-siglongjmp.c
index 845305aefda1..7659d9b5b80c 100644
--- a/benchmarks/libmicro/files/patch-siglongjmp.c
+++ b/benchmarks/libmicro/files/patch-siglongjmp.c
@@ -1,6 +1,6 @@
---- siglongjmp.c.orig Wed Aug 31 11:53:57 2005
-+++ siglongjmp.c Wed Aug 31 11:55:14 2005
-@@ -60,7 +60,7 @@
+--- siglongjmp.c.orig 2011-05-11 00:58:23 UTC
++++ siglongjmp.c
+@@ -56,7 +56,7 @@ benchmark(void *tsd, result_t *res)
{
tsd_t *ts = (tsd_t *)tsd;
diff --git a/benchmarks/libmicro/files/patch-writev.c b/benchmarks/libmicro/files/patch-writev.c
index 5cbfb3af7342..55793ae6832d 100644
--- a/benchmarks/libmicro/files/patch-writev.c
+++ b/benchmarks/libmicro/files/patch-writev.c
@@ -1,20 +1,21 @@
---- writev.c.orig Sat Aug 6 16:16:18 2005
-+++ writev.c Sat Aug 6 16:17:00 2005
-@@ -32,12 +32,17 @@
- #pragma ident "@(#)writev.c 1.7 05/08/04 SMI"
- #endif
+--- writev.c.orig 2011-05-11 00:58:23 UTC
++++ writev.c
+@@ -28,6 +28,7 @@
+ * Use is subject to license terms.
+ */
+#include <sys/types.h>
#include <sys/uio.h>
#include <limits.h>
#include <unistd.h>
- #include <stdlib.h>
+@@ -35,6 +36,10 @@
#include <stdio.h>
#include <fcntl.h>
-+
+
+#ifndef UIO_MAXIOV
+#define UIO_MAXIOV 1024
+#endif
-
++
#ifndef IOV_MAX
#define IOV_MAX UIO_MAXIOV
+ #endif