Recent changes (master)
The following changes since commit 1eb3adeed3eebab22dc5d7bed82ee23012fe360e:
Merge branch 'master' of https://github.com/pirDOL/fio (2025-10-29 10:57:59 -0400)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to 30c2e6ee56a9f0e6f0a0196ff91dbf4500318efc:
Merge branch 'clock_gettime' of https://github.com/betonmischer86/fio (2025-10-30 14:42:29 -0400)
----------------------------------------------------------------
Sitsofe Wheeler (1):
gettime: remove non-clock_gettime fallback code
Vincent Fu (1):
Merge branch 'clock_gettime' of https://github.com/betonmischer86/fio
configure | 28 ++-------------------------- fio.c | 4 ---- gettime.c | 12 ------------ libfio.c | 4 ---- options.c | 2 -- os/os-mac.h | 4 ---- os/os.h | 4 ---- 7 files changed, 2 insertions(+), 56 deletions(-)
---
Diff of recent changes:
configure +2 -26
@@ -1188,6 +1188,8 @@ if compile_prog "" "" "clock_gettime"; then elif compile_prog "" "-lrt" "clock_gettime"; then clock_gettime="yes" LIBS="-lrt $LIBS" +else + fatal "clock_gettime is not supported" fi print_config "clock_gettime" "$clock_gettime"
@@ -1213,26 +1215,6 @@ EOF fi print_config "CLOCK_MONOTONIC" "$clock_monotonic" -########################################## -# clockid_t probe -if test "$clockid_t" != "yes" ; then - clockid_t="no" -fi -cat > $TMPC << EOF -#include <time.h> -#include <string.h> -int main(int argc, char **argv) -{ - volatile clockid_t cid; - memset((void*)&cid, 0, sizeof(cid)); - return 0; -} -EOF -if compile_prog "" "$LIBS" "clockid_t"; then - clockid_t="yes" -fi -print_config "clockid_t" "$clockid_t" - ########################################## # gettimeofday() probe if test "$gettimeofday" != "yes" ; then
@@ -3125,15 +3107,9 @@ fi if test "$libverbs" = "yes" -a "$rdmacm" = "yes" ; then output_sym "CONFIG_RDMA" fi -if test "$clock_gettime" = "yes" ; then - output_sym "CONFIG_CLOCK_GETTIME" -fi if test "$clock_monotonic" = "yes" ; then output_sym "CONFIG_CLOCK_MONOTONIC" fi -if test "$clockid_t" = "yes"; then - output_sym "CONFIG_CLOCKID_T" -fi if test "$gettimeofday" = "yes" ; then output_sym "CONFIG_GETTIMEOFDAY" fi
fio.c +0 -4
@@ -30,10 +30,6 @@ int main(int argc, char *argv[], char *envp[])if (initialize_fio (envp))return 1 ; -#if !defined(CONFIG_GETTIMEOFDAY ) && !defined(CONFIG_CLOCK_GETTIME ) -#error "No available clock source!" -#endif -if (fio_server_create_sk_key ()) goto done;
gettime.c +0 -12
@@ -136,20 +136,10 @@ int fio_get_mono_time(struct timespec *ts) {int ret; -#ifdef CONFIG_CLOCK_GETTIME #if defined(CONFIG_CLOCK_MONOTONIC ) ret =clock_gettime (CLOCK_MONOTONIC , ts);#else ret =clock_gettime (CLOCK_REALTIME , ts); -#endif -#else -struct timeval tv; - - ret =gettimeofday (&tv,NULL ); -if (ret ==0 ) { - ts->tv_sec = tv.tv_sec; - ts->tv_nsec = tv.tv_usec *1000 ; - }#endif assert (ret <=0 );return ret;
@@ -168,7 +158,6 @@ static void __fio_gettime(struct timespec *tp) break; }#endif -#ifdef CONFIG_CLOCK_GETTIME case CS_CGETTIME : {if (fio_get_mono_time (tp) <0 ) {log_err ("fio: fio_get_mono_time() fails\n" );
@@ -176,7 +165,6 @@ static void __fio_gettime(struct timespec *tp) }break ; } -#endif #ifdef ARCH_HAVE_CPU_CLOCK case CS_CPUCLOCK : {uint64_t nsecs, t, multiples;
libfio.c +0 -4
@@ -406,10 +406,6 @@ int initialize_fio(char *envp[])return 1 ; } -#if !defined(CONFIG_GETTIMEOFDAY ) && !defined(CONFIG_CLOCK_GETTIME ) -#error "No available clock source!" -#endif -arch_init (envp);sinit ();
options.c +0 -2
@@ -3109,12 +3109,10 @@ struct fio_option fio_options[FIO_MAX_OPTS] = { .help = "Use gettimeofday(2) for timing", },#endif -#ifdef CONFIG_CLOCK_GETTIME { .ival = "clock_gettime", .oval = CS_CGETTIME, .help = "Use clock_gettime(2) for timing", }, -#endif #ifdef ARCH_HAVE_CPU_CLOCK { .ival = "cpu", .oval = CS_CPUCLOCK,
os/os-mac.h +0 -4
@@ -37,10 +37,6 @@ pthread_getaffinity_np(pthread_self(), sizeof(mask), &(mask))#endif -#ifndef CONFIG_CLOCKID_T -typedef unsigned int clockid_t ; -#endif -#define FIO_OS_DIRECTIO static inline int fio_set_odirect (struct fio_file *f) {
os/os.h +0 -4
@@ -174,11 +174,7 @@ extern int fio_cpus_split(os_cpu_mask_t *mask, unsigned int cpu);#endif #ifndef FIO_PREFERRED_CLOCK_SOURCE -#ifdef CONFIG_CLOCK_GETTIME #define FIO_PREFERRED_CLOCK_SOURCE CS_CGETTIME -#else -#define FIO_PREFERRED_CLOCK_SOURCE CS_GTOD -#endif #endif #ifndef CONFIG_SOCKLEN_T