diff options
| author |   Wang Mingyu <wangmy@fujitsu.com> | 2022-09-05 17:02:09 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2022-09-05 22:49:34 -0700 |
| commit | 05110a0ab499af7afa1956b8f11cc1ff7ff22706 (patch) | |
| tree | aa7541b56db4e6ef5ad139dd4bbae12a659bbf48 /meta-oe/recipes-benchmark | |
| parent | 7ff4625e3d594a7002fc68f8de1b50652fd320c7 (diff) | |
| download | meta-openembedded-contrib-05110a0ab499af7afa1956b8f11cc1ff7ff22706.tar.gz | |
fio: upgrade 3.31 -> 3.32
0001-io_uring-Replace-pthread_self-with-s-tid.patch
removed since it's included in 3.32
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-benchmark')
| -rw-r--r-- | meta-oe/recipes-benchmark/fio/fio/0001-io_uring-Replace-pthread_self-with-s-tid.patch | 45 | ||||
| -rw-r--r-- | meta-oe/recipes-benchmark/fio/fio_3.32.bb (renamed from meta-oe/recipes-benchmark/fio/fio_3.31.bb) | 6 |
2 files changed, 2 insertions, 49 deletions
diff --git a/meta-oe/recipes-benchmark/fio/fio/0001-io_uring-Replace-pthread_self-with-s-tid.patch b/meta-oe/recipes-benchmark/fio/fio/0001-io_uring-Replace-pthread_self-with-s-tid.patch deleted file mode 100644 index 766b1fe274..0000000000 --- a/meta-oe/recipes-benchmark/fio/fio/0001-io_uring-Replace-pthread_self-with-s-tid.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 269164337e0168b93661bb95c6a4e462ae6d8b61 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 24 Aug 2022 18:08:53 -0700 -Subject: [PATCH] io_uring: Replace pthread_self with s->tid - -__init_rand64 takes 64bit value and srand48 takes unsigned 32bit value, -pthread_t is opaque type and some libcs ( e.g. musl ) do not define them -in plain old data types and ends up with errors - -| t/io_uring.c:809:32: error: incompatible pointer to integer conversion passing 'pthread_t' (aka 'struct __pthread *') to parameter of type 'uint64_t' (aka 'unsigned long') [-Wint-conver -sion] -| __init_rand64(&s->rand_state, pthread_self()); -| ^~~~~~~~~~~~~~ - -Upstream-Status: Submitted [https://github.com/axboe/fio/pull/1455] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - t/io_uring.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/t/io_uring.c b/t/io_uring.c -index 35bf1956..f34a3554 100644 ---- a/t/io_uring.c -+++ b/t/io_uring.c -@@ -799,15 +799,14 @@ static int submitter_init(struct submitter *s) - int i, nr_batch, err; - static int init_printed; - char buf[80]; -- - s->tid = gettid(); - printf("submitter=%d, tid=%d, file=%s, node=%d\n", s->index, s->tid, - s->filename, s->numa_node); - - set_affinity(s); - -- __init_rand64(&s->rand_state, pthread_self()); -- srand48(pthread_self()); -+ __init_rand64(&s->rand_state, s->tid); -+ srand48(s->tid); - - for (i = 0; i < MAX_FDS; i++) - s->files[i].fileno = i; --- -2.37.2 - diff --git a/meta-oe/recipes-benchmark/fio/fio_3.31.bb b/meta-oe/recipes-benchmark/fio/fio_3.32.bb index f8d63014ae..90e28340c6 100644 --- a/meta-oe/recipes-benchmark/fio/fio_3.31.bb +++ b/meta-oe/recipes-benchmark/fio/fio_3.32.bb @@ -22,10 +22,8 @@ PACKAGECONFIG_NUMA:armeb = "" PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" PACKAGECONFIG[numa] = ",--disable-numa,numactl" -SRCREV = "6cafe8445fd1e04e5f7d67bbc73029a538d1b253" -SRC_URI = "git://git.kernel.dk/fio.git;branch=master \ - file://0001-io_uring-Replace-pthread_self-with-s-tid.patch \ - " +SRCREV = "db7fc8d864dc4fb607a0379333a0db60431bd649" +SRC_URI = "git://git.kernel.dk/fio.git;branch=master" S = "${WORKDIR}/git" |