/*
* Copyright 2000, International Business Machines Corporation and others.
* All Rights Reserved.
- *
+ *
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
#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
/* 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
-#if defined(AFS_USE_GETTIMEOFDAY) || defined(AFS_PTHREAD_ENV)
+#if defined(KERNEL)
+#include "afs/afs_osi.h"
+#endif
+#if !defined(KERNEL) || defined(UKERNEL)
+#if defined(AFS_USE_GETTIMEOFDAY) || defined(AFS_PTHREAD_ENV) || defined(UKERNEL)
#define clock_Init()
#define clock_NewTime()
#define clock_UpdateTime()
-#define clock_GetTime(cv) (gettimeofday((struct timeval *)cv, NULL))
#define clock_Sec() (time(NULL))
#define clock_haveCurrentTime 1
+
+#define clock_GetTime(cv) \
+ BEGIN \
+ struct timeval tv; \
+ gettimeofday(&tv, NULL); \
+ (cv)->sec = (afs_int32)tv.tv_sec; \
+ (cv)->usec = (afs_int32)tv.tv_usec; \
+ END
+
#else /* AFS_USE_GETTIMEOFDAY || AFS_PTHREAD_ENV */
/* For internal use. The last value returned from clock_GetTime() */
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 \
- if (!clock_haveCurrentTime) clock_UpdateTime(); \
- (cv)->sec = clock_now.sec; \
- (cv)->usec = clock_now.usec; \
+#define clock_GetTime(cv) \
+ BEGIN \
+ if (!clock_haveCurrentTime) clock_UpdateTime(); \
+ (cv)->sec = clock_now.sec; \
+ (cv)->usec = clock_now.usec; \
END
/* Current clock time, truncated to seconds */
#define clock_Sec() ((!clock_haveCurrentTime)? clock_UpdateTime(), clock_now.sec:clock_now.sec)
+
+extern void clock_Init(void);
+extern int clock_UnInit(void);
+extern void clock_UpdateTime(void);
+
#endif /* AFS_USE_GETTIMEOFDAY || AFS_PTHREAD_ENV */
#else /* KERNEL */
-#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)
-#endif
+static_inline void
+clock_GetTime(struct clock *cv)
+{
+ osi_timeval32_t now;
+ osi_GetTime(&now);
+ cv->sec = now.tv_sec;
+ cv->usec = now.tv_usec;
+}
#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))
/* Add time c2 to time c1. Both c2 and c1 must be positive times. */
#define clock_Add(c1, c2) \
BEGIN \
+ (c1)->sec += (c2)->sec; \
if (((c1)->usec += (c2)->usec) >= 1000000) { \
(c1)->usec -= 1000000; \
(c1)->sec++; \
} \
- (c1)->sec += (c2)->sec; \
END
-#define MSEC(cp) ((cp->sec * 1000) + (cp->usec / 1000))
+#define USEC(cp) (((cp)->sec * 1000000) + (cp)->usec)
+#define MSEC(cp) (((cp)->sec * 1000) + ((cp)->usec / 1000))
+#define _4THMSEC(cp) (((cp)->sec * 4000) + ((cp)->usec / 250))
+#define _8THMSEC(cp) (((cp)->sec * 8000) + ((cp)->usec / 125))
/* Add ms milliseconds to time c1. Both ms and c1 must be positive */
#define clock_Addmsec(c1, ms) \
git://git.openafs.org / openafs.git / blobdiff