From owner-svn-src-all@FreeBSD.ORG  Sat Jun  9 08:25:39 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id A87BE1065673;
	Sat,  9 Jun 2012 08:25:39 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 917DA8FC23;
	Sat,  9 Jun 2012 08:25:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q598Pd46017493;
	Sat, 9 Jun 2012 08:25:39 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q598Pdbq017491;
	Sat, 9 Jun 2012 08:25:39 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201206090825.q598Pdbq017491@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sat, 9 Jun 2012 08:25:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236798 - stable/9/tools/tools/syscall_timing
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Jun 2012 08:25:39 -0000

Author: kib
Date: Sat Jun  9 08:25:39 2012
New Revision: 236798
URL: http://svn.freebsd.org/changeset/base/236798

Log:
  MFC r236690:
  Do not execute a needed statement with side-effect in assert().

Modified:
  stable/9/tools/tools/syscall_timing/syscall_timing.c
Directory Properties:
  stable/9/tools/tools/syscall_timing/   (props changed)

Modified: stable/9/tools/tools/syscall_timing/syscall_timing.c
==============================================================================
--- stable/9/tools/tools/syscall_timing/syscall_timing.c	Sat Jun  9 08:23:55 2012	(r236797)
+++ stable/9/tools/tools/syscall_timing/syscall_timing.c	Sat Jun  9 08:25:39 2012	(r236798)
@@ -71,20 +71,24 @@ alarm_handler(int signum)
 static void
 benchmark_start(void)
 {
+	int error;
 
 	alarm_fired = 0;
 	if (alarm_timeout) {
 		signal(SIGALRM, alarm_handler);
 		alarm(alarm_timeout);
 	}
-	assert(clock_gettime(CLOCK_REALTIME, &ts_start) == 0);
+	error = clock_gettime(CLOCK_REALTIME, &ts_start);
+	assert(error == 0);
 }
 
 static void
 benchmark_stop(void)
 {
+	int error;
 
-	assert(clock_gettime(CLOCK_REALTIME, &ts_end) == 0);
+	error = clock_gettime(CLOCK_REALTIME, &ts_end);
+	assert(error == 0);
 }
   
 uintmax_t
@@ -687,7 +691,7 @@ main(int argc, char *argv[])
 	const char *path;
 	long long ll;
 	char *endp;
-	int ch, i, j, k;
+	int ch, error, i, j, k;
 	uintmax_t iterations, loops;
 
 	alarm_timeout = 1;
@@ -756,7 +760,8 @@ main(int argc, char *argv[])
 		}
 	}
 
-	assert(clock_getres(CLOCK_REALTIME, &ts_res) == 0);
+	error = clock_getres(CLOCK_REALTIME, &ts_res);
+	assert(error == 0);
 	printf("Clock resolution: %ju.%09ju\n", (uintmax_t)ts_res.tv_sec,
 	    (uintmax_t)ts_res.tv_nsec);
 	printf("test\tloop\ttime\titerations\tperiteration\n");