[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20220902005825.2484023-7-ammar.faizi@intel.com>
Date: Fri, 2 Sep 2022 07:59:40 +0700
From: Ammar Faizi <ammarfaizi2@...weeb.org>
To: Jens Axboe <axboe@...nel.dk>
Cc: Ammar Faizi <ammarfaizi2@...weeb.org>,
Dylan Yudaken <dylany@...com>,
Facebook Kernel Team <kernel-team@...com>,
Pavel Begunkov <asml.silence@...il.com>,
Kanna Scarlet <knscarlet@...weeb.org>,
Muhammad Rizki <kiizuha@...weeb.org>,
GNU/Weeb Mailing List <gwml@...r.gnuweeb.org>,
io-uring Mailing List <io-uring@...r.gnuweeb.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: [PATCH liburing v1 06/12] t/files-exit-hang-poll: Don't brute force the port number
From: Ammar Faizi <ammarfaizi2@...weeb.org>
Don't brute force the port number, use `t_bind_ephemeral_port()`,
much simpler and reliable for choosing a port number that is not
in use.
Cc: Dylan Yudaken <dylany@...com>
Cc: Facebook Kernel Team <kernel-team@...com>
Cc: Pavel Begunkov <asml.silence@...il.com>
Signed-off-by: Ammar Faizi <ammarfaizi2@...weeb.org>
---
test/files-exit-hang-poll.c | 23 +++--------------------
1 file changed, 3 insertions(+), 20 deletions(-)
diff --git a/test/files-exit-hang-poll.c b/test/files-exit-hang-poll.c
index 0c609f1..04febc8 100644
--- a/test/files-exit-hang-poll.c
+++ b/test/files-exit-hang-poll.c
@@ -9,28 +9,26 @@
#include <netinet/in.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <strings.h>
#include <sys/socket.h>
#include <unistd.h>
#include <poll.h>
#include "liburing.h"
#include "helpers.h"
#define BACKLOG 512
-#define PORT 9100
-
static struct io_uring ring;
static void add_poll(struct io_uring *ring, int fd)
{
struct io_uring_sqe *sqe;
sqe = io_uring_get_sqe(ring);
io_uring_prep_poll_add(sqe, fd, POLLIN);
sqe->flags |= IOSQE_IO_LINK;
}
static void add_accept(struct io_uring *ring, int fd)
{
@@ -54,57 +52,45 @@ static int setup_io_uring(void)
}
static void alarm_sig(int sig)
{
exit(0);
}
int main(int argc, char *argv[])
{
struct sockaddr_in serv_addr;
struct io_uring_cqe *cqe;
int ret, sock_listen_fd;
const int val = 1;
- int i;
if (argc > 1)
return T_EXIT_SKIP;
sock_listen_fd = socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0);
if (sock_listen_fd < 0) {
perror("socket");
return T_EXIT_FAIL;
}
setsockopt(sock_listen_fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
memset(&serv_addr, 0, sizeof(serv_addr));
serv_addr.sin_family = AF_INET;
serv_addr.sin_addr.s_addr = INADDR_ANY;
- for (i = 0; i < 100; i++) {
- serv_addr.sin_port = htons(PORT + i);
-
- ret = bind(sock_listen_fd, (struct sockaddr *)&serv_addr, sizeof(serv_addr));
- if (!ret)
- break;
- if (errno != EADDRINUSE) {
- fprintf(stderr, "bind: %s\n", strerror(errno));
- return T_EXIT_FAIL;
- }
- if (i == 99) {
- printf("Gave up on finding a port, skipping\n");
- goto skip;
- }
+ if (t_bind_ephemeral_port(sock_listen_fd, &serv_addr)) {
+ perror("bind");
+ return T_EXIT_FAIL;
}
if (listen(sock_listen_fd, BACKLOG) < 0) {
perror("Error listening on socket\n");
return T_EXIT_FAIL;
}
if (setup_io_uring())
return T_EXIT_FAIL;
add_poll(&ring, sock_listen_fd);
add_accept(&ring, sock_listen_fd);
@@ -115,17 +101,14 @@ int main(int argc, char *argv[])
}
signal(SIGALRM, alarm_sig);
alarm(1);
ret = io_uring_wait_cqe(&ring, &cqe);
if (ret) {
fprintf(stderr, "wait_cqe=%d\n", ret);
return T_EXIT_FAIL;
}
io_uring_queue_exit(&ring);
return T_EXIT_PASS;
-skip:
- io_uring_queue_exit(&ring);
- return T_EXIT_SKIP;
}
--
Ammar Faizi
Powered by blists - more mailing lists