diff options
Diffstat (limited to 'drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h')
| -rw-r--r-- | drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h | 149 |
1 files changed, 11 insertions, 138 deletions
diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h b/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h index a386d1b1286b..1158a3112bcc 100644 --- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h +++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h @@ -45,56 +45,15 @@ #error Do not #include this file directly. #include <linux/libcfs/libcfs.h> instead #endif - -/* Portable time API */ - -/* - * Platform provides three opaque data-types: - * - * cfs_time_t represents point in time. This is internal kernel - * time rather than "wall clock". This time bears no - * relation to gettimeofday(). - * - * cfs_duration_t represents time interval with resolution of internal - * platform clock - * - * cfs_fs_time_t represents instance in world-visible time. This is - * used in file-system time-stamps - * - * cfs_time_t cfs_time_current(void); - * cfs_time_t cfs_time_add (cfs_time_t, cfs_duration_t); - * cfs_duration_t cfs_time_sub (cfs_time_t, cfs_time_t); - * int cfs_impl_time_before (cfs_time_t, cfs_time_t); - * int cfs_impl_time_before_eq(cfs_time_t, cfs_time_t); - * - * cfs_duration_t cfs_duration_build(int64_t); - * - * time_t cfs_duration_sec (cfs_duration_t); - * void cfs_duration_usec(cfs_duration_t, struct timeval *); - * void cfs_duration_nsec(cfs_duration_t, struct timespec *); - * - * void cfs_fs_time_current(cfs_fs_time_t *); - * time_t cfs_fs_time_sec (cfs_fs_time_t *); - * void cfs_fs_time_usec (cfs_fs_time_t *, struct timeval *); - * void cfs_fs_time_nsec (cfs_fs_time_t *, struct timespec *); - * int cfs_fs_time_before (cfs_fs_time_t *, cfs_fs_time_t *); - * int cfs_fs_time_beforeq(cfs_fs_time_t *, cfs_fs_time_t *); - * - * CFS_TIME_FORMAT - * CFS_DURATION_FORMAT - * - */ - #define ONE_BILLION ((u_int64_t)1000000000) #define ONE_MILLION 1000000 - #include <linux/module.h> #include <linux/kernel.h> #include <linux/time.h> #include <asm/div64.h> -#include <linux/libcfs/linux/portals_compat25.h> +#include "portals_compat25.h" /* * post 2.5 kernels. @@ -102,133 +61,58 @@ #include <linux/jiffies.h> -typedef struct timespec cfs_fs_time_t; -static inline void cfs_fs_time_usec(cfs_fs_time_t *t, struct timeval *v) +static inline void cfs_fs_time_usec(struct timespec *t, struct timeval *v) { v->tv_sec = t->tv_sec; v->tv_usec = t->tv_nsec / 1000; } -static inline void cfs_fs_time_nsec(cfs_fs_time_t *t, struct timespec *s) -{ - *s = *t; -} - -/* - * internal helper function used by cfs_fs_time_before*() - */ -static inline unsigned long long __cfs_fs_time_flat(cfs_fs_time_t *t) -{ - return (unsigned long long)t->tv_sec * ONE_BILLION + t->tv_nsec; -} - - /* * Generic kernel stuff */ -typedef unsigned long cfs_time_t; /* jiffies */ -typedef long cfs_duration_t; -typedef cycles_t cfs_cycles_t; - -static inline int cfs_time_before(cfs_time_t t1, cfs_time_t t2) -{ - return time_before(t1, t2); -} - -static inline int cfs_time_beforeq(cfs_time_t t1, cfs_time_t t2) -{ - return time_before_eq(t1, t2); -} - -static inline cfs_time_t cfs_time_current(void) +static inline unsigned long cfs_time_current(void) { return jiffies; } -static inline time_t cfs_time_current_sec(void) -{ - return get_seconds(); -} - -static inline void cfs_fs_time_current(cfs_fs_time_t *t) +static inline void cfs_fs_time_current(struct timespec *t) { *t = CURRENT_TIME; } -static inline time_t cfs_fs_time_sec(cfs_fs_time_t *t) +static inline time_t cfs_fs_time_sec(struct timespec *t) { return t->tv_sec; } -static inline int cfs_fs_time_before(cfs_fs_time_t *t1, cfs_fs_time_t *t2) -{ - return __cfs_fs_time_flat(t1) < __cfs_fs_time_flat(t2); -} - -static inline int cfs_fs_time_beforeq(cfs_fs_time_t *t1, cfs_fs_time_t *t2) -{ - return __cfs_fs_time_flat(t1) <= __cfs_fs_time_flat(t2); -} - -#if 0 -static inline cfs_duration_t cfs_duration_build(int64_t nano) -{ -#if (BITS_PER_LONG == 32) - /* We cannot use do_div(t, ONE_BILLION), do_div can only process - * 64 bits n and 32 bits base */ - int64_t t = nano * HZ; - do_div(t, 1000); - do_div(t, 1000000); - return (cfs_duration_t)t; -#else - return (nano * HZ / ONE_BILLION); -#endif -} -#endif - -static inline cfs_duration_t cfs_time_seconds(int seconds) +static inline long cfs_time_seconds(int seconds) { - return ((cfs_duration_t)seconds) * HZ; + return ((long)seconds) * HZ; } -static inline time_t cfs_duration_sec(cfs_duration_t d) +static inline time_t cfs_duration_sec(long d) { return d / HZ; } -static inline void cfs_duration_usec(cfs_duration_t d, struct timeval *s) +static inline void cfs_duration_usec(long d, struct timeval *s) { #if (BITS_PER_LONG == 32) && (HZ > 4096) __u64 t; s->tv_sec = d / HZ; - t = (d - (cfs_duration_t)s->tv_sec * HZ) * ONE_MILLION; + t = (d - (long)s->tv_sec * HZ) * ONE_MILLION; do_div(t, HZ); s->tv_usec = t; #else s->tv_sec = d / HZ; - s->tv_usec = ((d - (cfs_duration_t)s->tv_sec * HZ) * \ + s->tv_usec = ((d - (long)s->tv_sec * HZ) * \ ONE_MILLION) / HZ; #endif } -static inline void cfs_duration_nsec(cfs_duration_t d, struct timespec *s) -{ -#if (BITS_PER_LONG == 32) - __u64 t; - - s->tv_sec = d / HZ; - t = (d - s->tv_sec * HZ) * ONE_BILLION; - do_div(t, HZ); - s->tv_nsec = t; -#else - s->tv_sec = d / HZ; - s->tv_nsec = ((d - s->tv_sec * HZ) * ONE_BILLION) / HZ; -#endif -} - #define cfs_time_current_64 get_jiffies_64 static inline __u64 cfs_time_add_64(__u64 t, __u64 d) @@ -252,7 +136,6 @@ static inline int cfs_time_beforeq_64(__u64 t1, __u64 t2) return (__s64)t2 - (__s64)t1 >= 0; } - /* * One jiffy */ @@ -261,14 +144,4 @@ static inline int cfs_time_beforeq_64(__u64 t1, __u64 t2) #define CFS_TIME_T "%lu" #define CFS_DURATION_T "%ld" - #endif /* __LIBCFS_LINUX_LINUX_TIME_H__ */ -/* - * Local variables: - * c-indentation-style: "K&R" - * c-basic-offset: 8 - * tab-width: 8 - * fill-column: 80 - * scroll-step: 1 - * End: - */ |