From a73468166ef0a85d489dcdc291229a3d9ad9cfc1 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Thu, 9 Feb 2012 15:02:39 +0100 Subject: [PATCH 1/1] Add gettime.h time.h is a mix of gettime.c and time.c Signed-off-by: Jens Axboe --- fio.h | 1 + gettime.c | 2 +- gettime.h | 18 ++++++++++++++++++ time.h | 14 -------------- 4 files changed, 20 insertions(+), 15 deletions(-) create mode 100644 gettime.h diff --git a/fio.h b/fio.h index 9eb09b2c..c4629802 100644 --- a/fio.h +++ b/fio.h @@ -33,6 +33,7 @@ struct thread_data; #include "options.h" #include "profile.h" #include "time.h" +#include "gettime.h" #include "lib/getopt.h" #include "lib/rand.h" #include "server.h" diff --git a/gettime.c b/gettime.c index 2037354d..cf0d6640 100644 --- a/gettime.c +++ b/gettime.c @@ -273,7 +273,7 @@ void fio_gtod_init(void) assert(fio_tv); } -void fio_gtod_update(void) +static void fio_gtod_update(void) { gettimeofday(fio_tv, NULL); } diff --git a/gettime.h b/gettime.h new file mode 100644 index 00000000..87cc8954 --- /dev/null +++ b/gettime.h @@ -0,0 +1,18 @@ +#ifndef FIO_GETTIME_H +#define FIO_GETTIME_H + +/* + * Clock sources + */ +enum fio_cs { + CS_GTOD = 1, + CS_CGETTIME, + CS_CPUCLOCK, +}; + +extern void fio_gettime(struct timeval *, void *); +extern void fio_gtod_init(void); +extern void fio_clock_init(void); +extern int fio_start_gtod_thread(void); + +#endif diff --git a/time.h b/time.h index bc7fe370..3824102d 100644 --- a/time.h +++ b/time.h @@ -1,15 +1,6 @@ #ifndef FIO_TIME_H #define FIO_TIME_H -/* - * Clock sources - */ -enum fio_cs { - CS_GTOD = 1, - CS_CGETTIME, - CS_CPUCLOCK, -}; - extern unsigned long long utime_since(struct timeval *, struct timeval *); extern unsigned long long utime_since_now(struct timeval *); extern unsigned long mtime_since(struct timeval *, struct timeval *); @@ -19,15 +10,10 @@ extern unsigned long mtime_since_genesis(void); extern void usec_spin(unsigned int); extern void usec_sleep(struct thread_data *, unsigned long); extern void fill_start_time(struct timeval *); -extern void fio_gettime(struct timeval *, void *); -extern void fio_gtod_init(void); -extern void fio_clock_init(void); -extern void fio_gtod_update(void); extern void set_genesis_time(void); extern int ramp_time_over(struct thread_data *); extern int in_ramp_time(struct thread_data *); extern unsigned long long genesis_cycles; extern void fio_time_init(void); -extern int fio_start_gtod_thread(void); #endif -- 2.25.1