Thanks to visit codestin.com
Credit goes to github.com

Skip to content

max bound on write queue length #5

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

Open
wants to merge 7 commits into
base: discord-1.29.0
Choose a base branch
from
Open

max bound on write queue length #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2ea8acc
max bound on write queue length
brian-armstrong-discord Sep 30, 2019
5a9d7e3
2^17
brian-armstrong-discord Oct 1, 2019
22e45a0
check for recv fail
brian-armstrong-discord Oct 14, 2019
3b78a6f
2^20
brian-armstrong-discord Oct 15, 2019
d5a3bd3
get_write_queue_length
brian-armstrong-discord Nov 2, 2019
d4b3d56
queue capacity
brian-armstrong-discord Nov 2, 2019
36920b8
;
brian-armstrong-discord Nov 7, 2019
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
3 changes: 3 additions & 0 deletions include/uv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,6 +690,8 @@ UV_EXTERN size_t uv_udp_get_send_queue_count(const uv_udp_t* handle);
UV_EXTERN int uv_udp_netmap_init(uv_loop_t* loop, const char* fname);
UV_EXTERN void uv_udp_netmap_set_network(uv_loop_t* loop, unsigned char* src_mac, unsigned char* dst_mac, unsigned char* src_ip);
UV_EXTERN int uv_udp_netmap_close(uv_loop_t* loop);
UV_EXTERN unsigned int uv_udp_netmap_get_write_queue_length(uv_loop_t* loop);
UV_EXTERN unsigned int uv_udp_netmap_get_send_queue_capacity(uv_loop_t* loop);
#endif

/*
Expand Down Expand Up @@ -1691,6 +1693,7 @@ struct uv_netmap_s {
unsigned char socket_tos[NM_NUM_UDP_SOCKETS];
void* write_queue[2];
void* write_completed_queue[2];
unsigned int write_queue_length;
unsigned char src_mac[6];
unsigned char dst_mac[6];
unsigned char src_ip[4];
Expand Down
67 changes: 56 additions & 11 deletions src/unix/netmap-udp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@
#include <netinet/udp.h>



static uint16_t ip_checksum(struct ip* ip);
static void uv__udp_netmap_recv_packet(uv_loop_t* loop, struct netmap_slot* slot, uint8_t* p);
static int uv__udp_netmap_recv_packet(uv_loop_t* loop, struct netmap_slot* slot, uint8_t* p);
static size_t uv__udp_netmap_generate_udp(uv_loop_t* loop, unsigned int src_port, struct msghdr* h, uint8_t* pkt);
static int uv__udp_netmap_send_udp(uv_loop_t* loop, uv_udp_send_t* req, struct netmap_ring* ring);
static void uv__udp_netmap_run_completed(uv_loop_t* loop);
Expand All @@ -49,6 +50,7 @@ static void uv__udp_netmap_io(uv_loop_t* loop, uv__io_t* w, unsigned int revents
static const size_t ETH_LEN = sizeof(struct ether_header);
static const size_t ETH_IP_LEN = ETH_LEN + sizeof(struct ip);
static const size_t ETH_IP_UDP_LEN = ETH_IP_LEN + sizeof(struct udphdr);
static const size_t NETMAP_WRITE_QUEUE_MAX_LENGTH = (1 << 20);


static uint16_t ip_checksum(struct ip* ip) {
Expand Down Expand Up @@ -104,7 +106,7 @@ static uint16_t udp_checksum(struct ip* ip, struct udphdr* udp, uint8_t* payload
}


static void uv__udp_netmap_recv_packet(uv_loop_t* loop, struct netmap_slot* slot, uint8_t* p) {
static int uv__udp_netmap_recv_packet(uv_loop_t* loop, struct netmap_slot* slot, uint8_t* p) {
struct ether_header* eth;
struct ip* ip;
struct udphdr* udp;
Expand All @@ -115,23 +117,23 @@ static void uv__udp_netmap_recv_packet(uv_loop_t* loop, struct netmap_slot* slot
uint16_t udp_chksum;

if (slot->len < ETH_IP_UDP_LEN) {
return;
return 0;
}

eth = (struct ether_header*)p;

if (eth->ether_type != htons(ETHERTYPE_IP)) {
return;
return 0;
}

ip = (struct ip*)(p + ETH_LEN);

if (ip->ip_v != IPVERSION) {
return;
return 0;
}

if (ip->ip_p != IPPROTO_UDP) {
return;
return 0;
}

udp = (struct udphdr*)(p + ETH_IP_LEN);
Expand All @@ -146,7 +148,7 @@ static void uv__udp_netmap_recv_packet(uv_loop_t* loop, struct netmap_slot* slot
payload = p + ETH_IP_UDP_LEN;

if (udp->check != udp_checksum(ip, udp, payload, payload_len)) {
return;
return 0;
}

if (loop->netmap->sockets[dest_port]) {
Expand All @@ -157,7 +159,7 @@ static void uv__udp_netmap_recv_packet(uv_loop_t* loop, struct netmap_slot* slot

if (buf.base == NULL || buf.len == 0) {
socket_handle->recv_cb(socket_handle, UV_ENOBUFS, &buf, NULL, 0);
return;
return -1;
}
assert(buf.base != NULL);

Expand All @@ -170,6 +172,8 @@ static void uv__udp_netmap_recv_packet(uv_loop_t* loop, struct netmap_slot* slot

socket_handle->recv_cb(socket_handle, payload_len, &buf, (const struct sockaddr*)&addr, 0);
}

return 0;
}

static size_t uv__udp_netmap_generate_udp(uv_loop_t* loop, unsigned int src_port, struct msghdr* h, uint8_t* pkt) {
Expand Down Expand Up @@ -324,7 +328,10 @@ static void uv__udp_netmap_io(uv_loop_t* loop, uv__io_t* w, unsigned int revents
slot = &ring->slot[ring->cur];
p = (uint8_t*)NETMAP_BUF(ring, slot->buf_idx);

uv__udp_netmap_recv_packet(loop, slot, p);
if (uv__udp_netmap_recv_packet(loop, slot, p) < 0) {
// ran out of space, stop receiving
break;
}

ring->head = ring->cur = nm_ring_next(ring, ring->cur);
}
Expand Down Expand Up @@ -354,7 +361,11 @@ static void uv__udp_netmap_io(uv_loop_t* loop, uv__io_t* w, unsigned int revents
q = QUEUE_HEAD(&loop->netmap->write_queue);
req = QUEUE_DATA(q, uv_udp_send_t, queue);

uv__udp_netmap_send_udp(loop, req, ring);
if (uv__udp_netmap_send_udp(loop, req, ring) == -1) {
break;
}

loop->netmap->write_queue_length--;
uv__io_feed(loop, &loop->netmap->io_watcher);

pkt_num++;
Expand All @@ -364,6 +375,32 @@ static void uv__udp_netmap_io(uv_loop_t* loop, uv__io_t* w, unsigned int revents
}
}

unsigned int uv_udp_netmap_get_write_queue_length(uv_loop_t* loop) {
if (loop->netmap == NULL) {
return 0;
}
return loop->netmap->write_queue_length;
}

unsigned int uv_udp_netmap_get_send_queue_capacity(uv_loop_t* loop) {
int i;
unsigned int cap;
struct netmap_ring* ring;

if (loop->netmap == NULL) {
return 0;
}

cap = 0;

for (i = loop->netmap->intf->first_rx_ring; i <= loop->netmap->intf->last_rx_ring; i++) {
ring = NETMAP_TXRING(loop->netmap->intf->nifp, i);
cap += nm_ring_space(ring);
}

return cap;
}

int uv_udp_netmap_init(uv_loop_t* loop, const char* fname) {
nm_desc_t* netmap_desc;

Expand All @@ -386,6 +423,7 @@ int uv_udp_netmap_init(uv_loop_t* loop, const char* fname) {
uv__io_init(&loop->netmap->io_watcher, uv__udp_netmap_io, loop->netmap->intf->fd);
QUEUE_INIT(&loop->netmap->write_queue);
QUEUE_INIT(&loop->netmap->write_completed_queue);
loop->netmap->write_queue_length = 0;

return 0;
}
Expand Down Expand Up @@ -454,6 +492,7 @@ void uv__udp_netmap_finish_close_handle(uv_udp_t* handle) {
if (req->handle == handle) {
q = QUEUE_PREV(q);
QUEUE_REMOVE(&req->queue);
handle->loop->netmap->write_queue_length--;
req->status = UV_ECANCELED;
QUEUE_INSERT_TAIL(&handle->loop->netmap->write_completed_queue, &req->queue);
removed = 1;
Expand Down Expand Up @@ -588,7 +627,13 @@ int uv__udp_netmap_send(uv_udp_send_t* req,

// no space left, stash it locally
if (!enqueued) {
QUEUE_INSERT_TAIL(&handle->loop->netmap->write_queue, &req->queue);
if (handle->loop->netmap->write_queue_length < NETMAP_WRITE_QUEUE_MAX_LENGTH) {
QUEUE_INSERT_TAIL(&handle->loop->netmap->write_queue, &req->queue);
handle->loop->netmap->write_queue_length++;
} else {
req->send_cb(req, 0);
return -1;
}
}

// even if we put the packet in a ring, we still need to do a POLLOUT
Expand Down