From owner-svn-src-head@freebsd.org Wed Jul 4 13:52:14 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 47056103889A; Wed, 4 Jul 2018 13:52:14 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F14A27C179; Wed, 4 Jul 2018 13:52:13 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D254B3FF8; Wed, 4 Jul 2018 13:52:13 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w64DqDCY018243; Wed, 4 Jul 2018 13:52:13 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w64DqDhB018241; Wed, 4 Jul 2018 13:52:13 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201807041352.w64DqDhB018241@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Wed, 4 Jul 2018 13:52:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r335945 - head/tools/tools/syscall_timing X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/tools/tools/syscall_timing X-SVN-Commit-Revision: 335945 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jul 2018 13:52:14 -0000 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 #include #include +#ifdef WITH_PTHREAD #include +#endif #include #include #include @@ -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 },