Browse Source

fio: update to 3.19

Added compilation fixes.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
lilik-openwrt-22.03
Rosen Penev 5 years ago
parent
commit
ed61877501
No known key found for this signature in database GPG Key ID: 36D31CFA845F0E3B
3 changed files with 45 additions and 2 deletions
  1. +5
    -2
      utils/fio/Makefile
  2. +28
    -0
      utils/fio/patches/010-rand.patch
  3. +12
    -0
      utils/fio/patches/020-vasprintf.patch

+ 5
- 2
utils/fio/Makefile View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=fio
PKG_VERSION:=3.16
PKG_VERSION:=3.19
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://brick.kernel.dk/snaps
PKG_HASH:=77f5b6e11f8d7f08416af100359ec295620673ddacef370f840f2a4e1a33119e
PKG_HASH:=4b6db7eaee26d6fd33bf210eb73b6d37f5d45adcc88726866ad030565f3ccc06
PKG_MAINTAINER:=Rosen Penev <rosenp@gmail.com>
PKG_LICENSE:=GPL-2.0-or-later
@ -53,6 +53,9 @@ CONFIGURE_ARGS = \
--disable-lex \
--disable-pmem \
--disable-native \
--disable-shm \
--disable-optimizations \
--disable-tcmalloc \
--cc="$(TARGET_CC)" \
--extra-cflags="$(TARGET_CFLAGS)" \
--prefix="$(CONFIGURE_PREFIX)"


+ 28
- 0
utils/fio/patches/010-rand.patch View File

@ -0,0 +1,28 @@
--- a/t/io_uring.c
+++ b/t/io_uring.c
@@ -63,7 +63,6 @@ struct file {
struct submitter {
pthread_t thread;
int ring_fd;
- struct drand48_data rand;
struct io_sq_ring sq_ring;
struct io_uring_sqe *sqes;
struct io_cq_ring cq_ring;
@@ -170,7 +169,7 @@ static void init_io(struct submitter *s, unsigned index)
}
f->pending_ios++;
- lrand48_r(&s->rand, &r);
+ r = lrand48();
offset = (r % (f->max_blocks - 1)) * BS;
if (register_files) {
@@ -286,7 +285,7 @@ static void *submitter_fn(void *data)
printf("submitter=%d\n", gettid());
- srand48_r(pthread_self(), &s->rand);
+ srand48(pthread_self());
prepped = 0;
do {

+ 12
- 0
utils/fio/patches/020-vasprintf.patch View File

@ -0,0 +1,12 @@
--- a/configure
+++ b/configure
@@ -892,7 +892,8 @@ cat > $TMPC << EOF
int main(int argc, char **argv)
{
- return vasprintf(NULL, "%s", NULL) == 0;
+ va_list ap;
+ return vasprintf(NULL, "%s", ap) == 0;
}
EOF
if compile_prog "" "" "have_vasprintf"; then

Loading…
Cancel
Save