Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add idle hook and ref count lookups and events also #231

Merged
merged 1 commit into from
Dec 9, 2024
Merged

add idle hook and ref count lookups and events also #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions include/udx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ typedef struct udx_lookup_s udx_lookup_t;

typedef struct udx_interface_event_s udx_interface_event_t;

typedef void (*udx_idle_cb)(udx_t *udx);

typedef void (*udx_socket_send_cb)(udx_socket_send_t *req, int status);
typedef void (*udx_socket_recv_cb)(udx_socket_t *socket, ssize_t read_len, const uv_buf_t *buf, const struct sockaddr *from);
typedef void (*udx_socket_close_cb)(udx_socket_t *socket);
Expand All @@ -106,6 +108,7 @@ struct udx_s {
uv_loop_t *loop;

uint32_t refs;
udx_idle_cb on_idle;

uint32_t sockets_len;
uint32_t sockets_max_len;
Expand Down Expand Up @@ -375,6 +378,8 @@ struct udx_stream_send_s {

struct udx_lookup_s {
uv_getaddrinfo_t req;
udx_t *udx;

struct addrinfo hints;

udx_lookup_cb on_lookup;
Expand All @@ -385,6 +390,7 @@ struct udx_lookup_s {
struct udx_interface_event_s {
uv_timer_t timer;
uv_loop_t *loop;
udx_t *udx;

uv_interface_address_t *addrs;
int addrs_len;
Expand All @@ -399,6 +405,9 @@ struct udx_interface_event_s {
int
udx_init (uv_loop_t *loop, udx_t *udx);

void
udx_idle (udx_t *udx, udx_idle_cb cb);

int
udx_socket_init (udx_t *udx, udx_socket_t *socket);

Expand Down Expand Up @@ -518,10 +527,10 @@ int
udx_stream_destroy (udx_stream_t *stream);

int
udx_lookup (uv_loop_t *loop, udx_lookup_t *req, const char *host, unsigned int flags, udx_lookup_cb cb);
udx_lookup (udx_t *udx, udx_lookup_t *req, const char *host, unsigned int flags, udx_lookup_cb cb);

int
udx_interface_event_init (uv_loop_t *loop, udx_interface_event_t *handle);
udx_interface_event_init (udx_t *udx, udx_interface_event_t *handle);

int
udx_interface_event_start (udx_interface_event_t *handle, udx_interface_event_cb cb, uint64_t frequency);
Expand Down
65 changes: 41 additions & 24 deletions src/udx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
#define UDX_DEFAULT_TTL 64
#define UDX_DEFAULT_BUFFER_SIZE 212992

#define UDX_DEFAULT_SET_SIZE 16

#define UDX_MAX_RTO_TIMEOUTS 6

#define UDX_CONG_C 400 // C=0.4 (inverse) in scaled 1000
Expand Down Expand Up @@ -151,24 +153,6 @@ send_window_in_packets (udx_stream_t *stream) {
static void
on_uv_poll (uv_poll_t *handle, int status, int events);

static void
ref_inc (udx_t *udx) {
udx->refs++;

if (udx->sockets == NULL) {
udx->sockets_len = 0;
udx->sockets_max_len = 16;
udx->sockets = malloc(udx->sockets_max_len * sizeof(udx_socket_t *));
}

if (udx->streams == NULL) {
udx->streams_len = 0;
udx->streams_max_len = 16;
udx->streams = malloc(udx->streams_max_len * sizeof(udx_stream_t *));
udx__cirbuf_init(&(udx->streams_by_id), 16);
}
}

static void
ref_dec (udx_t *udx) {
udx->refs--;
Expand All @@ -188,6 +172,10 @@ ref_dec (udx_t *udx) {

udx__cirbuf_destroy(&(udx->streams_by_id));
}

if (udx->on_idle != NULL) {
udx->on_idle(udx);
}
}

static void
Expand Down Expand Up @@ -1966,6 +1954,7 @@ on_uv_poll (uv_poll_t *handle, int status, int events) {
int
udx_init (uv_loop_t *loop, udx_t *udx) {
udx->refs = 0;
udx->on_idle = NULL;

udx->sockets_len = 0;
udx->sockets_max_len = 0;
Expand All @@ -1986,9 +1975,20 @@ udx_init (uv_loop_t *loop, udx_t *udx) {
return 0;
}

void
udx_idle (udx_t *udx, udx_idle_cb cb) {
udx->on_idle = cb;
}

int
udx_socket_init (udx_t *udx, udx_socket_t *socket) {
ref_inc(udx);
udx->refs++;

if (udx->sockets == NULL) {
udx->sockets_len = 0;
udx->sockets_max_len = UDX_DEFAULT_SET_SIZE;
udx->sockets = malloc(udx->sockets_max_len * sizeof(udx_socket_t *));
}

socket->family = 0;
socket->status = 0;
Expand Down Expand Up @@ -2259,7 +2259,14 @@ udx_socket_close (udx_socket_t *socket, udx_socket_close_cb cb) {

int
udx_stream_init (udx_t *udx, udx_stream_t *stream, uint32_t local_id, udx_stream_close_cb close_cb, udx_stream_finalize_cb finalize_cb) {
ref_inc(udx);
udx->refs++;

if (udx->streams == NULL) {
udx->streams_len = 0;
udx->streams_max_len = UDX_DEFAULT_SET_SIZE;
udx->streams = malloc(udx->streams_max_len * sizeof(udx_stream_t *));
udx__cirbuf_init(&(udx->streams_by_id), 16);
}

stream->local_id = local_id;
stream->remote_id = 0;
Expand Down Expand Up @@ -2743,13 +2750,18 @@ on_uv_getaddrinfo (uv_getaddrinfo_t *req, int status, struct addrinfo *res) {
}

uv_freeaddrinfo(res);

ref_dec(lookup->udx);
}

int
udx_lookup (uv_loop_t *loop, udx_lookup_t *req, const char *host, unsigned int flags, udx_lookup_cb cb) {
udx_lookup (udx_t *udx, udx_lookup_t *req, const char *host, unsigned int flags, udx_lookup_cb cb) {
req->udx = udx;
req->on_lookup = cb;
req->req.data = req;

udx->refs++;

memset(&req->hints, 0, sizeof(struct addrinfo));

int family = AF_UNSPEC;
Expand All @@ -2760,7 +2772,7 @@ udx_lookup (uv_loop_t *loop, udx_lookup_t *req, const char *host, unsigned int f
req->hints.ai_family = family;
req->hints.ai_socktype = SOCK_STREAM;

return uv_getaddrinfo(loop, &req->req, on_uv_getaddrinfo, host, NULL, &req->hints);
return uv_getaddrinfo(udx->loop, &req->req, on_uv_getaddrinfo, host, NULL, &req->hints);
}

static int
Expand Down Expand Up @@ -2828,13 +2840,18 @@ on_interface_event_close (uv_handle_t *handle) {
if (event->on_close != NULL) {
event->on_close(event);
}

ref_dec(event->udx);
}

int
udx_interface_event_init (uv_loop_t *loop, udx_interface_event_t *handle) {
handle->loop = loop;
udx_interface_event_init (udx_t *udx, udx_interface_event_t *handle) {
handle->udx = udx;
handle->loop = udx->loop;
handle->sorted = false;

udx->refs++;

int err = uv_interface_addresses(&(handle->addrs), &(handle->addrs_len));
if (err < 0) return err;

Expand Down
4 changes: 3 additions & 1 deletion test/lookup-invalid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include "../include/udx.h"

udx_t udx;
uv_loop_t loop;
udx_lookup_t req;

Expand All @@ -21,8 +22,9 @@ main () {
int e;

uv_loop_init(&loop);
udx_init(&loop, &udx);

e = udx_lookup(&loop, &req, "example.invalid.", 0, on_lookup);
e = udx_lookup(&udx, &req, "example.invalid.", 0, on_lookup);
assert(e == 0);

uv_run(&loop, UV_RUN_DEFAULT);
Expand Down
4 changes: 3 additions & 1 deletion test/lookup-ipv6.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "../include/udx.h"

uv_loop_t loop;
udx_t udx;
udx_lookup_t req;

void
Expand All @@ -26,8 +27,9 @@ main () {
int e;

uv_loop_init(&loop);
udx_init(&loop, &udx);

e = udx_lookup(&loop, &req, "localhost", UDX_LOOKUP_FAMILY_IPV6, on_lookup);
e = udx_lookup(&udx, &req, "localhost", UDX_LOOKUP_FAMILY_IPV6, on_lookup);
assert(e == 0);

uv_run(&loop, UV_RUN_DEFAULT);
Expand Down
4 changes: 3 additions & 1 deletion test/lookup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "../include/udx.h"

uv_loop_t loop;
udx_t udx;
udx_lookup_t req;

void
Expand All @@ -26,8 +27,9 @@ main () {
int e;

uv_loop_init(&loop);
udx_init(&loop, &udx);

e = udx_lookup(&loop, &req, "localhost", UDX_LOOKUP_FAMILY_IPV4, on_lookup);
e = udx_lookup(&udx, &req, "localhost", UDX_LOOKUP_FAMILY_IPV4, on_lookup);
assert(e == 0);

uv_run(&loop, UV_RUN_DEFAULT);
Expand Down
Loading