Recent changes (master)
The following changes since commit 9b46661c289d01dbfe5182189a7abea9ce2f9e04:
Fio 3.29 (2021-12-18 07:09:32 -0700)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to a3e33e2fc06582e4170f90ae6e62d6225d52dc7c:
Merge branch 'github-actions-i686' of https://github.com/vincentkfu/fio (2021-12-23 16:27:33 -0700)
----------------------------------------------------------------
Jens Axboe (1):
Merge branch 'github-actions-i686' of https://github.com/vincentkfu/fio
Vincent Fu (4):
ci: workaround for problem with i686 builds Revert "ci: temporarily remove linux-i686-gcc build" t/io_uring: fix 32-bit build warnings t/io_uring: fix help defaults for aio and random_io
.github/workflows/ci.yml | 4 ++++ ci/actions-install.sh | 5 ++++- t/io_uring.c | 9 +++++---- 3 files changed, 13 insertions(+), 5 deletions(-)
---
Diff of recent changes:
.github/workflows/ci.yml +4 -0
@@ -14,6 +14,7 @@ jobs: - linux-gcc - linux-clang - macos + - linux-i686-gcc include: - build: linux-gcc os: ubuntu-20.04
@@ -23,6 +24,9 @@ jobs: cc: clang - build: macos os: macos-11 + - build: linux-i686-gcc + os: ubuntu-20.04 + arch: i686 env: CI_TARGET_ARCH: ${{ matrix.arch }}
ci/actions-install.sh +4 -1
@@ -31,14 +31,17 @@ DPKGCFG case "${CI_TARGET_ARCH}" in "i686") sudo dpkg --add-architecture i386 + opts="--allow-downgrades" pkgs=("${pkgs[@]/%/:i386}") pkgs+=( gcc-multilib pkg-config:i386 zlib1g-dev:i386 + libpcre2-8-0=10.34-7 ) ;; "x86_64") + opts="" pkgs+=( libglusterfs-dev libgoogle-perftools-dev
@@ -62,7 +65,7 @@ DPKGCFG echo "Updating APT..." sudo apt-get -qq update echo "Installing packages..." - sudo apt-get install -o APT::Immediate-Configure=false --no-install-recommends -qq -y "${pkgs[@]}" + sudo apt-get install "$opts" -o APT::Immediate-Configure=false --no-install-recommends -qq -y "${pkgs[@]}" } install_linux() {
t/io_uring.c +5 -4
@@ -634,7 +634,8 @@ static int submitter_init(struct submitter *s)#ifdef CONFIG_LIBAIO static int prep_more_ios_aio (struct submitter *s,int max_ios,struct iocb *iocbs) { -unsigned long offset, data; +uint64_t data; +long long offset;struct file *f;unsigned index;long r;
@@ -663,7 +664,7 @@ static int prep_more_ios_aio(struct submitter *s, int max_ios, struct iocb *iocb data = f->fileno;if (stats && stats_running) - data |= ((unsigned long ) s->clock_index <<32 ); + data |= (((uint64_t ) s->clock_index) <<32 ); iocb->data = (void *) (uintptr_t ) data; index++; }
@@ -676,7 +677,7 @@ static int reap_events_aio(struct submitter *s, struct io_event *events, int evsint reaped =0 ;while (evs) { -unsigned long data = (uintptr_t ) events[reaped].data; +uint64_t data = (uintptr_t ) events[reaped].data;struct file *f = &s->files[data &0xffffffff ]; f->pending_ios--;
@@ -1094,7 +1095,7 @@ static void usage(char *argv, int status)" -a <bool> : Use legacy aio, default %d\n" , argv,DEPTH ,BATCH_SUBMIT ,BATCH_COMPLETE ,BS , polled, fixedbufs, dma_map, register_files, nthreads, !buffered, do_nop, - stats, runtime == 0 ? "unlimited" : runtime_str, aio, random_io); + stats, runtime == 0 ? "unlimited" : runtime_str, random_io, aio);exit (status); }