uringmachine 0.10 → 0.11.1

data/test/test_um.rb

@@ -1224,6 +1224,34 @@ class WaitTest < UMBaseTest
     ret = machine.read(rfd, buf, 8192)
     assert_equal msg.bytesize, ret
     assert_equal msg, buf
+  ensure
+    Process.wait(pid) rescue Errno::ECHILD
+  end
+
+  def test_waitpid_any
+    skip if UM.kernel_version < 607
+
+    msg = 'hello from child'
+
+    rfd, wfd = UM.pipe
+    pid = fork do
+      m = UM.new
+      m.write(wfd, msg)
+      m.close(wfd)
+      exit 42
+    end
+
+    ret = machine.waitpid(0, UM::WEXITED)
+    assert_kind_of Array, ret
+    assert_equal [pid, 42], ret
+
+    buf = +''
+    ret = machine.read(rfd, buf, 8192)
+    assert_equal msg.bytesize, ret
+    assert_equal msg, buf
+    
+  ensure
+    Process.wait(pid) rescue Errno::ECHILD
   end
 
   def test_waitpid_bad_pid
@@ -1275,3 +1303,38 @@ class StatxTest < UMBaseTest
     assert_raises(Errno::ENOENT) { machine.statx(UM::AT_FDCWD, 'foobar', 0, UM::STATX_ALL) }
   end
 end
+
+class ForkTest < UMBaseTest
+  def test_fork
+    parent_rfd, child_wfd = UM.pipe
+    child_rfd, parent_wfd = UM.pipe
+
+    child_pid = fork do
+      # we cannot use the same machine after fork
+      m = UM.new
+      buf = +''
+      m.read(child_rfd, buf, 8192)
+      m.write(child_wfd, buf, buf.bytesize)
+      m.close(child_wfd)
+    rescue Exception => e
+      puts 'c' * 40
+      p e
+      puts e.backtrace.join("\n")
+    end
+
+    ret = machine.write(parent_wfd, 'foo')
+    assert_equal 3, ret
+
+    ret = machine.close(parent_wfd)
+    assert_equal parent_wfd, ret
+
+    buf = +''
+    ret = machine.read(parent_rfd, buf, 8192)
+
+    assert_equal 3, ret
+    assert_equal 'foo', buf
+  ensure
+    Process.wait(child_pid) rescue Errno::ECHILD
+  end
+
+end

data/uringmachine.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency  'rake-compiler',        '1.2.9'
   s.add_development_dependency  'minitest',             '5.25.4'
   s.add_development_dependency  'benchmark-ips',        '2.14.0'
+  s.add_development_dependency  'http_parser.rb',       '0.8.0'
 end

data/vendor/liburing/.github/workflows/{build.yml → ci.yml}

@@ -1,18 +1,44 @@
-name: Build test
+name: CI
 
 on:
   # Trigger the workflow on push or pull requests.
   push:
   pull_request:
 
+
 jobs:
-  build:
+  get_commit_list:
     runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Get commit list
+        id: get_commit_list
+        run: |
+          git config core.abbrev 12;
+          ( \
+            ( \
+              git log --pretty="%h" --reverse ${{github.event.commits[0].id}}^...${{github.sha}} || \
+              (printf "%s" ${{github.sha}} | head -c 12) \
+            ) | awk '{ print "id" NR "=" $1 }' \
+          ) > $GITHUB_OUTPUT;
+          echo "List of tested commits:" > $GITHUB_STEP_SUMMARY;
+          cat $GITHUB_OUTPUT >> $GITHUB_STEP_SUMMARY;
+
+    outputs:
+      commit_list: ${{ toJson(steps.*.outputs.*) }}
 
+
+  build:
+    needs: get_commit_list
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
-        include:
+        commit: ${{ fromJson(needs.get_commit_list.outputs.commit_list) }}
+        build_args:
           # x86-64 gcc
           - arch: x86_64
             cc_pkg: gcc-x86-64-linux-gnu
@@ -120,46 +146,85 @@ jobs:
             sanitize: 0
 
     env:
-      FLAGS: -g -O3 -Wall -Wextra -Werror -Wno-sign-compare ${{matrix.extra_flags}}
-      SANITIZE: ${{matrix.sanitize}}
+      FLAGS: -g -O3 -Wall -Wextra -Werror -Wno-sign-compare ${{matrix.build_args.extra_flags}}
+      SANITIZE: ${{matrix.build_args.sanitize}}
 
       # Flags for building sources in src/ dir only.
-      LIBURING_CFLAGS: ${{matrix.liburing_extra_flags}}
+      LIBURING_CFLAGS: ${{matrix.build_args.liburing_extra_flags}}
 
     steps:
-    - name: Checkout source
-      uses: actions/checkout@v4
-
-    - name: Install Compilers
-      run: |
-        if [[ "${{matrix.cc_pkg}}" == "clang" ]]; then \
-            wget https://apt.llvm.org/llvm.sh -O /tmp/llvm.sh; \
-            sudo apt-get purge --auto-remove llvm python3-lldb-14 llvm-14 -y; \
-            sudo bash /tmp/llvm.sh 17; \
-            sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-17 400; \
-            sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-17 400; \
-        else \
-            sudo apt-get update -y; \
-            sudo apt-get install -y ${{matrix.cc_pkg}} ${{matrix.cxx_pkg}}; \
-        fi;
-
-    - name: Display compiler versions
-      run: |
-        ${{matrix.cc}} --version;
-        ${{matrix.cxx}} --version;
-
-    - name: Build
-      if: ${{matrix.sanitizer == '0'}}
-      run: |
-        ./configure --cc=${{matrix.cc}} --cxx=${{matrix.cxx}};
-        make -j$(nproc) V=1 CPPFLAGS="-Werror" CFLAGS="$FLAGS" CXXFLAGS="$FLAGS";
-
-    - name: Build
-      if: ${{matrix.sanitizer == '1'}}
-      run: |
-        ./configure --cc=${{matrix.cc}} --cxx=${{matrix.cxx}} --enable-sanitizer;
-        make -j$(nproc) V=1 CPPFLAGS="-Werror" CFLAGS="$FLAGS" CXXFLAGS="$FLAGS";
-
-    - name: Test install command
-      run: |
-        sudo make install;
+      - name: Checkout source
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Checkout commit
+        run: |
+          git checkout ${{ matrix.commit }};
+
+      - name: Install Compilers
+        run: |
+          sudo apt-get update -y;
+          sudo apt-get install -y ${{matrix.build_args.cc_pkg}} ${{matrix.build_args.cxx_pkg}};
+
+      - name: Display compiler versions
+        run: |
+          ${{matrix.build_args.cc}} --version;
+          ${{matrix.build_args.cxx}} --version;
+
+      - name: Build
+        if: ${{matrix.build_args.sanitize == '0'}}
+        run: |
+          ./configure --cc=${{matrix.build_args.cc}} --cxx=${{matrix.build_args.cxx}};
+          make -j$(nproc) V=1 CPPFLAGS="-Werror" CFLAGS="$FLAGS" CXXFLAGS="$FLAGS";
+
+      - name: Build
+        if: ${{matrix.build_args.sanitize == '1'}}
+        run: |
+          ./configure --cc=${{matrix.build_args.cc}} --cxx=${{matrix.build_args.cxx}} --enable-sanitizer;
+          make -j$(nproc) V=1 CPPFLAGS="-Werror" CFLAGS="$FLAGS" CXXFLAGS="$FLAGS";
+
+      - name: Test install command
+        run: |
+          sudo make install;
+
+
+  codespell:
+    needs: get_commit_list
+    runs-on: ubuntu-24.04
+    strategy:
+      matrix:
+        commit: ${{ fromJson(needs.get_commit_list.outputs.commit_list) }}
+
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v4
+
+      - name: Install codespell
+        run: |
+          sudo apt-get update -y
+          sudo apt-get install -y codespell
+
+      - name: Display codespell version
+        run: codespell --version
+
+      - name: Execute codespell
+        run: codespell --ignore-words=.github/actions/codespell/stopwords .
+
+
+  shellcheck:
+    needs: get_commit_list
+    runs-on: ubuntu-24.04
+    strategy:
+      matrix:
+        commit: ${{ fromJson(needs.get_commit_list.outputs.commit_list) }}
+
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v4
+
+      - name: Display shellcheck version
+        run: shellcheck --version
+
+      - name: Shellcheck execution
+        run: shellcheck test/runtest*.sh

data/vendor/liburing/.gitignore

@@ -28,6 +28,7 @@
 /examples/rsrc-update-bench
 /examples/kdigest
 /examples/reg-wait
+/examples/zcrx
 
 /test/*.t
 /test/*.dmesg

data/vendor/liburing/CHANGELOG

@@ -1,4 +1,14 @@
+liburing-2.9 release
+
+- Add support for ring resizing
+- Add support for registered waits
+- Test additions and improvements
+- Fix bug with certain ring setups with SQE128 set not fully closing
+  the ring after io_uring_queue_exit(3) had been called.
+- Various man page fixes and updates
+
 liburing-2.8 release
+
 - Add support for incrementally/partially consumed provided buffers,
   usable with the provided buffer ring support.
 - Add support for foo_and_wait_min_timeout(), where it's possible to

data/vendor/liburing/README

@@ -63,6 +63,11 @@ Building liburing
     #
     make -j$(nproc);
 
+    #
+    # Build liburing.pc
+    #
+    make liburing.pc
+
     #
     # Install liburing (headers, shared/static libs, and manpage).
     #

data/vendor/liburing/configure

@@ -114,7 +114,7 @@ fatal() {
 
 # Print result for each configuration test
 print_config() {
-  printf "%-30s%s\n" "$1" "$2"
+  printf "%-35s%s\n" "$1" "$2"
 }
 
 # Default CFLAGS

data/vendor/liburing/examples/Makefile

@@ -32,6 +32,7 @@ example_srcs := \
 	send-zerocopy.c \
 	rsrc-update-bench.c \
 	proxy.c \
+	zcrx.c \
 	kdigest.c
 
 all_targets :=

data/vendor/liburing/examples/helpers.c

@@ -9,6 +9,7 @@
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <unistd.h>
+#include <stdarg.h>
 
 #include "helpers.h"
 
@@ -60,3 +61,27 @@ int setup_listening_socket(int port, int ipv6)
 
 	return fd;
 }
+
+void *aligned_alloc(size_t alignment, size_t size)
+{
+	void *ret;
+
+	if (posix_memalign(&ret, alignment, size))
+		return NULL;
+
+	return ret;
+}
+
+void t_error(int status, int errnum, const char *format, ...)
+{
+	va_list args;
+	va_start(args, format);
+
+	vfprintf(stderr, format, args);
+	if (errnum)
+		fprintf(stderr, ": %s", strerror(errnum));
+
+	fprintf(stderr, "\n");
+	va_end(args);
+	exit(status);
+}

data/vendor/liburing/examples/helpers.h

@@ -2,6 +2,19 @@
 #ifndef LIBURING_EX_HELPERS_H
 #define LIBURING_EX_HELPERS_H
 
+#include <stddef.h>
+
+#define T_ALIGN_UP(v, align) (((v) + (align) - 1) & ~((align) - 1))
+
 int setup_listening_socket(int port, int ipv6);
 
+/*
+ * Some Android versions lack aligned_alloc in stdlib.h.
+ * To avoid making large changes in tests, define a helper
+ * function that wraps posix_memalign as our own aligned_alloc.
+ */
+void *aligned_alloc(size_t alignment, size_t size);
+
+void t_error(int status, int errnum, const char *format, ...);
+
 #endif

data/vendor/liburing/examples/io_uring-test.c

@@ -108,5 +108,8 @@ int main(int argc, char *argv[])
 						(unsigned long) fsize);
 	close(fd);
 	io_uring_queue_exit(&ring);
+	for (i = 0; i < QD; i++)
+		free(iovecs[i].iov_base);
+	free(iovecs);
 	return 0;
 }

data/vendor/liburing/examples/proxy.c

@@ -1354,7 +1354,7 @@ start_close:
 		if (recv_done_res(cqe->res))
 			goto start_close;
 		if (is_sink || !ocd->pending_send)
-			__submit_receive(ring, c, &c->cd[0], c->in_fd);
+			__submit_receive(ring, c, cd, cqe_to_fd(cqe));
 	}
 
 	/*

data/vendor/liburing/examples/reg-wait.c

@@ -13,6 +13,8 @@
 #include <sys/time.h>
 #include <liburing.h>
 
+#include "helpers.h"
+
 static unsigned long long mtime_since(const struct timeval *s,
 				      const struct timeval *e)
 {
@@ -38,6 +40,20 @@ static unsigned long long mtime_since_now(struct timeval *tv)
 	return mtime_since(tv, &end);
 }
 
+static int register_memory(struct io_uring *ring, void *ptr, size_t size)
+{
+	struct io_uring_region_desc rd = {};
+	struct io_uring_mem_region_reg mr = {};
+
+	rd.user_addr = (__u64)(unsigned long)ptr;
+	rd.size = size;
+	rd.flags = IORING_MEM_REGION_TYPE_USER;
+	mr.region_uptr = (__u64)(unsigned long)&rd;
+	mr.flags = IORING_MEM_REGION_REG_WAIT_ARG;
+
+	return io_uring_register_region(ring, &mr);
+}
+
 int main(int argc, char *argv[])
 {
 	struct io_uring_reg_wait *reg;
@@ -48,30 +64,43 @@ int main(int argc, char *argv[])
 	unsigned long msec;
 	struct timeval tv;
 	int ret, fds[2];
+	int page_size;
 
 	if (argc > 1) {
 		fprintf(stdout, "%s: takes no arguments\n", argv[0]);
 		return 0;
 	}
 
+	page_size = sysconf(_SC_PAGESIZE);
+	if (page_size < 0) {
+		fprintf(stderr, "sysconf(_SC_PAGESIZE) failed\n");
+		return 1;
+	}
+
 	if (pipe(fds) < 0) {
 		perror("pipe");
 		return 1;
 	}
 
-	ret = io_uring_queue_init(8, &ring, 0);
+	ret = io_uring_queue_init(8, &ring, IORING_SETUP_R_DISABLED);
 	if (ret) {
 		fprintf(stderr, "Queue init: %d\n", ret);
 		return 1;
 	}
 
 	/*
-	 * Setup wait region. We'll use 32 here, but 64 is probably a more
-	 * logical value, as it'll pin a page regardless of size. 64 is the
-	 * max value on a 4k page size architecture.
+	 * Setup a region we'll use to pass wait arguments. It should be
+	 * page aligned, we're using only first two wait entries here and
+	 * the rest of the memory can be reused for other purposes.
 	 */
-	reg = io_uring_setup_reg_wait(&ring, 32, &ret);
+	reg = aligned_alloc(page_size, page_size);
 	if (!reg) {
+		fprintf(stderr, "allocation failed\n");
+		return 1;
+	}
+
+	ret = register_memory(&ring, reg, page_size);
+	if (ret) {
 		if (ret == -EINVAL) {
 			fprintf(stderr, "Kernel doesn't support registered waits\n");
 			return 1;
@@ -80,6 +109,12 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 
+	ret = io_uring_enable_rings(&ring);
+	if (ret) {
+		fprintf(stderr, "io_uring_enable_rings failure %i\n", ret);
+		return 1;
+	}
+
 	/*
 	 * Setup two distinct wait regions. Index 0 will be a 1 second wait,
 	 * and region 2 is a short wait using min_wait_usec as well. Neither
@@ -154,6 +189,6 @@ int main(int argc, char *argv[])
 	 * Cleanup after ourselves
 	 */
 	io_uring_queue_exit(&ring);
-	io_uring_free_reg_wait(reg, 32);
+	free(reg);
 	return 0;
 }