Skip to contentSkip to conversation

Recent changes (master)

PATCH Jens Axboe 1 participant 1 message Jun 24, 2025

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

The following changes since commit 813445e7129240d51216e396a5ba8e19296b6581:

backend: clean up requeued io_u's (2025-06-05 01:44:43 +0000)

are available in the Git repository at:

git://git.kernel.dk/fio.git master

for you to fetch changes up to 7037b833e175aae32900b73bf597aad08c1d8472:

windows: drop nanosleep and clock_gettime (2025-06-23 15:04:34 -0400)

----------------------------------------------------------------
Jens Axboe (1):
Merge branch 'fix_real_file_size_when_pi_is_enabled' of https://github.com/SuhoSon/fio

Leonid Kozlov (1):
parse: use minimum delimiter distance

Vincent Fu (2):
Merge branch 'fix-random-distribution-parsing-failure' of https://github.com/leonid-kozlov/fio
windows: drop nanosleep and clock_gettime

suho.son (1):
io_uring: ensure accurate real_file_size setup for full device access with PI enabled

 configure          |  2 --
 engines/io_uring.c |  5 +++-
 os/os-windows.h    |  1 -
 os/windows/posix.c | 72 ------------------------------------------------------
 os/windows/posix.h |  1 -
 parse.c            |  9 ++++---
 6 files changed, 10 insertions(+), 80 deletions(-)

---

Diff of recent changes:

configure +0 -2
index 986eb0a6..9e69dc4b 100755
@@ -462,8 +462,6 @@ CYGWIN*)
   build_static="yes"
   rusage_thread="yes"
   fdatasync="yes"
-  clock_gettime="yes" # clock_monotonic probe has dependency on this
-  clock_monotonic="yes"
   sched_idle="yes"
   pthread_condattr_setclock="no"
   pthread_affinity="no"
engines/io_uring.c +4 -1
index 51228037..c87e1cd4 100644
@@ -1610,7 +1610,10 @@ static int fio_ioring_cmd_get_file_size(struct thread_data *td,
 			return ret;
 		}
 
-		f->real_file_size = data->lba_size * nlba;
+		if (data->lba_ext)
+			f->real_file_size = data->lba_ext * nlba;
+		else
+			f->real_file_size = data->lba_size * nlba;
 		fio_file_set_size_known(f);
 
 		FILE_SET_ENG_DATA(f, data);
os/os-windows.h +0 -1
index 12f33486..909c12e3 100644
@@ -106,7 +106,6 @@ int fdatasync(int fildes);
 int lstat(const char * path, struct stat * buf);
 uid_t geteuid(void);
 char* ctime_r(const time_t *t, char *buf);
-int nanosleep(const struct timespec *rqtp, struct timespec *rmtp);
 ssize_t pread(int fildes, void *buf, size_t nbyte, off_t offset);
 ssize_t pwrite(int fildes, const void *buf, size_t nbyte,
 		off_t offset);
os/windows/posix.c +0 -72

84 lines not on this page · raw message

os/windows/posix.h +0 -1
index 02a9075b..afb00d5a 100644
@@ -3,7 +3,6 @@
 
 typedef int clockid_t;
 
-extern int clock_gettime(clockid_t clock_id, struct timespec *tp);
 extern int inet_aton(const char *, struct in_addr *);
 extern int win_to_posix_error(DWORD winerr);
 
parse.c +6 -3
index 656a5025..5bb55bff 100644
@@ -480,14 +480,17 @@ static size_t opt_len(const char *str)
 	char delimiter[] = {',', ':'};
 	char *postfix;
 	unsigned int i;
+	size_t candidate_len;
 
+	size_t prefix_len = strlen(str);
 	for (i = 0; i < FIO_ARRAY_SIZE(delimiter); i++) {
 		postfix = strchr(str, delimiter[i]);
-		if (postfix)
-			return (int)(postfix - str);
+		candidate_len = (size_t)(postfix - str);
+		if (postfix && candidate_len < prefix_len)
+			prefix_len = candidate_len;
 	}
 
-	return strlen(str);
+	return prefix_len;
 }
 
 static int str_match_len(const struct value_pair *vp, const char *str)