QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-04-29 03:04:37 +00:00
Code Issues Projects Releases Wiki Activity

Change HZ in speed to rely on sysconf() if the clock tick is available

Browse Source 
that way.  Synchronise s_time with these changes.
This commit is contained in:
Richard Levitte 2001-09-28 10:34:48 +00:00
parent 34c66925aa
commit a4a8f7b3ef
2 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
apps/s_time.c
View File

@ -67,20 +67,21 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#define USE_SOCKETS
#include "apps.h"
#ifdef OPENSSL_NO_STDIO #ifdef OPENSSL_NO_STDIO
#define APPS_WIN16 #define APPS_WIN16
#endif #endif
#define USE_SOCKETS
#include <openssl/x509.h> #include <openssl/x509.h>
#include <openssl/ssl.h> #include <openssl/ssl.h>
#include <openssl/pem.h> #include <openssl/pem.h>
#include "apps.h"
#include "s_apps.h" #include "s_apps.h"
#include <openssl/err.h> #include <openssl/err.h>
#ifdef WIN32_STUFF #ifdef WIN32_STUFF
#include "winmain.h" #include "winmain.h"
#include "wintext.h" #include "wintext.h"
#endif #endif
#include OPENSSL_UNISTD
#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX) #if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX)
#define TIMES #define TIMES
@ -119,11 +120,19 @@
/* The following if from times(3) man page. It may need to be changed /* The following if from times(3) man page. It may need to be changed
*/ */
#ifndef HZ #ifndef HZ
#ifndef CLK_TCK # ifdef _SC_CLK_TCK
#define HZ 100.0 # define HZ ((double)sysconf(_SC_CLK_TCK))
#else /* CLK_TCK */ # else
#define HZ ((double)CLK_TCK) # ifndef CLK_TCK
#endif # ifndef _BSD_CLK_TCK_ /* FreeBSD hack */
# define HZ 100.0
# else /* _BSD_CLK_TCK_ */
# define HZ ((double)_BSD_CLK_TCK_)
# endif
# else /* CLK_TCK */
# define HZ ((double)CLK_TCK)
# endif
# endif
#endif #endif
#undef PROG #undef PROG

27
apps/speed.c
View File

@ -83,6 +83,7 @@
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/objects.h> #include <openssl/objects.h>
#include OPENSSL_UNISTD
#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(OPENSSL_SYS_MACOSX) #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(OPENSSL_SYS_MACOSX)
# define USE_TOD # define USE_TOD
@ -181,17 +182,16 @@
/* The following if from times(3) man page. It may need to be changed */ /* The following if from times(3) man page. It may need to be changed */
#ifndef HZ #ifndef HZ
# ifndef CLK_TCK # ifdef _SC_CLK_TCK
# ifndef _BSD_CLK_TCK_ /* FreeBSD hack */ # define HZ ((double)sysconf(_SC_CLK_TCK))
# define HZ 100.0 # else
# else /* _BSD_CLK_TCK_ */ # ifndef CLK_TCK
# define HZ ((double)_BSD_CLK_TCK_) # ifndef _BSD_CLK_TCK_ /* FreeBSD hack */
# endif # define HZ 100.0
# else /* CLK_TCK */ # else /* _BSD_CLK_TCK_ */
# ifdef OPENSSL_SYS_LINUX /* Because it seems like some Linuxen # define HZ ((double)_BSD_CLK_TCK_)
have weird values here... */ # endif
# define HZ 100.0 # else /* CLK_TCK */
# else
# define HZ ((double)CLK_TCK) # define HZ ((double)CLK_TCK)
# endif # endif
# endif # endif
@ -1446,7 +1446,10 @@ int MAIN(int argc, char **argv)
#endif #endif
#ifdef HZ #ifdef HZ
#define as_string(s) (#s) #define as_string(s) (#s)
printf("HZ=%g", (double)HZ); printf("HZ=%g", HZ);
# ifdef _SC_CLK_TCK
printf(" [sysconf value]");
# endif
#endif #endif
printf("\n"); printf("\n");
printf("timing function used: %s%s%s%s%s%s%s\n", printf("timing function used: %s%s%s%s%s%s%s\n",