The following changes since commit 45eb1cf5ce883ae3b170f102db38204616c8e4b1: Merge branch 'helper_thread-fix-missing-stdbool-header' of https://github.com/dpronin/fio (2023-07-27 13:48:26 -0600) are available in the Git repository at: git://git.kernel.dk/fio.git master for you to fetch changes up to 824912be19542f94264e485a25d37b55a9f68f0e: Revert "correctly free thread_data options at the topmost parent process" (2023-07-28 11:32:22 -0600) ---------------------------------------------------------------- Denis Pronin (3): fix missing headers in multiple files correctly free thread_data options at the topmost parent process io_uring engine: 'atomic_load_relaxed' instead of 'atomic_load_acquire' Jens Axboe (4): Merge branch 'io_uring' of https://github.com/dpronin/fio Merge branch 'master' of https://github.com/dpronin/fio Merge branch 'td-eo-double-free-fix' of https://github.com/dpronin/fio Revert "correctly free thread_data options at the topmost parent process" cairo_text_helpers.c | 2 ++ cairo_text_helpers.h | 2 ++ engines/io_uring.c | 4 ++-- goptions.h | 2 ++ log.c | 2 ++ 5 files changed, 10 insertions(+), 2 deletions(-) --- Diff of recent changes: diff --git a/cairo_text_helpers.c b/cairo_text_helpers.c index 19fb8e03..5bdd6021 100644 --- a/cairo_text_helpers.c +++ b/cairo_text_helpers.c @@ -1,3 +1,5 @@ +#include "cairo_text_helpers.h" + #include <cairo.h> #include <gtk/gtk.h> #include <math.h> diff --git a/cairo_text_helpers.h b/cairo_text_helpers.h index 014001ad..d0f52d51 100644 --- a/cairo_text_helpers.h +++ b/cairo_text_helpers.h @@ -1,6 +1,8 @@ #ifndef CAIRO_TEXT_HELPERS_H #define CAIRO_TEXT_HELPERS_H +#include <cairo.h> + void draw_centered_text(cairo_t *cr, const char *font, double x, double y, double fontsize, const char *text); diff --git a/engines/io_uring.c b/engines/io_uring.c index e1abf688..b361e6a5 100644 --- a/engines/io_uring.c +++ b/engines/io_uring.c @@ -509,7 +509,7 @@ static enum fio_q_status fio_ioring_queue(struct thread_data *td, tail = *ring->tail; next_tail = tail + 1; - if (next_tail == atomic_load_acquire(ring->head)) + if (next_tail == atomic_load_relaxed(ring->head)) return FIO_Q_BUSY; if (ld->cmdprio.mode != CMDPRIO_MODE_NONE) @@ -569,7 +569,7 @@ static int fio_ioring_commit(struct thread_data *td) unsigned start = *ld->sq_ring.tail - ld->queued; unsigned flags; - flags = atomic_load_acquire(ring->flags); + flags = atomic_load_relaxed(ring->flags); if (flags & IORING_SQ_NEED_WAKEUP) io_uring_enter(ld, ld->queued, 0, IORING_ENTER_SQ_WAKEUP); diff --git a/goptions.h b/goptions.h index a225a8d1..03617509 100644 --- a/goptions.h +++ b/goptions.h @@ -1,6 +1,8 @@ #ifndef GFIO_OPTIONS_H #define GFIO_OPTIONS_H +#include <gtk/gtk.h> + void gopt_get_options_window(GtkWidget *window, struct gfio_client *gc); void gopt_init(void); void gopt_exit(void); diff --git a/log.c b/log.c index 237bac28..df58ea07 100644 --- a/log.c +++ b/log.c @@ -1,3 +1,5 @@ +#include "log.h" + #include <unistd.h> #include <string.h> #include <stdarg.h>
