From owner-svn-src-all@freebsd.org Wed Jul 4 13:45:30 2018 Return-Path: Delivered-To: svn-src-all@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 1A5471037F7E; Wed, 4 Jul 2018 13:45:30 +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 BAE7F7BB22; Wed, 4 Jul 2018 13:45:29 +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 914473E25; Wed, 4 Jul 2018 13:45:29 +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 w64DjTPs013172; Wed, 4 Jul 2018 13:45:29 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w64DjTAv013171; Wed, 4 Jul 2018 13:45:29 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201807041345.w64DjTAv013171@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:45:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r335944 - 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: 335944 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jul 2018 13:45:30 -0000 Author: trasz Date: Wed Jul 4 13:45:29 2018 New Revision: 335944 URL: https://svnweb.freebsd.org/changeset/base/335944 Log: Make the pipeping benchmarks work with larger buffer sizes. Obtained from: CheriBSD MFC after: 2 weeks Sponsored by: DARPA, AFRL Modified: head/tools/tools/syscall_timing/syscall_timing.c Modified: head/tools/tools/syscall_timing/syscall_timing.c ============================================================================== --- head/tools/tools/syscall_timing/syscall_timing.c Wed Jul 4 13:39:48 2018 (r335943) +++ head/tools/tools/syscall_timing/syscall_timing.c Wed Jul 4 13:45:29 2018 (r335944) @@ -159,74 +159,7 @@ test_clock_gettime(uintmax_t num, uintmax_t int_arg __ return (i); } -struct pipepingtd_ctx { - int fd; - uintmax_t int_arg; -}; - -static void * -pipepingtd_proc(void *arg) -{ - struct pipepingtd_ctx *ctxp; - int fd; - void *buf; - uintmax_t int_arg; - ssize_t ret; - - ctxp = arg; - fd = ctxp->fd; - int_arg = ctxp->int_arg; - - buf = malloc(int_arg); - if (buf == NULL) - err(1, "malloc"); - - for (;;) { - ret = read(fd, buf, int_arg); - if ((uintmax_t)ret != int_arg) - err(1, "read"); - ret = write(fd, buf, int_arg); - if ((uintmax_t)ret != int_arg) - err(1, "write"); - } -} - static uintmax_t -test_pipepingtd(uintmax_t num, uintmax_t int_arg, const char *path __unused) -{ - struct pipepingtd_ctx ctx; - char buf[int_arg]; - pthread_t td; - uintmax_t i; - ssize_t ret; - int error, fd[2]; - - if (pipe(fd) < 0) - err(-1, "pipe"); - - ctx.fd = fd[1]; - ctx.int_arg = int_arg; - - error = pthread_create(&td, NULL, pipepingtd_proc, &ctx); - if (error != 0) - err(1, "pthread_create"); - - benchmark_start(); - BENCHMARK_FOREACH(i, num) { - ret = write(fd[0], buf, int_arg); - if ((uintmax_t)ret != int_arg) - err(1, "write"); - ret = read(fd[0], buf, int_arg); - if ((uintmax_t)ret != int_arg) - err(1, "read"); - } - benchmark_stop(); - pthread_cancel(td); - - return (i); -} - -static uintmax_t test_gettimeofday(uintmax_t num, uintmax_t int_arg __unused, const char *path __unused) { struct timeval tv; @@ -319,12 +252,41 @@ test_select(uintmax_t num, uintmax_t int_arg __unused, return (i); } +static void +readx(int fd, char *buf, size_t size) +{ + ssize_t ret; + + do { + ret = read(fd, buf, size); + if (ret == -1) + err(1, "read"); + assert((size_t)ret <= size); + size -= ret; + buf += ret; + } while (size > 0); +} + +static void +writex(int fd, const char *buf, size_t size) +{ + ssize_t ret; + + do { + ret = write(fd, buf, size); + if (ret == -1) + err(1, "write"); + assert((size_t)ret <= size); + size -= ret; + buf += ret; + } while (size > 0); +} + static uintmax_t test_pipeping(uintmax_t num, uintmax_t int_arg, const char *path __unused) { char buf[int_arg]; uintmax_t i; - ssize_t ret; pid_t pid; int fd[2], procfd; @@ -339,12 +301,8 @@ test_pipeping(uintmax_t num, uintmax_t int_arg, const close(fd[0]); for (;;) { - ret = read(fd[1], buf, int_arg); - if ((uintmax_t)ret != int_arg) - err(1, "read"); - ret = write(fd[1], buf, int_arg); - if ((uintmax_t)ret != int_arg) - err(1, "write"); + readx(fd[1], buf, int_arg); + writex(fd[1], buf, int_arg); } } @@ -352,12 +310,8 @@ test_pipeping(uintmax_t num, uintmax_t int_arg, const benchmark_start(); BENCHMARK_FOREACH(i, num) { - ret = write(fd[0], buf, int_arg); - if ((uintmax_t)ret != int_arg) - err(1, "write"); - ret = read(fd[0], buf, int_arg); - if ((uintmax_t)ret != int_arg) - err(1, "read"); + writex(fd[0], buf, int_arg); + readx(fd[0], buf, int_arg); } benchmark_stop(); @@ -365,7 +319,64 @@ test_pipeping(uintmax_t num, uintmax_t int_arg, const return (i); } +struct pipepingtd_ctx { + int fd; + uintmax_t int_arg; +}; + +static void * +pipepingtd_proc(void *arg) +{ + struct pipepingtd_ctx *ctxp; + int fd; + void *buf; + uintmax_t int_arg; + + ctxp = arg; + fd = ctxp->fd; + int_arg = ctxp->int_arg; + + buf = malloc(int_arg); + if (buf == NULL) + err(1, "malloc"); + + for (;;) { + readx(fd, buf, int_arg); + writex(fd, buf, int_arg); + } +} + static uintmax_t +test_pipepingtd(uintmax_t num, uintmax_t int_arg, const char *path __unused) +{ + struct pipepingtd_ctx ctx; + char buf[int_arg]; + pthread_t td; + uintmax_t i; + int error, fd[2]; + + if (pipe(fd) < 0) + err(-1, "pipe"); + + ctx.fd = fd[1]; + ctx.int_arg = int_arg; + + error = pthread_create(&td, NULL, pipepingtd_proc, &ctx); + if (error != 0) + err(1, "pthread_create"); + + benchmark_start(); + BENCHMARK_FOREACH(i, num) { + writex(fd[0], buf, int_arg); + readx(fd[0], buf, int_arg); + } + benchmark_stop(); + pthread_cancel(td); + + return (i); +} + +static uintmax_t test_socket_stream(uintmax_t num, uintmax_t int_arg, const char *path __unused) { uintmax_t i; @@ -814,25 +825,15 @@ static const struct test tests[] = { { "pipeping_100", test_pipeping, .t_flags = 0, .t_int = 100 }, { "pipeping_1000", test_pipeping, .t_flags = 0, .t_int = 1000 }, { "pipeping_10000", test_pipeping, .t_flags = 0, .t_int = 10000 }, -#ifdef notyet - /* - * XXX: Doesn't work; kernel pipe buffer too small? - */ { "pipeping_100000", test_pipeping, .t_flags = 0, .t_int = 100000 }, { "pipeping_1000000", test_pipeping, .t_flags = 0, .t_int = 1000000 }, -#endif { "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 }, { "pipepingtd_1000", test_pipepingtd, .t_flags = 0, .t_int = 1000 }, { "pipepingtd_10000", test_pipepingtd, .t_flags = 0, .t_int = 10000 }, -#ifdef notyet - /* - * XXX: Doesn't work; kernel pipe buffer too small? - */ { "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 },