From 49839c88a98d3798f7b18c58f54f26f36cacff38 Mon Sep 17 00:00:00 2001 From: Guangxiong Lin Date: Fri, 9 Dec 2022 16:46:49 +0800 Subject: Implement a simple thread pool and refactor Refactor --- server.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'server.c') diff --git a/server.c b/server.c index f4ad78d..8525689 100644 --- a/server.c +++ b/server.c @@ -10,27 +10,31 @@ #include #include -#include "eventloop.h" +#include "evloop.h" #include "tsocket.h" #include "util.h" -#include "connection.h" #include "acceptor.h" +#include "tpool.h" int main() { - struct eventLoop *el = eventLoopNew(); + evloop_t *el = evloop_create(); if (el == NULL) panic("eventloop creation"); - struct tsocket *sock = tsocketNew(); + struct tsocket *sock = tsocket_create(); if (sock == NULL - || tsocketBind(sock, "127.0.0.1", 8888) == -1 - || tsocketListen(sock) == -1) + || tsocket_bind(sock, "127.0.0.1", 8888) == -1 + || tsocket_listen(sock) == -1) panic("socket creation"); - struct event *acceptEvent = connAcceptorNewEvent(sock, el); - if (eventLoopAdd(el, acceptEvent, EPOLLIN) == -1) + tpool = tpool_create(0); + if (!tpool) + panic("tpool_create"); + + event_t *acceptEvent = conn_acceptor_create_event(sock, el); + if (evloop_add(el, acceptEvent, EPOLLIN) == -1) panic("eventloop add fd"); - eventLoopLoop(el); + evloop_loop(el); } -- cgit v1.2.3