about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/liburing/0003-examples-Use-t_error-instead-of-glibc-s-error.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/liburing/0003-examples-Use-t_error-instead-of-glibc-s-error.patch')
-rw-r--r--nixpkgs/pkgs/development/libraries/liburing/0003-examples-Use-t_error-instead-of-glibc-s-error.patch226
1 files changed, 226 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/liburing/0003-examples-Use-t_error-instead-of-glibc-s-error.patch b/nixpkgs/pkgs/development/libraries/liburing/0003-examples-Use-t_error-instead-of-glibc-s-error.patch
new file mode 100644
index 000000000000..ce92f16dcb18
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/liburing/0003-examples-Use-t_error-instead-of-glibc-s-error.patch
@@ -0,0 +1,226 @@
+From 23704bbd1416ed1a051b32d5d44e46dd654b8ffe Mon Sep 17 00:00:00 2001
+From: Steffen <steffen.winter@proton.me>
+Date: Mon, 13 Feb 2023 18:23:44 +0100
+Subject: [PATCH 3/3] examples: Use t_error instead of glibc's error.
+
+On musl systems, liburing cannot build examples and tests due to
+it's usage of error.h. t_error copied from test/helpers.c.
+Replacing calls to error() with t_error().
+
+Closes: #786
+
+Signed-off-by: Steffen Winter <steffen.winter@proton.me>
+---
+ examples/send-zerocopy.c | 61 +++++++++++++++++++++++++---------------
+ 1 file changed, 39 insertions(+), 22 deletions(-)
+
+diff --git a/examples/send-zerocopy.c b/examples/send-zerocopy.c
+index 7f5f2b1..6092af9 100644
+--- a/examples/send-zerocopy.c
++++ b/examples/send-zerocopy.c
+@@ -5,11 +5,11 @@
+ #include <stdint.h>
+ #include <assert.h>
+ #include <errno.h>
+-#include <error.h>
+ #include <limits.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <stdbool.h>
++#include <stdarg.h>
+ #include <string.h>
+ 
+ #include <arpa/inet.h>
+@@ -57,6 +57,23 @@ static struct sockaddr_storage cfg_dst_addr;
+ 
+ static char payload[IP_MAXPACKET] __attribute__((aligned(4096)));
+ 
++/*
++ * Implementation of error(3), prints an error message and exits.
++ */
++static 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);
++}
++
+ static unsigned long gettimeofday_ms(void)
+ {
+ 	struct timeval tv;
+@@ -68,7 +85,7 @@ static unsigned long gettimeofday_ms(void)
+ static void do_setsockopt(int fd, int level, int optname, int val)
+ {
+ 	if (setsockopt(fd, level, optname, &val, sizeof(val)))
+-		error(1, errno, "setsockopt %d.%d: %d", level, optname, val);
++		t_error(1, errno, "setsockopt %d.%d: %d", level, optname, val);
+ }
+ 
+ static void setup_sockaddr(int domain, const char *str_addr,
+@@ -84,7 +101,7 @@ static void setup_sockaddr(int domain, const char *str_addr,
+ 		addr4->sin_port = htons(cfg_port);
+ 		if (str_addr &&
+ 		    inet_pton(AF_INET, str_addr, &(addr4->sin_addr)) != 1)
+-			error(1, 0, "ipv4 parse error: %s", str_addr);
++			t_error(1, 0, "ipv4 parse error: %s", str_addr);
+ 		break;
+ 	case PF_INET6:
+ 		memset(addr6, 0, sizeof(*addr6));
+@@ -92,10 +109,10 @@ static void setup_sockaddr(int domain, const char *str_addr,
+ 		addr6->sin6_port = htons(cfg_port);
+ 		if (str_addr &&
+ 		    inet_pton(AF_INET6, str_addr, &(addr6->sin6_addr)) != 1)
+-			error(1, 0, "ipv6 parse error: %s", str_addr);
++			t_error(1, 0, "ipv6 parse error: %s", str_addr);
+ 		break;
+ 	default:
+-		error(1, 0, "illegal domain");
++		t_error(1, 0, "illegal domain");
+ 	}
+ }
+ 
+@@ -105,12 +122,12 @@ static int do_setup_tx(int domain, int type, int protocol)
+ 
+ 	fd = socket(domain, type, protocol);
+ 	if (fd == -1)
+-		error(1, errno, "socket t");
++		t_error(1, errno, "socket t");
+ 
+ 	do_setsockopt(fd, SOL_SOCKET, SO_SNDBUF, 1 << 21);
+ 
+ 	if (connect(fd, (void *) &cfg_dst_addr, cfg_alen))
+-		error(1, errno, "connect");
++		t_error(1, errno, "connect");
+ 	return fd;
+ }
+ 
+@@ -125,7 +142,7 @@ static inline struct io_uring_cqe *wait_cqe_fast(struct io_uring *ring)
+ 
+ 	ret = io_uring_wait_cqe(ring, &cqe);
+ 	if (ret)
+-		error(1, ret, "wait cqe");
++		t_error(1, ret, "wait cqe");
+ 	return cqe;
+ }
+ 
+@@ -143,17 +160,17 @@ static void do_tx(int domain, int type, int protocol)
+ 
+ 	ret = io_uring_queue_init(512, &ring, IORING_SETUP_COOP_TASKRUN);
+ 	if (ret)
+-		error(1, ret, "io_uring: queue init");
++		t_error(1, ret, "io_uring: queue init");
+ 
+ 	if (cfg_fixed_files) {
+ 		ret = io_uring_register_files(&ring, &fd, 1);
+ 		if (ret < 0)
+-			error(1, ret, "io_uring: files registration");
++			t_error(1, ret, "io_uring: files registration");
+ 	}
+ 	if (cfg_reg_ringfd) {
+ 		ret = io_uring_register_ring_fd(&ring);
+ 		if (ret < 0)
+-			error(1, ret, "io_uring: io_uring_register_ring_fd");
++			t_error(1, ret, "io_uring: io_uring_register_ring_fd");
+ 	}
+ 
+ 	iov.iov_base = payload;
+@@ -161,7 +178,7 @@ static void do_tx(int domain, int type, int protocol)
+ 
+ 	ret = io_uring_register_buffers(&ring, &iov, 1);
+ 	if (ret)
+-		error(1, ret, "io_uring: buffer registration");
++		t_error(1, ret, "io_uring: buffer registration");
+ 
+ 	tstop = gettimeofday_ms() + cfg_runtime_ms;
+ 	do {
+@@ -193,14 +210,14 @@ static void do_tx(int domain, int type, int protocol)
+ 
+ 		ret = io_uring_submit(&ring);
+ 		if (ret != cfg_nr_reqs)
+-			error(1, ret, "submit");
++			t_error(1, ret, "submit");
+ 
+ 		for (i = 0; i < cfg_nr_reqs; i++) {
+ 			cqe = wait_cqe_fast(&ring);
+ 
+ 			if (cqe->flags & IORING_CQE_F_NOTIF) {
+ 				if (cqe->flags & IORING_CQE_F_MORE)
+-					error(1, -EINVAL, "F_MORE notif");
++					t_error(1, -EINVAL, "F_MORE notif");
+ 				compl_cqes--;
+ 				i--;
+ 				io_uring_cqe_seen(&ring, cqe);
+@@ -217,7 +234,7 @@ static void do_tx(int domain, int type, int protocol)
+ 				fprintf(stderr, "Connection failure");
+ 				goto out_fail;
+ 			} else if (cqe->res != -EAGAIN) {
+-				error(1, cqe->res, "send failed");
++				t_error(1, cqe->res, "send failed");
+ 			}
+ 			io_uring_cqe_seen(&ring, cqe);
+ 		}
+@@ -226,7 +243,7 @@ static void do_tx(int domain, int type, int protocol)
+ out_fail:
+ 	shutdown(fd, SHUT_RDWR);
+ 	if (close(fd))
+-		error(1, errno, "close");
++		t_error(1, errno, "close");
+ 
+ 	fprintf(stderr, "tx=%lu (MB=%lu), tx/s=%lu (MB/s=%lu)\n",
+ 			packets, bytes >> 20,
+@@ -254,7 +271,7 @@ static void do_test(int domain, int type, int protocol)
+ 
+ static void usage(const char *filepath)
+ {
+-	error(1, 0, "Usage: %s [-n<N>] [-z<val>] [-s<payload size>] "
++	t_error(1, 0, "Usage: %s [-n<N>] [-z<val>] [-s<payload size>] "
+ 		    "(-4|-6) [-t<time s>] -D<dst_ip> udp", filepath);
+ }
+ 
+@@ -276,13 +293,13 @@ static void parse_opts(int argc, char **argv)
+ 		switch (c) {
+ 		case '4':
+ 			if (cfg_family != PF_UNSPEC)
+-				error(1, 0, "Pass one of -4 or -6");
++				t_error(1, 0, "Pass one of -4 or -6");
+ 			cfg_family = PF_INET;
+ 			cfg_alen = sizeof(struct sockaddr_in);
+ 			break;
+ 		case '6':
+ 			if (cfg_family != PF_UNSPEC)
+-				error(1, 0, "Pass one of -4 or -6");
++				t_error(1, 0, "Pass one of -4 or -6");
+ 			cfg_family = PF_INET6;
+ 			cfg_alen = sizeof(struct sockaddr_in6);
+ 			break;
+@@ -311,9 +328,9 @@ static void parse_opts(int argc, char **argv)
+ 	}
+ 
+ 	if (cfg_nr_reqs > MAX_SUBMIT_NR)
+-		error(1, 0, "-n: submit batch nr exceeds max (%d)", MAX_SUBMIT_NR);
++		t_error(1, 0, "-n: submit batch nr exceeds max (%d)", MAX_SUBMIT_NR);
+ 	if (cfg_payload_len > max_payload_len)
+-		error(1, 0, "-s: payload exceeds max (%d)", max_payload_len);
++		t_error(1, 0, "-s: payload exceeds max (%d)", max_payload_len);
+ 
+ 	setup_sockaddr(cfg_family, daddr, &cfg_dst_addr);
+ 
+@@ -333,7 +350,7 @@ int main(int argc, char **argv)
+ 	else if (!strcmp(cfg_test, "udp"))
+ 		do_test(cfg_family, SOCK_DGRAM, 0);
+ 	else
+-		error(1, 0, "unknown cfg_test %s", cfg_test);
++		t_error(1, 0, "unknown cfg_test %s", cfg_test);
+ 
+ 	return 0;
+ }
+-- 
+2.39.1
+
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-06-10 03:33:46 +0000