1 files changed, 13 insertions, 9 deletions
diff --git a/server.c b/server.c
index f4ad78d..8525689 100644
--- a/server.c
+++ b/server.c
@@ -10,27 +10,31 @@
 #include <sys/epoll.h>
 #include <errno.h>
 
-#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);
 }