The following changes since commit 62e9ece4d540ff2af865e4b43811f3150b8b846b:
fio: use correct function declaration for set_epoch_time() (2022-02-03 16:06:59 -0700)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to b65c1fc07d4794920224312c56c785de2f3f1692:
t/io_uring: fix warnings for !ARCH_HAVE_CPU_CLOCK (2022-02-04 09:02:49 -0700)
----------------------------------------------------------------
Jens Axboe (1):
t/io_uring: fix warnings for !ARCH_HAVE_CPU_CLOCK
Niklas Cassel (1):
stat: make free_clat_prio_stats() safe against NULL
stat.c | 3 +++
t/io_uring.c | 11 ++++++++---
2 files changed, 11 insertions(+), 3 deletions(-)
---
Diff of recent changes:
diff --git a/stat.c b/stat.c
index 0876222a..1764eebc 100644
--- a/stat.c
+++ b/stat.c
@@ -2041,6 +2041,9 @@ void free_clat_prio_stats(struct thread_stat *ts)
{
enum fio_ddir ddir;
+ if (!ts)
+ return;
+
for (ddir = 0; ddir < DDIR_RWDIR_CNT; ddir++) {
sfree(ts->clat_prio[ddir]);
ts->clat_prio[ddir] = NULL;
diff --git a/t/io_uring.c b/t/io_uring.c
index e8365a79..faf5978c 100644
--- a/t/io_uring.c
+++ b/t/io_uring.c
@@ -287,6 +287,7 @@ out:
free(ovals);
}
+#ifdef ARCH_HAVE_CPU_CLOCK
static unsigned int plat_val_to_idx(unsigned long val)
{
unsigned int msb, error_bits, base, offset, idx;
@@ -322,6 +323,7 @@ static unsigned int plat_val_to_idx(unsigned long val)
return idx;
}
+#endif
static void add_stat(struct submitter *s, int clock_index, int nr)
{
@@ -789,9 +791,12 @@ static void *submitter_uring_fn(void *data)
{
struct submitter *s = data;
struct io_sq_ring *ring = &s->sq_ring;
- int ret, prepped, nr_batch;
-
- nr_batch = submitter_init(s);
+ int ret, prepped;
+#ifdef ARCH_HAVE_CPU_CLOCK
+ int nr_batch = submitter_init(s);
+#else
+ submitter_init(s);
+#endif
prepped = 0;
do {
