uringmachine 0.4 → 0.5

data/vendor/liburing/test/sqwait.c

@@ -0,0 +1,136 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Description: test that the app can always get a new sqe after having
+ *		called io_uring_sqring_wait().
+ *
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "liburing.h"
+#include "helpers.h"
+
+#define NR_IOS	10000
+#define INFLIGHT	256
+#define FILE_SIZE	(256 * 1024 * 1024)
+
+static int inflight;
+
+static int reap(struct io_uring *ring)
+{
+	struct io_uring_cqe *cqe;
+	int ret;
+
+	while (inflight >= INFLIGHT / 2) {
+		ret = io_uring_wait_cqe(ring, &cqe);
+		if (ret < 0) {
+			fprintf(stderr, "wait=%d\n", ret);
+			return 1;
+		}
+		if (cqe->res < 0) {
+			printf("cqe res %d\n", cqe->res);
+			return 1;
+		}
+		io_uring_cqe_seen(ring, cqe);
+		inflight--;
+	}
+
+	return 0;
+}
+
+int main(int argc, char *argv[])
+{
+	struct io_uring_sqe *sqe;
+	struct io_uring ring;
+	int fd = -1, i, iov_off, ret, fret;
+	struct iovec iovs[INFLIGHT];
+	const char *fname;
+	char buf[256];
+	loff_t off;
+
+	if (argc > 1) {
+		fname = argv[1];
+	} else {
+		srand((unsigned)time(NULL));
+		snprintf(buf, sizeof(buf), ".sqwait-%u-%u", (unsigned)rand(),
+			 (unsigned)getpid());
+		fname = buf;
+		t_create_file(fname, FILE_SIZE);
+	}
+
+	fret = T_EXIT_SKIP;
+	ret = io_uring_queue_init(8, &ring, IORING_SETUP_SQPOLL);
+	if (ret < 0) {
+		if (errno == EINVAL || errno == EPERM)
+			goto err;
+		fprintf(stderr, "queue init %d\n", ret);
+		fret = T_EXIT_FAIL;
+		goto err;
+	}
+
+	fd = open(fname, O_RDONLY | O_DIRECT);
+	if (fd < 0) {
+		if (errno == EACCES || errno == EPERM || errno == EINVAL)
+			return T_EXIT_SKIP;
+		perror("open");
+		fret = T_EXIT_FAIL;
+		goto err;
+	}
+
+	for (i = 0; i < INFLIGHT; i++) {
+		if (posix_memalign(&iovs[i].iov_base, 4096, 4096))
+			goto err;
+		iovs[i].iov_len = 4096;
+	}
+
+	iov_off = off = 0;
+	for (i = 0; i < NR_IOS; i++) {
+		struct iovec *iov = &iovs[iov_off];
+
+		sqe = io_uring_get_sqe(&ring);
+		if (!sqe) {
+			ret = io_uring_sqring_wait(&ring);
+			if (ret < 0) {
+				if (ret == -EINVAL)
+					return T_EXIT_SKIP;
+				fprintf(stderr, "sqwait=%d\n", ret);
+				fret = T_EXIT_FAIL;
+				goto err;
+			}
+			sqe = io_uring_get_sqe(&ring);
+			if (!sqe) {
+				fprintf(stderr, "No sqe post wait\n");
+				fret = T_EXIT_FAIL;
+				goto err;
+			}
+		}
+		io_uring_prep_read(sqe, fd, iov->iov_base, iov->iov_len, 0);
+		io_uring_submit(&ring);
+		inflight++;
+
+		iov_off++;
+		if (iov_off == INFLIGHT)
+			iov_off = 0;
+		off += 8192;
+		if (off > FILE_SIZE - 8192)
+			off = 0;
+		if (reap(&ring)) {
+			fret = T_EXIT_FAIL;
+			goto err;
+		}
+	}
+
+	if (fd != -1)
+		close(fd);
+	if (fname != argv[1])
+		unlink(fname);
+	io_uring_queue_exit(&ring);
+	return T_EXIT_PASS;
+err:
+	if (fd != -1)
+		close(fd);
+	if (fname != argv[1])
+		unlink(fname);
+	return fret;
+}

data/vendor/liburing/test/sync-cancel.c

@@ -13,7 +13,7 @@
 #include "liburing.h"
 #include "helpers.h"
 
-static int no_sync_cancel;
+static int no_sync_cancel, no_sync_cancel_op;
 
 static int test_sync_cancel_timeout(struct io_uring *ring, int async, int by_op)
 {
@@ -47,6 +47,11 @@ static int test_sync_cancel_timeout(struct io_uring *ring, int async, int by_op)
 	reg.opcode = IORING_OP_READ;
 	reg.timeout.tv_nsec = 1;
 	ret = io_uring_register_sync_cancel(ring, &reg);
+	/* earlier kernels had sync cancel, but not per-op */
+	if (ret == -EINVAL) {
+		no_sync_cancel_op = 1;
+		return 0;
+	}
 	if (async) {
 		/* we expect -ETIME here, but can race and get 0 */
 		if (ret != -ETIME && ret != 0) {
@@ -244,6 +249,8 @@ int main(int argc, char *argv[])
 		fprintf(stderr, "test_sync_cancel_timeout 0 0\n");
 		return T_EXIT_FAIL;
 	}
+	if (no_sync_cancel_op)
+		return T_EXIT_PASS;
 
 	ret = test_sync_cancel_timeout(&ring, 0, 1);
 	if (ret) {

data/vendor/liburing/test/timeout.c

@@ -1228,14 +1228,19 @@ static int test_timeout_link_cancel(void)
 		exit(0);
 	}
 
-	if (waitpid(p, &wstatus, 0) == (pid_t)-1) {
-		perror("waitpid()");
-		return 1;
-	}
-	if (!WIFEXITED(wstatus) || WEXITSTATUS(wstatus)) {
-		fprintf(stderr, "child failed %i\n", WEXITSTATUS(wstatus));
-		return 1;
-	}
+	do {
+		if (waitpid(p, &wstatus, 0) == (pid_t)-1) {
+			perror("waitpid()");
+			return 1;
+		}
+		if (!WIFEXITED(wstatus))
+			continue;
+		if (WEXITSTATUS(wstatus)) {
+			fprintf(stderr, "child failed %i\n", WEXITSTATUS(wstatus));
+			return 1;
+		}
+		break;
+	} while (1);
 
 	for (i = 0; i < 2; ++i) {
 		ret = io_uring_wait_cqe(&ring, &cqe);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uringmachine
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-06 00:00:00.000000000 Z
+date: 2024-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -84,22 +84,32 @@ files:
 - README.md
 - Rakefile
 - TODO.md
+- examples/bm_snooze.rb
+- examples/bm_write.rb
+- examples/dns_client.rb
 - examples/echo_server.rb
 - examples/http_server.rb
-- examples/http_server_multishot.rb
-- examples/http_server_simpler.rb
 - examples/inout.rb
 - examples/nc.rb
+- examples/server_client.rb
+- examples/snooze.rb
+- examples/write_dev_null.rb
 - ext/um/extconf.rb
 - ext/um/um.c
 - ext/um/um.h
+- ext/um/um_buffer.c
 - ext/um/um_class.c
 - ext/um/um_const.c
 - ext/um/um_ext.c
+- ext/um/um_mutex_class.c
 - ext/um/um_op.c
+- ext/um/um_queue_class.c
+- ext/um/um_sync.c
 - ext/um/um_utils.c
 - lib/uringmachine.rb
+- lib/uringmachine/dns_resolver.rb
 - lib/uringmachine/version.rb
+- supressions/ruby.supp
 - test/helper.rb
 - test/test_um.rb
 - uringmachine.gemspec
@@ -149,6 +159,7 @@ files:
 - vendor/liburing/examples/poll-bench.c
 - vendor/liburing/examples/proxy.c
 - vendor/liburing/examples/proxy.h
+- vendor/liburing/examples/reg-wait.c
 - vendor/liburing/examples/rsrc-update-bench.c
 - vendor/liburing/examples/send-zerocopy.c
 - vendor/liburing/examples/ucontext-cp.c
@@ -207,6 +218,7 @@ files:
 - vendor/liburing/test/buf-ring.c
 - vendor/liburing/test/ce593a6c480a.c
 - vendor/liburing/test/close-opath.c
+- vendor/liburing/test/cmd-discard.c
 - vendor/liburing/test/config
 - vendor/liburing/test/connect-rep.c
 - vendor/liburing/test/connect.c
@@ -239,6 +251,8 @@ files:
 - vendor/liburing/test/fd-install.c
 - vendor/liburing/test/fd-pass.c
 - vendor/liburing/test/fdinfo.c
+- vendor/liburing/test/fifo-nonblock-read.c
+- vendor/liburing/test/file-exit-unreg.c
 - vendor/liburing/test/file-register.c
 - vendor/liburing/test/file-update.c
 - vendor/liburing/test/file-verify.c
@@ -314,6 +328,7 @@ files:
 - vendor/liburing/test/probe.c
 - vendor/liburing/test/read-before-exit.c
 - vendor/liburing/test/read-mshot-empty.c
+- vendor/liburing/test/read-mshot-stdin.c
 - vendor/liburing/test/read-mshot.c
 - vendor/liburing/test/read-write.c
 - vendor/liburing/test/recv-msgall-stream.c
@@ -324,10 +339,12 @@ files:
 - vendor/liburing/test/reg-fd-only.c
 - vendor/liburing/test/reg-hint.c
 - vendor/liburing/test/reg-reg-ring.c
+- vendor/liburing/test/reg-wait.c
 - vendor/liburing/test/regbuf-clone.c
 - vendor/liburing/test/regbuf-merge.c
 - vendor/liburing/test/register-restrictions.c
 - vendor/liburing/test/rename.c
+- vendor/liburing/test/resize-rings.c
 - vendor/liburing/test/ring-leak.c
 - vendor/liburing/test/ring-leak2.c
 - vendor/liburing/test/ringbuf-read.c
@@ -364,6 +381,7 @@ files:
 - vendor/liburing/test/sqpoll-exec.c
 - vendor/liburing/test/sqpoll-exit-hang.c
 - vendor/liburing/test/sqpoll-sleep.c
+- vendor/liburing/test/sqwait.c
 - vendor/liburing/test/statx.c
 - vendor/liburing/test/stdout.c
 - vendor/liburing/test/submit-and-wait.c

data/examples/http_server_multishot.rb

@@ -1,57 +0,0 @@
-require_relative '../lib/iou'
-require 'socket'
-require 'http/parser'
-
-def log(msg)
-  # return
-  STDERR.puts msg
-end
-
-socket = TCPServer.open('127.0.0.1', 1234)
-log 'Listening on port 1234... (multishot read)'
-
-@ring = IOU::Ring.new
-@bg_id = @ring.setup_buffer_ring(count: 1024, size: 4096)
-
-@ring.prep_accept(fd: socket.fileno, multishot: true) do |c|
-  setup_connection(c[:result]) if c[:result] > 0
-end
-
-def setup_connection(fd)
-  log "Connection accepted fd #{fd}"
-
-  parser = Http::Parser.new
-  parser.on_message_complete = -> {
-    http_send_response(fd, "Hello, world!\n")
-  }
-
-  http_prep_read(fd, parser)
-end
-
-def http_prep_read(fd, parser)
-  id = @ring.prep_read(fd: fd, multishot: true, buffer_group: @bg_id) do |c|
-    if c[:result] > 0
-      parser << c[:buffer]
-    elsif c[:result] == 0
-      log "Connection closed by client on fd #{fd}"
-    else
-      if c[:result] != -Errno::ECANCELED::Errno
-        log "Got error #{c[:result]} on fd #{fd}, closing connection..."
-      end
-      @ring.prep_close(fd: fd) do |c|
-        log "Connection closed on fd #{fd}, result #{c[:result]}"
-      end
-    end
-  rescue HTTP::Parser::Error
-    puts "Error parsing, closing connection..."
-    @ring.prep_cancel(id)
-  end
-end
-
-def http_send_response(fd, body)
-  msg = "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nConnection: keep-alive\r\nContent-Length: #{body.bytesize}\r\n\r\n#{body}"
-  @ring.prep_write(fd: fd, buffer: msg)
-end
-
-trap('SIGINT') { exit! }
-@ring.process_completions_loop

data/examples/http_server_simpler.rb

@@ -1,34 +0,0 @@
-require_relative '../lib/iou'
-require 'socket'
-require 'http/parser'
-
-socket = TCPServer.open('127.0.0.1', 1234)
-puts 'Listening on port 1234... (multishot read)'
-
-@ring = IOU::Ring.new
-@buffer_group = @ring.setup_buffer_ring(count: 1024, size: 4096)
-
-@ring.prep_accept(fd: socket.fileno, multishot: true) do |c|
-  http_handle_connection(c[:result]) if c[:result] > 0
-end
-
-def http_handle_connection(fd)
-  parser = Http::Parser.new
-  parser.on_message_complete = -> { http_send_response(fd, "Hello, world!\n") }
-
-  @ring.prep_read(fd: fd, multishot: true, buffer_group: @buffer_group) do |c|
-    if c[:result] > 0
-      parser << c[:buffer]
-    else
-      puts "Connection closed on fd #{fd}"
-    end
-  end
-end
-
-def http_send_response(fd, body)
-  msg = "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nConnection: keep-alive\r\nContent-Length: #{body.bytesize}\r\n\r\n#{body}"
-  @ring.prep_write(fd: fd, buffer: msg)
-end
-
-trap('SIGINT') { exit! }
-@ring.process_completions_loop