From owner-svn-src-stable-11@freebsd.org Sat Mar 18 17:59:45 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 05DA0D12283; Sat, 18 Mar 2017 17:59:45 +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 mx1.freebsd.org (Postfix) with ESMTPS id AF3E11B09; Sat, 18 Mar 2017 17:59:44 +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 v2IHxh2L058376; Sat, 18 Mar 2017 17:59:43 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2IHxhH4058375; Sat, 18 Mar 2017 17:59:43 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201703181759.v2IHxhH4058375@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Sat, 18 Mar 2017 17:59:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r315493 - stable/11/usr.sbin/diskinfo X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Mar 2017 17:59:45 -0000 Author: trasz Date: Sat Mar 18 17:59:43 2017 New Revision: 315493 URL: https://svnweb.freebsd.org/changeset/base/315493 Log: MFC r306129: Reduce code duplication by factoring out the delta_t() function. No functional changes. Modified: stable/11/usr.sbin/diskinfo/diskinfo.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/diskinfo/diskinfo.c ============================================================================== --- stable/11/usr.sbin/diskinfo/diskinfo.c Sat Mar 18 17:58:41 2017 (r315492) +++ stable/11/usr.sbin/diskinfo/diskinfo.c Sat Mar 18 17:59:43 2017 (r315493) @@ -237,14 +237,24 @@ T0(void) gettimeofday(&tv1, NULL); } -static void -TN(int count) +static double +delta_t(void) { double dt; gettimeofday(&tv2, NULL); dt = (tv2.tv_usec - tv1.tv_usec) / 1e6; dt += (tv2.tv_sec - tv1.tv_sec); + + return (dt); +} + +static void +TN(int count) +{ + double dt; + + dt = delta_t(); printf("%5d iter in %10.6f sec = %8.3f msec\n", count, dt, dt * 1000.0 / count); } @@ -254,9 +264,7 @@ TR(double count) { double dt; - gettimeofday(&tv2, NULL); - dt = (tv2.tv_usec - tv1.tv_usec) / 1e6; - dt += (tv2.tv_sec - tv1.tv_sec); + dt = delta_t(); printf("%8.0f kbytes in %10.6f sec = %8.0f kbytes/sec\n", count, dt, count / dt); } @@ -393,9 +401,7 @@ commandtime(int fd, off_t mediasize, u_i T0(); for (i = 0; i < 10; i++) rdmega(fd); - gettimeofday(&tv2, NULL); - dtmega = (tv2.tv_usec - tv1.tv_usec) / 1e6; - dtmega += (tv2.tv_sec - tv1.tv_sec); + dtmega = delta_t(); printf("\ttime to read 10MB block %10.6f sec\t= %8.3f msec/sector\n", dtmega, dtmega*100/2048); @@ -404,9 +410,7 @@ commandtime(int fd, off_t mediasize, u_i T0(); for (i = 0; i < 20480; i++) rdsect(fd, 0, sectorsize); - gettimeofday(&tv2, NULL); - dtsector = (tv2.tv_usec - tv1.tv_usec) / 1e6; - dtsector += (tv2.tv_sec - tv1.tv_sec); + dtsector = delta_t(); printf("\ttime to read 20480 sectors %10.6f sec\t= %8.3f msec/sector\n", dtsector, dtsector*100/2048);