Author: trasz
Date: Wed Jul 4 13:52:13 2018
New Revision: 335945
URL: https://svnweb.freebsd.org/changeset/base/335945
Log:
Disable pipepingtd benchmarks, to make it not depend on libthr.
Obtained from: CheriBSD
MFC after: 2 weeks
Sponsored by: DARPA, AFRL
Modified:
head/tools/tools/syscall_timing/Makefile
head/tools/tools/syscall_timing/syscall_timing.c
Modified: head/tools/tools/syscall_timing/Makefile
==============================================================================
--- head/tools/tools/syscall_timing/Makefile Wed Jul 4 13:45:29 2018
(r335944)
+++ head/tools/tools/syscall_timing/Makefile Wed Jul 4 13:52:13 2018
(r335945)
@@ -6,7 +6,7 @@ PROG= syscall_timing
CFLAGS+= -static -O
MAN=
-LIBADD= pthread
+#LIBADD= pthread
WARNS= 6
Modified: head/tools/tools/syscall_timing/syscall_timing.c
==============================================================================
--- head/tools/tools/syscall_timing/syscall_timing.c Wed Jul 4 13:45:29
2018 (r335944)
+++ head/tools/tools/syscall_timing/syscall_timing.c Wed Jul 4 13:52:13
2018 (r335945)
@@ -44,7 +44,9 @@
#include <fcntl.h>
#include <inttypes.h>
#include <limits.h>
+#ifdef WITH_PTHREAD
#include <pthread.h>
+#endif
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
@@ -319,6 +321,7 @@ test_pipeping(uintmax_t num, uintmax_t int_arg, const
return (i);
}
+#ifdef WITH_PTHREAD
struct pipepingtd_ctx {
int fd;
uintmax_t int_arg;
@@ -375,6 +378,7 @@ test_pipepingtd(uintmax_t num, uintmax_t int_arg, cons
return (i);
}
+#endif /* WITH_PTHREAD */
static uintmax_t
test_socket_stream(uintmax_t num, uintmax_t int_arg, const char *path __unused)
@@ -827,6 +831,7 @@ static const struct test tests[] = {
{ "pipeping_10000", test_pipeping, .t_flags = 0, .t_int = 10000 },
{ "pipeping_100000", test_pipeping, .t_flags = 0, .t_int = 100000 },
{ "pipeping_1000000", test_pipeping, .t_flags = 0, .t_int = 1000000 },
+#ifdef WITH_PTHREAD
{ "pipepingtd_1", test_pipepingtd, .t_flags = 0, .t_int = 1 },
{ "pipepingtd_10", test_pipepingtd, .t_flags = 0, .t_int = 10 },
{ "pipepingtd_100", test_pipepingtd, .t_flags = 0, .t_int = 100 },
@@ -834,6 +839,7 @@ static const struct test tests[] = {
{ "pipepingtd_10000", test_pipepingtd, .t_flags = 0, .t_int = 10000 },
{ "pipepingtd_100000", test_pipepingtd, .t_flags = 0, .t_int = 100000 },
{ "pipepingtd_1000000", test_pipepingtd, .t_flags = 0, .t_int = 1000000
},
+#endif
{ "gettimeofday", test_gettimeofday, .t_flags = 0 },
{ "getpriority", test_getpriority, .t_flags = 0 },
{ "getprogname", test_getprogname, .t_flags = 0 },
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
