{
server->listener = server->event = false;
if (server->fd > 0) {
+ epoll_modify(server->fd, 0, NULL);
close(server->fd);
server->fd = -1;
}
if (server->data && server->clear_data) {
server->clear_data(&server->data);
}
- array_shrink(server->ibuf, 512);
- array_shrink(server->obuf, 512);
}
static void server_delete(server_t **server)
}
}
-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;
}
-int event_register(void *data)
+server_t * event_register(int fd, void *data)
{
int fds[2];
- if (pipe(fds) != 0) {
- UNIXERR("pipe");
- return -1;
- }
- if (setnonblock(fds[0]) != 0) {
- close(fds[0]);
- close(fds[1]);
- return -1;
+ if (fd == -1) {
+ if (pipe(fds) != 0) {
+ UNIXERR("pipe");
+ return NULL;
+ }
+ if (setnonblock(fds[0]) != 0) {
+ close(fds[0]);
+ close(fds[1]);
+ return NULL;
+ }
}
server_t *tmp = server_acquire();
+ tmp->listener = false;
tmp->event = true;
- tmp->fd = fds[0];
- tmp->fd2 = fds[1];
+ tmp->fd = fd == -1 ? fds[0] : fd;
+ tmp->fd2 = fd == -1 ? fds[1] : -1;
tmp->data = data;
epoll_register(fds[0], EPOLLIN, tmp);
- return tmp->fd2;
+ return tmp;
}
-bool event_fire(int event)
+bool event_fire(server_t *event)
{
static const char *data = "";
- return write(event, data, 1) == 0;
+ if (event->fd2 == -1) {
+ return false;
+ }
+ return write(event->fd2, data, 1) == 0;
}
-static bool event_cancel(int event)
+bool event_cancel(server_t *event)
{
- static char buff[1];
+ char buff[32];
while (true) {
- ssize_t res = read(event, buff, 64);
+ ssize_t res = read(event->fd, buff, 32);
if (res == -1 && errno != EAGAIN && errno != EINTR) {
UNIXERR("read");
return false;
} else if (res == -1 && errno == EINTR) {
continue;
- } else if (res != 1) {
+ } else if (res != 32) {
return 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) {
+ refresh_t refresh, void* config)
+{
info("entering processing loop");
while (!sigint) {
struct epoll_event evts[1024];
(void)start_client(d, starter, deleter);
continue;
} else if (d->event) {
- if (!event_cancel(d->fd)) {
- server_release(d);
- continue;
- }
if (handler) {
- if (!handler(d->data, config)) {
- server_release(d);
+ if (!handler(d, config)) {
+ event_release(d);
}
+ } else {
+ event_release(d);
}
continue;
}