Allow for 64-bit cache-line alignments in code segment.

[openssl.git] / crypto / tmdiff.c

diff --git a/crypto/tmdiff.c b/crypto/tmdiff.c
index e1a0e17ac0588c2b279f6474f8f9a03e5d39e1bd..1c6e052ac98d7bf61e4014371fc7cf6cab9ab480 100644 (file)
--- a/crypto/tmdiff.c
+++ b/crypto/tmdiff.c
@@ -59,6 +59,9 @@
 #include <stdlib.h>
 #include "cryptlib.h"
 #include <openssl/tmdiff.h>
+#if !defined(OPENSSL_SYS_MSDOS)
+#include OPENSSL_UNISTD
+#endif
 
 #ifdef TIMEB
 #undef OPENSSL_SYS_WIN32
@@ -69,7 +72,11 @@
 # define TIMES
 #endif
 
-#ifndef _IRIX
+#ifdef OPENSSL_SYS_NETWARE
+#undef TIMES
+#endif
+
+#if !defined(_IRIX) || defined (OPENSSL_SYS_NETWARE)
 #  include <time.h>
 #endif
 #ifdef TIMES
@@ -91,7 +98,7 @@
 #include <sys/param.h>
 #endif
 
-#if !defined(TIMES) && !defined(OPENSSL_SYS_VXWORKS)
+#if !defined(TIMES) && !defined(OPENSSL_SYS_VXWORKS) && !defined(OPENSSL_SYS_NETWARE)
 #include <sys/timeb.h>
 #endif
 
@@ -101,18 +108,24 @@
 
 /* The following if from times(3) man page.  It may need to be changed */
 #ifndef HZ
-# ifndef CLK_TCK
-#  ifndef _BSD_CLK_TCK_ /* FreeBSD hack */
-#   define HZ  100.0
-#  else /* _BSD_CLK_TCK_ */
-#   define HZ ((double)_BSD_CLK_TCK_)
+# if defined(_SC_CLK_TCK) \
+     && (!defined(OPENSSL_SYS_VMS) || __CTRL_VER >= 70000000)
+/* #  define HZ ((double)sysconf(_SC_CLK_TCK)) */
+#  define HZ sysconf(_SC_CLK_TCK)
+# else
+#  ifndef CLK_TCK
+#   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
-# else /* CLK_TCK */
-#  define HZ ((double)CLK_TCK)
 # endif
 #endif
 
-typedef struct ms_tm
+struct ms_tm
        {
 #ifdef TIMES
        struct tms ms_tms;
@@ -120,6 +133,8 @@ typedef struct ms_tm
 #  ifdef OPENSSL_SYS_WIN32
        HANDLE thread_id;
        FILETIME ms_win32;
+#  elif defined (OPENSSL_SYS_NETWARE)
+   clock_t ms_clock;
 #  else
 #    ifdef OPENSSL_SYS_VXWORKS
           unsigned long ticks;
@@ -128,9 +143,9 @@ typedef struct ms_tm
 #    endif
 #  endif
 #endif
-       } MS_TM;
+       };
 
-char *ms_time_new(void)
+MS_TM *ms_time_new(void)
        {
        MS_TM *ret;
 
@@ -141,18 +156,17 @@ char *ms_time_new(void)
 #ifdef OPENSSL_SYS_WIN32
        ret->thread_id=GetCurrentThread();
 #endif
-       return((char *)ret);
+       return ret;
        }
 
-void ms_time_free(char *a)
+void ms_time_free(MS_TM *a)
        {
        if (a != NULL)
                OPENSSL_free(a);
        }
 
-void ms_time_get(char *a)
+void ms_time_get(MS_TM *tm)
        {
-       MS_TM *tm=(MS_TM *)a;
 #ifdef OPENSSL_SYS_WIN32
        FILETIME tmpa,tmpb,tmpc;
 #endif
@@ -162,6 +176,8 @@ void ms_time_get(char *a)
 #else
 #  ifdef OPENSSL_SYS_WIN32
        GetThreadTimes(tm->thread_id,&tmpa,&tmpb,&tmpc,&(tm->ms_win32));
+#  elif defined (OPENSSL_SYS_NETWARE)
+   tm->ms_clock = clock();
 #  else
 #    ifdef OPENSSL_SYS_VXWORKS
         tm->ticks = tickGet();
@@ -172,14 +188,13 @@ void ms_time_get(char *a)
 #endif
        }
 
-double ms_time_diff(char *ap, char *bp)
+double ms_time_diff(MS_TM *a, MS_TM *b)
        {
-       MS_TM *a=(MS_TM *)ap;
-       MS_TM *b=(MS_TM *)bp;
        double ret;
 
 #ifdef TIMES
-       ret=(b->ms_tms.tms_utime-a->ms_tms.tms_utime)/HZ;
+       ret = HZ;
+       ret = (b->ms_tms.tms_utime-a->ms_tms.tms_utime) / ret;
 #else
 # ifdef OPENSSL_SYS_WIN32
        {
@@ -196,6 +211,8 @@ double ms_time_diff(char *ap, char *bp)
        lb+=b->ms_win32.dwLowDateTime;
        ret=((double)(lb-la))/1e7;
        }
+# elif defined (OPENSSL_SYS_NETWARE)
+    ret= (double)(b->ms_clock - a->ms_clock);
 # else
 #  ifdef OPENSSL_SYS_VXWORKS
         ret = (double)(b->ticks - a->ticks) / (double)sysClkRateGet();
@@ -209,18 +226,20 @@ double ms_time_diff(char *ap, char *bp)
        return((ret < 0.0000001)?0.0000001:ret);
        }
 
-int ms_time_cmp(char *ap, char *bp)
+int ms_time_cmp(const MS_TM *a, const MS_TM *b)
        {
-       MS_TM *a=(MS_TM *)ap,*b=(MS_TM *)bp;
        double d;
        int ret;
 
 #ifdef TIMES
-       d=(b->ms_tms.tms_utime-a->ms_tms.tms_utime)/HZ;
+       d = HZ;
+       d = (b->ms_tms.tms_utime-a->ms_tms.tms_utime) / d;
 #else
 # ifdef OPENSSL_SYS_WIN32
        d =(b->ms_win32.dwHighDateTime&0x000fffff)*10+b->ms_win32.dwLowDateTime/1e7;
        d-=(a->ms_win32.dwHighDateTime&0x000fffff)*10+a->ms_win32.dwLowDateTime/1e7;
+# elif defined (OPENSSL_SYS_NETWARE)
+    d= (double)(b->ms_clock - a->ms_clock);
 # else
 #  ifdef OPENSSL_SYS_VXWORKS
         d = (b->ticks - a->ticks);