Skip to contentSkip to conversation

Recent changes (master)

PATCH Jens Axboe 1 participant 1 message Mar 16, 2023

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

The following changes since commit 4ad09b569a2689b3b67744eaccd378d013eb82a7:

t/io_uring: abstract out init_new_io() helper (2023-03-14 14:03:32 -0600)

are available in the Git repository at:

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

for you to fetch changes up to a967e54d34afe3bb10cd521d78bcaea2dd8c7cdc:

stat: Fix ioprio print (2023-03-15 19:18:47 -0400)

----------------------------------------------------------------
Damien Le Moal (1):
stat: Fix ioprio print

 os/os-dragonfly.h |  2 ++
 os/os-linux.h     |  3 ++
 os/os.h           |  2 ++
 stat.c            | 85 +++++++++++++++++++++++++++++--------------------------
 4 files changed, 52 insertions(+), 40 deletions(-)

---

Diff of recent changes:

os/os-dragonfly.h +2 -0
index 5b37a37e..bde39101 100644
@@ -175,6 +175,8 @@ static inline int fio_getaffinity(int pid, os_cpu_mask_t *mask)
 #define ioprio_set(which, who, ioprio_class, ioprio)	\
 	ioprio_set(which, who, ioprio)
 
+#define ioprio(ioprio)		(ioprio)
+
 static inline int blockdev_size(struct fio_file *f, unsigned long long *bytes)
 {
 	struct partinfo pi;
os/os-linux.h +3 -0
index 7a78b42d..2f9f7e79 100644
@@ -153,6 +153,9 @@ static inline int ioprio_set(int which, int who, int ioprio_class, int ioprio)
 		       ioprio_value(ioprio_class, ioprio));
 }
 
+#define ioprio_class(ioprio)	((ioprio) >> IOPRIO_CLASS_SHIFT)
+#define ioprio(ioprio)		((ioprio) & 7)
+
 #ifndef CONFIG_HAVE_GETTID
 static inline int gettid(void)
 {
os/os.h +2 -0
index ebaf8af5..036fc233 100644
@@ -116,12 +116,14 @@ extern int fio_cpus_split(os_cpu_mask_t *mask, unsigned int cpu);
 #endif
 
 #ifndef FIO_HAVE_IOPRIO_CLASS
+#define ioprio_class(prio)		0
 #define ioprio_value_is_class_rt(prio)	(false)
 #define IOPRIO_MIN_PRIO_CLASS		0
 #define IOPRIO_MAX_PRIO_CLASS		0
 #endif
 #ifndef FIO_HAVE_IOPRIO
 #define ioprio_value(prioclass, prio)	(0)
+#define ioprio(ioprio)			0
 #define ioprio_set(which, who, prioclass, prio)	(0)
 #define IOPRIO_MIN_PRIO			0
 #define IOPRIO_MAX_PRIO			0
stat.c +45 -40

104 lines not on this page · raw message