}
}
-static void server_release(server_t *server)
+void server_release(server_t *server)
{
server_wipe(server);
array_add(server_pool, server);
static void server_shutdown(void)
{
+ printf("Server shutdown");
array_deep_wipe(listeners, server_delete);
array_deep_wipe(server_pool, server_delete);
}
tmp = server_acquire();
tmp->fd = sock;
tmp->listener = true;
+ tmp->event = false;
tmp->data = data;
tmp->clear_data = deleter;
epoll_register(sock, EPOLLIN, tmp);
}
tmp = server_acquire();
+ tmp->listener = false;
+ tmp->event = false;
tmp->fd = sock;
tmp->data = data;
tmp->clear_data = deleter;
return 0;
}
-event_t event_register(int fd, void *data)
+server_t * event_register(int fd, void *data)
{
int fds[2];
if (fd == -1) {
}
server_t *tmp = server_acquire();
+ tmp->listener = false;
tmp->event = true;
tmp->fd = fd == -1 ? fds[0] : fd;
tmp->fd2 = fd == -1 ? fds[1] : -1;
return tmp;
}
-bool event_fire(event_t event)
+bool event_fire(server_t *event)
{
static const char *data = "";
if (event->fd2 == -1) {
return write(event->fd2, data, 1) == 0;
}
-static bool event_cancel(event_t event)
+bool event_cancel(server_t *event)
{
char buff[32];
while (true) {
}
}
+void event_release(server_t *event)
+{
+ epoll_unregister(event->fd);
+ server_release(event);
+}
+
int server_loop(start_client_t starter, delete_client_t deleter,
run_client_t runner, event_handler_t handler,
refresh_t refresh, void* config)
(void)start_client(d, starter, deleter);
continue;
} else if (d->event) {
- if (!event_cancel(d)) {
- server_release(d);
- continue;
- }
if (handler) {
if (!handler(d, config)) {
- server_release(d);
+ event_release(d);
}
+ } else {
+ event_release(d);
}
continue;
}