From owner-svn-src-stable@FreeBSD.ORG Tue Oct 19 14:09:18 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4D9FD106566B; Tue, 19 Oct 2010 14:09:18 +0000 (UTC) (envelope-from pluknet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 302D48FC14; Tue, 19 Oct 2010 14:09:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9JE9HgV016980; Tue, 19 Oct 2010 14:09:17 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9JE9HBI016977; Tue, 19 Oct 2010 14:09:17 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201010191409.o9JE9HBI016977@svn.freebsd.org> From: Sergey Kandaurov Date: Tue, 19 Oct 2010 14:09:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r214057 - in stable/8/tools/tools/netrate: juggle tcpconnect X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Oct 2010 14:09:18 -0000 Author: pluknet Date: Tue Oct 19 14:09:17 2010 New Revision: 214057 URL: http://svn.freebsd.org/changeset/base/214057 Log: MFC r213574: - tcpconnect incorrectly uses err() in usage() with errx() semantics [1] - 64-bit aware fixes in printf() usage [2] o netrate/juggle: time_t has arch-dependent size o netrate/tcpconnect: don't assume %ll has always 64bit. PR: 146088 [1], 146086 [2] (modified) Approved by: kib (mentor) Modified: stable/8/tools/tools/netrate/juggle/juggle.c stable/8/tools/tools/netrate/tcpconnect/tcpconnect.c Directory Properties: stable/8/tools/tools/netrate/ (props changed) stable/8/tools/tools/netrate/tcpp/ (props changed) Modified: stable/8/tools/tools/netrate/juggle/juggle.c ============================================================================== --- stable/8/tools/tools/netrate/juggle/juggle.c Tue Oct 19 13:31:43 2010 (r214056) +++ stable/8/tools/tools/netrate/juggle/juggle.c Tue Oct 19 14:09:17 2010 (r214057) @@ -28,6 +28,7 @@ #include #include +#include #include #include #include @@ -557,7 +558,8 @@ main(int argc, char *argv[]) if (j != 0) printf(", "); scale_timespec(&juggle_results[j], p); - printf("%u.%09lu", juggle_results[j].tv_sec, + printf("%jd.%09lu", + (intmax_t)juggle_results[j].tv_sec, juggle_results[j].tv_nsec); } printf("\n"); @@ -567,7 +569,8 @@ main(int argc, char *argv[]) if (j != 0) printf(", "); scale_timespec(&process_results[j], p); - printf("%u.%09lu", process_results[j].tv_sec, + printf("%jd.%09lu", + (intmax_t)process_results[j].tv_sec, process_results[j].tv_nsec); } printf("\n"); @@ -577,7 +580,8 @@ main(int argc, char *argv[]) if (j != 0) printf(", "); scale_timespec(&thread_results[j], p); - printf("%u.%09lu", thread_results[j].tv_sec, + printf("%jd.%09lu", + (intmax_t)thread_results[j].tv_sec, thread_results[j].tv_nsec); } printf("\n"); Modified: stable/8/tools/tools/netrate/tcpconnect/tcpconnect.c ============================================================================== --- stable/8/tools/tools/netrate/tcpconnect/tcpconnect.c Tue Oct 19 13:31:43 2010 (r214056) +++ stable/8/tools/tools/netrate/tcpconnect/tcpconnect.c Tue Oct 19 14:09:17 2010 (r214057) @@ -31,6 +31,7 @@ #include #include #include +#include #include @@ -110,7 +111,7 @@ main(int argc, char *argv[]) u_int64_t counter; if (argc != 2) - err(-1, "usage: tcpconnect [ip]"); + errx(-1, "usage: tcpconnect [ip]"); bzero(&sin, sizeof(sin)); sin.sin_family = AF_INET; @@ -128,8 +129,8 @@ main(int argc, char *argv[]) if (try_connect(&sin) == 0) counter++; } - printf("%llu count\n", counter); - printf("%llu connections/second\n", counter / SECONDS); + printf("%ju count\n", (uintmax_t)counter); + printf("%ju connections/second\n", (uintmax_t)(counter / SECONDS)); return (0); }