mherrb/seatd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

connection: Shrink buffers from 1KB to 256B each

Browse source
This commit is contained in:
Kenny Levinsen 2020-08-01 23:09:35 +02:00
parent 7252558689
commit 2be0826959
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
common/connection.c
View file

@ -9,8 +9,6 @@
#include "compiler.h" #include "compiler.h"
#include "connection.h" #include "connection.h"
#define CLEN (CMSG_LEN(MAX_FDS_OUT * sizeof(int)))
ALWAYS_INLINE static uint32_t connection_buffer_mask(const uint32_t idx) { ALWAYS_INLINE static uint32_t connection_buffer_mask(const uint32_t idx) {
return idx & (CONNECTION_BUFFER_SIZE - 1); return idx & (CONNECTION_BUFFER_SIZE - 1);
} }
@ -134,8 +132,8 @@ static void connection_buffer_close_fds(struct connection_buffer *buffer) {
*/ */
static void build_cmsg(struct connection_buffer *buffer, char *data, int *clen) { static void build_cmsg(struct connection_buffer *buffer, char *data, int *clen) {
size_t size = connection_buffer_size(buffer); size_t size = connection_buffer_size(buffer);
if (size > MAX_FDS_OUT * sizeof(int)) { if (size > MAX_FDS * sizeof(int)) {
size = MAX_FDS_OUT * sizeof(int); size = MAX_FDS * sizeof(int);
} }
if (size <= 0) { if (size <= 0) {
@ -189,7 +187,7 @@ int connection_read(struct connection *connection) {
struct iovec iov[2]; struct iovec iov[2];
connection_buffer_put_iov(&connection->in, iov, &count); connection_buffer_put_iov(&connection->in, iov, &count);
char cmsg[CLEN]; char cmsg[CMSG_LEN(CONNECTION_BUFFER_SIZE)];
struct msghdr msg = { struct msghdr msg = {
.msg_name = NULL, .msg_name = NULL,
.msg_namelen = 0, .msg_namelen = 0,
@ -227,7 +225,7 @@ int connection_flush(struct connection *connection) {
connection_buffer_get_iov(&connection->out, iov, &count); connection_buffer_get_iov(&connection->out, iov, &count);
int clen; int clen;
char cmsg[CLEN]; char cmsg[CMSG_LEN(CONNECTION_BUFFER_SIZE)];
build_cmsg(&connection->fds_out, cmsg, &clen); build_cmsg(&connection->fds_out, cmsg, &clen);
struct msghdr msg = { struct msghdr msg = {
.msg_name = NULL, .msg_name = NULL,
@ -269,7 +267,7 @@ int connection_put(struct connection *connection, const void *data, size_t count
} }
int connection_put_fd(struct connection *connection, int fd) { int connection_put_fd(struct connection *connection, int fd) {
if (connection_buffer_size(&connection->fds_out) == MAX_FDS_OUT * sizeof fd) { if (connection_buffer_size(&connection->fds_out) == MAX_FDS * sizeof fd) {
errno = EOVERFLOW; errno = EOVERFLOW;
return -1; return -1;
} }

4
include/connection.h
View file

@ -4,9 +4,9 @@
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
#define CONNECTION_BUFFER_SIZE 1024 #define CONNECTION_BUFFER_SIZE 256
#define MAX_FDS_OUT 8 #define MAX_FDS (CONNECTION_BUFFER_SIZE / sizeof(int))
struct connection_buffer { struct connection_buffer {
uint32_t head, tail; uint32_t head, tail;