From c7488b0f59c99dc876909447484ae2482d88b01d Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Mon, 2 Jan 2023 21:48:06 +0100 Subject: [PATCH] Add list.c --- Makefile | 6 ++- src/async.c | 33 +++++++-------- src/lib/list.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++ src/lib/list.h | 19 +++++++++ test/test_list.c | 83 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 225 insertions(+), 18 deletions(-) create mode 100644 src/lib/list.c create mode 100644 src/lib/list.h create mode 100644 test/test_list.c diff --git a/Makefile b/Makefile index 8e0d9e3..96b21c4 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ bin/worker: bin/res: mkdir -p bin/res -bin/test: test/mock_*.c test/test_*.c src/lib/utils.c src/lib/sock.c +bin/test: test/mock_*.c test/test_*.c src/lib/utils.c src/lib/sock.c src/lib/list.c $(CC) -o $@ $(CFLAGS) $^ -lcriterion @@ -61,7 +61,7 @@ bin/sesimos: bin/server.o bin/logger.o bin/cache_handler.o bin/async.o bin/worke bin/lib/http_static.o bin/res/default.o bin/res/proxy.o bin/res/style.o \ bin/lib/compress.o bin/lib/config.o bin/lib/fastcgi.o bin/lib/geoip.o \ bin/lib/http.o bin/lib/proxy.o bin/lib/sock.o bin/lib/uri.o \ - bin/lib/utils.o bin/lib/websocket.o bin/lib/mpmc.o + bin/lib/utils.o bin/lib/websocket.o bin/lib/mpmc.o bin/lib/list.o $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS) @@ -97,6 +97,8 @@ bin/lib/geoip.o: src/lib/geoip.h bin/lib/http.o: src/lib/http.h src/lib/utils.h src/lib/compress.h src/lib/sock.h src/logger.h +bin/lib/list.o: src/lib/list.h + bin/lib/mpmc.o: src/lib/mpmc.h src/logger.h bin/lib/proxy.o: src/lib/proxy.h src/defs.h src/server.h src/lib/compress.h src/logger.h diff --git a/src/async.c b/src/async.c index 706b9b2..e9b07d5 100644 --- a/src/async.c +++ b/src/async.c @@ -8,6 +8,7 @@ #include "async.h" #include "logger.h" +#include "lib/list.h" #include #include @@ -29,7 +30,7 @@ typedef struct { typedef struct { int n; - evt_listen_t q[256]; + evt_listen_t q[64]; } listen_queue_t; static listen_queue_t listen1, listen2, *listen_q = &listen1; @@ -149,31 +150,30 @@ void async_free(void) { } void async_thread(void) { - listen_queue_t local_q; - struct pollfd fds[256]; // TODO dynamic + evt_listen_t *local = list_create(sizeof(evt_listen_t), 16); thread = pthread_self(); - local_q.n = 0; // main event loop while (alive) { // swap listen queue listen_queue_t *l = listen_q; listen_q = (listen_q == &listen1) ? &listen2 : &listen1; - int num_fds = 0; - // fill fds with previously added queue entries - for (int i = 0; i < l->n; i++, local_q.n++) { - memcpy(&local_q.q[local_q.n], &l->q[i], sizeof(evt_listen_t)); + // fill local list with previously added queue entries + for (int i = 0; i < l->n; i++) { + local = list_append(local, &l->q[i]); } // reset size of queue l->n = 0; // fill fds with newly added queue entries - for (int i = 0; i < local_q.n; i++, num_fds++) { - fds[num_fds].fd = local_q.q[i].fd; - fds[num_fds].events = local_q.q[i].events; + int num_fds = 0; + struct pollfd fds[list_size(local)]; + for (int i = 0; i < list_size(local); i++, num_fds++) { + fds[num_fds].fd = local[i].fd; + fds[num_fds].events = local[i].events; } if (poll(fds, num_fds, -1) < 0) { @@ -188,13 +188,14 @@ void async_thread(void) { } } - local_q.n = 0; - for (int i = 0; i < num_fds; i++) { - evt_listen_t *evt = &local_q.q[i]; - if (async_exec(evt, fds[i].revents) != 0) - memcpy(&local_q.q[local_q.n++], evt, sizeof(*evt)); + for (int i = 0, j = 0; i < num_fds; i++, j++) { + evt_listen_t *evt = &local[j]; + if (async_exec(evt, fds[i].revents) == 0) + local = list_remove(local, j--); } } + + list_free(local); } void async_stop(void) { diff --git a/src/lib/list.c b/src/lib/list.c new file mode 100644 index 0000000..ee599b3 --- /dev/null +++ b/src/lib/list.c @@ -0,0 +1,102 @@ + +#include "list.h" + +#include +#include +#include + +#define FACTOR 4 + +typedef struct { + int init_size, elem_size, max_size, size; +} list_meta_t; + +static void *list_resize(list_meta_t *list, int new_size) { + if (new_size <= 0) + return NULL; + + list_meta_t *new_ptr = realloc(list, sizeof(list_meta_t) + list->elem_size * new_size); + if (new_ptr == NULL) + return NULL; + + new_ptr->max_size = new_size; + return new_ptr; +} + +void *list_create(int elem_size, int init_elem_n) { + if (elem_size <= 0 || init_elem_n <= 0) { + errno = EINVAL; + return NULL; + } + + void *list_ptr = malloc(sizeof(list_meta_t) + elem_size * init_elem_n); + list_meta_t *list = list_ptr; + list->init_size = init_elem_n; + list->elem_size = elem_size; + list->max_size = init_elem_n; + list->size = 0; + return (unsigned char *) list_ptr + sizeof(list_meta_t); +} + +unsigned int list_size(void *list_ptr) { + list_meta_t *list = (void *) ((unsigned char *) list_ptr - sizeof(list_meta_t)); + return list->size; +} + +void *list_insert(void *list_ptr, void *elem, int n) { + list_meta_t *list = (void *) ((unsigned char *) list_ptr - sizeof(list_meta_t)); + if (n < 0) + n = list->size + n + 1; + + if (list->size >= list->max_size) { + if ((list = list_resize(list, list->max_size * FACTOR)) == NULL) { + return NULL; + } + } + + unsigned char *array = list_ptr; + + if (n < list->size) + memmove(array + (n + 1) * list->elem_size, array + n * list->elem_size, (list->size - n) * list->elem_size); + memcpy(array + n * list->elem_size, elem, list->elem_size); + + list->size++; + return (unsigned char *) list + sizeof(list_meta_t); +} + +void *list_append(void *list_ptr, void *elem) { + return list_insert(list_ptr, elem, -1); +} + +void *list_remove(void *list_ptr, int n) { + list_meta_t *list = (void *) ((unsigned char *) list_ptr - sizeof(list_meta_t)); + if (n < 0) + n = list->size + n; + + unsigned char *array = list_ptr; + + if (list->size > 1 && n < list->size) + memmove(array + n * list->elem_size, array + (n + 1) * list->elem_size, (list->size - n - 1) * list->elem_size); + + list->size--; + if (list->size < list->max_size / FACTOR && list->max_size / FACTOR >= list->init_size) { + if ((list = list_resize(list, list->max_size / FACTOR)) == NULL) { + return NULL; + } + } + + return (unsigned char *) list + sizeof(list_meta_t); +} + +void *list_clear(void *list_ptr) { + list_meta_t *list = (void *) ((unsigned char *) list_ptr - sizeof(list_meta_t)); + list->size = 0; + memset(list_ptr, 0, list->max_size * list->elem_size); + list->max_size = list->init_size; + return (unsigned char *) list_resize(list, list->max_size * list->elem_size) + sizeof(list_meta_t); +} + +void list_free(void *list_ptr) { + list_meta_t *list = (void *) ((unsigned char *) list_ptr - sizeof(list_meta_t)); + free(list); +} diff --git a/src/lib/list.h b/src/lib/list.h new file mode 100644 index 0000000..3fdd17e --- /dev/null +++ b/src/lib/list.h @@ -0,0 +1,19 @@ + +#ifndef SESIMOS_LIST_H +#define SESIMOS_LIST_H + +void *list_create(int elem_size, int init_elem_n); + +unsigned int list_size(void *list_ptr); + +void *list_insert(void *list_ptr, void *elem, int n); + +void *list_append(void *list_ptr, void *elem); + +void *list_remove(void *list_ptr, int n); + +void *list_clear(void *list_ptr); + +void list_free(void *list_ptr); + +#endif //SESIMOS_LIST_H diff --git a/test/test_list.c b/test/test_list.c new file mode 100644 index 0000000..79d7280 --- /dev/null +++ b/test/test_list.c @@ -0,0 +1,83 @@ + +#include +#include + +#include "../src/lib/list.h" + +Test(list, simple) { + int v; + int *list = list_create(sizeof(int), 16); + cr_assert_not_null(list); + cr_assert_eq(list_size(list), 0); + + v = 1; + list = list_append(list, &v); + cr_assert_not_null(list); + cr_assert_eq(list_size(list), 1); + cr_assert_eq(list[0], 1); + + v = 3; + list = list_append(list, &v); + cr_assert_not_null(list); + cr_assert_eq(list_size(list), 2); + cr_assert_eq(list[0], 1); + cr_assert_eq(list[1], 3); + + v = 2; + list = list_insert(list, &v, 1); + cr_assert_not_null(list); + cr_assert_eq(list_size(list), 3); + cr_assert_eq(list[0], 1); + cr_assert_eq(list[1], 2); + cr_assert_eq(list[2], 3); + + list = list_remove(list, 0); + cr_assert_not_null(list); + cr_assert_eq(list_size(list), 2); + cr_assert_eq(list[0], 2); + cr_assert_eq(list[1], 3); + + list = list_remove(list, 1); + cr_assert_not_null(list); + cr_assert_eq(list_size(list), 1); + cr_assert_eq(list[0], 2); + + list = list_remove(list, 0); + cr_assert_not_null(list); + cr_assert_eq(list_size(list), 0); + + list_free(list); +} + +Test(list, resize) { + int v; + int *list = list_create(sizeof(int), 4); + cr_assert_not_null(list); + cr_assert_eq(list_size(list), 0); + + for (int i = 0; i < 4096; i++) { + v = 9182 - i; + list = list_append(list, &v); + cr_assert_not_null(list); + cr_assert_eq(list_size(list), i + 1); + } + + for (int i = 0; i < 4096; i++) { + list = list_remove(list, -1); + cr_assert_not_null(list); + cr_assert_eq(list_size(list), 4096 - i - 1); + } + + for (int i = 0; i < 4096; i++) { + v = 9182 - i; + list = list_append(list, &v); + cr_assert_not_null(list); + cr_assert_eq(list_size(list), i + 1); + } + + list = list_clear(list); + cr_assert_not_null(list); + cr_assert_eq(list_size(list), 0); + + list_free(list); +}