From f5301388766a1e30a377cb131cfa5fba782bda0b Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Sun, 6 Nov 2005 11:58:22 +0000 Subject: [PATCH] Fix newly introduced typos and warnings in ./apps. --- apps/apps.c | 11 +++++++++-- apps/speed.c | 6 ------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/apps/apps.c b/apps/apps.c index 60bd7ef343..ee5edaa7b8 100644 --- a/apps/apps.c +++ b/apps/apps.c @@ -2375,6 +2375,7 @@ double app_tminterval(int stop,int usertime) FILETIME now; double ret=0; static ULARGE_INTEGER tmstart; + static int warning=1; #ifdef _WIN32_WINNT static HANDLE proc=NULL; @@ -2394,6 +2395,12 @@ double app_tminterval(int stop,int usertime) else #endif { + if (usertime && warning) + { + BIO_printf(bio_err,"To get meaningful results, run " + "this program on idle system.\n" + warning=1; + } SYSTEMTIME systime; GetSystemTime(&systime); SystemTimeToFileTime(&systime,&now); @@ -2428,7 +2435,7 @@ double app_tminterval(int stop,int usertime) if (usertime) now = rus.tms_utime; - if (stop==TMSTART) tmstart = now; + if (stop==TM_START) tmstart = now; else ret = (now - tmstart)/(double)sysconf(_SC_CLK_TCK); return (ret); @@ -2448,7 +2455,7 @@ double app_tminterval(int stop,int usertime) if (usertime) getrusage(RUSAGE_SELF,&rus), now = rus.ru_time; else gettimeofday(&now,NULL); - if (stop==TMSTART) tmstart = now; + if (stop==TM_START) tmstart = now; else ret = ( (now.tv_sec+now.tv_usec*1e-6) - (tmstart.tv_sec+tmstart.tv_usec*1e-6) ); diff --git a/apps/speed.c b/apps/speed.c index 75c34760f4..9b8365c44f 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -183,7 +183,6 @@ #define BUFSIZE ((long)1024*8+1) int run=0; -static char ftime_used = 0, times_used = 0, gettimeofday_used = 0, getrusage_used = 0; static int mr=0; static int usertime=1; @@ -1050,11 +1049,6 @@ int MAIN(int argc, char **argv) if (usertime == 0 && !mr) BIO_printf(bio_err,"You have chosen to measure elapsed time instead of user CPU time.\n"); - if (usertime <= 0 && !mr) - { - BIO_printf(bio_err,"To get the most accurate results, try to run this\n"); - BIO_printf(bio_err,"program when this computer is idle.\n"); - } #ifndef OPENSSL_NO_RSA for (i=0; i