From owner-svn-src-head@freebsd.org Wed Jul 4 14:15:49 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 7AD48103B063; Wed, 4 Jul 2018 14:15:49 +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 2CF017DD9C; Wed, 4 Jul 2018 14:15:49 +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 0E0344381; Wed, 4 Jul 2018 14:15:49 +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 w64EFmNa029420; Wed, 4 Jul 2018 14:15:48 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w64EFmRn029419; Wed, 4 Jul 2018 14:15:48 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201807041415.w64EFmRn029419@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 14:15:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r335954 - 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: 335954 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 14:15:49 -0000 Author: trasz Date: Wed Jul 4 14:15:48 2018 New Revision: 335954 URL: https://svnweb.freebsd.org/changeset/base/335954 Log: Sort the benchmarks even more. 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 14:14:00 2018 (r335953) +++ head/tools/tools/syscall_timing/syscall_timing.c Wed Jul 4 14:15:48 2018 (r335954) @@ -604,6 +604,71 @@ test_setuid(uintmax_t num, uintmax_t int_arg __unused, } static uintmax_t +test_shmfd(uintmax_t num, uintmax_t int_arg __unused, const char *path __unused) +{ + uintmax_t i; + int shmfd; + + shmfd = shm_open(SHM_ANON, O_CREAT | O_RDWR, 0600); + if (shmfd < 0) + err(-1, "test_shmfd: shm_open"); + close(shmfd); + benchmark_start(); + BENCHMARK_FOREACH(i, num) { + shmfd = shm_open(SHM_ANON, O_CREAT | O_RDWR, 0600); + if (shmfd < 0) + err(-1, "test_shmfd: shm_open"); + close(shmfd); + } + benchmark_stop(); + return (i); +} + +static uintmax_t +test_shmfd_dup(uintmax_t num, uintmax_t int_arg __unused, const char *path __unused) +{ + uintmax_t i; + int fd, shmfd; + + shmfd = shm_open(SHM_ANON, O_CREAT | O_RDWR, 0600); + if (shmfd < 0) + err(-1, "test_shmfd_dup: shm_open"); + fd = dup(shmfd); + if (fd >= 0) + close(fd); + benchmark_start(); + BENCHMARK_FOREACH(i, num) { + fd = dup(shmfd); + if (fd >= 0) + close(fd); + } + benchmark_stop(); + close(shmfd); + return (i); +} + +static uintmax_t +test_shmfd_fstat(uintmax_t num, uintmax_t int_arg __unused, const char *path __unused) +{ + struct stat sb; + uintmax_t i; + int shmfd; + + shmfd = shm_open(SHM_ANON, O_CREAT | O_RDWR, 0600); + if (shmfd < 0) + err(-1, "test_shmfd_fstat: shm_open"); + if (fstat(shmfd, &sb) < 0) + err(-1, "test_shmfd_fstat: fstat"); + benchmark_start(); + BENCHMARK_FOREACH(i, num) { + (void)fstat(shmfd, &sb); + } + benchmark_stop(); + close(shmfd); + return (i); +} + +static uintmax_t test_socket_stream(uintmax_t num, uintmax_t int_arg, const char *path __unused) { uintmax_t i; @@ -688,71 +753,6 @@ test_socketpair_dgram(uintmax_t num, uintmax_t int_arg } static uintmax_t -test_shmfd_dup(uintmax_t num, uintmax_t int_arg __unused, const char *path __unused) -{ - uintmax_t i; - int fd, shmfd; - - shmfd = shm_open(SHM_ANON, O_CREAT | O_RDWR, 0600); - if (shmfd < 0) - err(-1, "test_shmfd_dup: shm_open"); - fd = dup(shmfd); - if (fd >= 0) - close(fd); - benchmark_start(); - BENCHMARK_FOREACH(i, num) { - fd = dup(shmfd); - if (fd >= 0) - close(fd); - } - benchmark_stop(); - close(shmfd); - return (i); -} - -static uintmax_t -test_shmfd(uintmax_t num, uintmax_t int_arg __unused, const char *path __unused) -{ - uintmax_t i; - int shmfd; - - shmfd = shm_open(SHM_ANON, O_CREAT | O_RDWR, 0600); - if (shmfd < 0) - err(-1, "test_shmfd: shm_open"); - close(shmfd); - benchmark_start(); - BENCHMARK_FOREACH(i, num) { - shmfd = shm_open(SHM_ANON, O_CREAT | O_RDWR, 0600); - if (shmfd < 0) - err(-1, "test_shmfd: shm_open"); - close(shmfd); - } - benchmark_stop(); - return (i); -} - -static uintmax_t -test_shmfd_fstat(uintmax_t num, uintmax_t int_arg __unused, const char *path __unused) -{ - struct stat sb; - uintmax_t i; - int shmfd; - - shmfd = shm_open(SHM_ANON, O_CREAT | O_RDWR, 0600); - if (shmfd < 0) - err(-1, "test_shmfd_fstat: shm_open"); - if (fstat(shmfd, &sb) < 0) - err(-1, "test_shmfd_fstat: fstat"); - benchmark_start(); - BENCHMARK_FOREACH(i, num) { - (void)fstat(shmfd, &sb); - } - benchmark_stop(); - close(shmfd); - return (i); -} - -static uintmax_t test_vfork(uintmax_t num, uintmax_t int_arg __unused, const char *path __unused) { pid_t pid; @@ -874,15 +874,15 @@ static const struct test tests[] = { { "read_1000000", test_read, .t_flags = FLAG_PATH, .t_int = 1000000 }, { "select", test_select, .t_flags = 0 }, { "setuid", test_setuid, .t_flags = 0 }, + { "shmfd", test_shmfd, .t_flags = 0 }, + { "shmfd_dup", test_shmfd_dup, .t_flags = 0 }, + { "shmfd_fstat", test_shmfd_fstat, .t_flags = 0 }, { "socket_local_stream", test_socket_stream, .t_int = PF_LOCAL }, { "socket_local_dgram", test_socket_dgram, .t_int = PF_LOCAL }, { "socketpair_stream", test_socketpair_stream, .t_flags = 0 }, { "socketpair_dgram", test_socketpair_dgram, .t_flags = 0 }, { "socket_tcp", test_socket_stream, .t_int = PF_INET }, { "socket_udp", test_socket_dgram, .t_int = PF_INET }, - { "shmfd_dup", test_shmfd_dup, .t_flags = 0 }, - { "shmfd", test_shmfd, .t_flags = 0 }, - { "shmfd_fstat", test_shmfd_fstat, .t_flags = 0 }, { "vfork", test_vfork, .t_flags = 0 }, { "vfork_exec", test_vfork_exec, .t_flags = 0 }, };