Date: Sat, 9 Jun 2012 08:25:39 +0000 (UTC) From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r236798 - stable/9/tools/tools/syscall_timing Message-ID: <201206090825.q598Pdbq017491@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206090825.q598Pdbq017491>