systm-h-header-inclusion-20060227

[openafs.git] / src / rx / rx_clock.h

diff --git a/src/rx/rx_clock.h b/src/rx/rx_clock.h
index a8665fa..6b13f79 100644 (file)
--- a/src/rx/rx_clock.h
+++ b/src/rx/rx_clock.h
@@ -14,10 +14,10 @@
 #define _CLOCK_
 
 #ifdef KERNEL
-#if defined(AFS_AIX_ENV) || defined(AFS_AUX_ENV)
-#include "../h/systm.h"
-#include "../h/time.h"
-#endif /* System V */
+#if defined(AFS_AIX_ENV) || defined(AFS_AUX_ENV) || defined(AFS_SUN5_ENV)
+#include "h/systm.h"
+#include "h/time.h"
+#endif /* System V */
 #else /* KERNEL */
 #ifndef AFS_NT40_ENV
 #ifndef ITIMER_REAL
@@ -38,8 +38,8 @@
 
 /* A clock value is the number of seconds and microseconds that have elapsed since calling clock_Init. */
 struct clock {
-    afs_int32 sec;         /* Seconds since clock_Init */
-    afs_int32 usec;        /* Microseconds since clock_Init */
+    afs_int32 sec;             /* Seconds since clock_Init */
+    afs_int32 usec;            /* Microseconds since clock_Init */
 };
 
 #ifndef        KERNEL
@@ -70,13 +70,9 @@ extern int clock_haveCurrentTime;
 extern int clock_nUpdates;
 
 /* Initialize the clock package */
-extern void clock_Init();
 
 #define        clock_NewTime() (clock_haveCurrentTime = 0)
 
-/* Update the value to be returned by gettime */
-extern void clock_UpdateTime();
-
 /* Return the current clock time.  If the clock value has not been updated since the last call to clock_NewTime, it is updated now */
 #define        clock_GetTime(cv)                               \
     BEGIN                                              \
@@ -89,28 +85,31 @@ extern void clock_UpdateTime();
 #define        clock_Sec() ((!clock_haveCurrentTime)? clock_UpdateTime(), clock_now.sec:clock_now.sec)
 #endif /* AFS_USE_GETTIMEOFDAY || AFS_PTHREAD_ENV */
 #else /* KERNEL */
-#include "../afs/afs_osi.h"
+#include "afs/afs_osi.h"
 #define clock_Init()
 #if defined(AFS_SGI61_ENV) || defined(AFS_HPUX_ENV) || defined(AFS_LINUX_64BIT_KERNEL)
 #define clock_GetTime(cv) osi_GetTime((osi_timeval_t *)cv)
 #else
-#define clock_GetTime(cv) osi_GetTime((struct timeval *)cv)
+#if defined(AFS_AIX51_ENV) && defined(AFS_64BIT_KERNEL)
+#define        clock_GetTime(cv)                               \
+    BEGIN                                              \
+       struct timeval tv;                              \
+       osi_GetTime(&tv);                        \
+       (cv)->sec = (afs_int32)tv.tv_sec;               \
+       (cv)->usec = (afs_int32)tv.tv_usec;             \
+    END
+#else /* defined(AFS_AIX51_ENV) && defined(AFS_64BIT_KERNEL) */
+#define clock_GetTime(cv) osi_GetTime((osi_timeval_t *)(cv))
+#endif /* defined(AFS_AIX51_ENV) && defined(AFS_64BIT_KERNEL) */
 #endif
 #define clock_Sec() osi_Time()
-#define        clock_NewTime()    /* don't do anything; clock is fast enough in kernel */
+#define        clock_NewTime()         /* don't do anything; clock is fast enough in kernel */
 #endif /* KERNEL */
 
 /* Returns the elapsed time in milliseconds between clock values (*cv1) and (*cv2) */
 #define clock_ElapsedTime(cv1, cv2) \
     (((cv2)->sec - (cv1)->sec)*1000 + ((cv2)->usec - (cv1)->usec)/1000)
 
-#ifdef AFS_PTHREAD_ENV
-#define clock_Advance(cv)
-#else
-/* Advance the known value of the current clock time (clock_now) by the specified clock value */
-#define clock_Advance(cv) clock_Add(&clock_now, cv)
-#endif /* AFS_PTHREAD_ENV */
-
 /* Some comparison operators for clock values */
 #define        clock_Gt(a, b)  ((a)->sec>(b)->sec || ((a)->sec==(b)->sec && (a)->usec>(b)->usec))
 #define        clock_Ge(a, b)  ((a)->sec>(b)->sec || ((a)->sec==(b)->sec && (a)->usec>=(b)->usec))