{
server_t* server = p_new(server_t, 1);
server->fd = -1;
- server->fd2 = -1;
return server;
}
static void server_wipe(server_t *server)
{
- server->listener = server->event = false;
- if (server->fd > 0) {
+ server->listener = false;
+ if (server->fd >= 0) {
+ epoll_unregister(server->fd);
close(server->fd);
server->fd = -1;
}
- if (server->fd2 > 0) {
- close(server->fd2);
- server->fd2 = -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->fd = sock;
tmp->listener = true;
tmp->data = data;
+ tmp->run = NULL;
tmp->clear_data = deleter;
epoll_register(sock, EPOLLIN, tmp);
array_add(listeners, tmp);
}
static int start_client(server_t *server, start_client_t starter,
- delete_client_t deleter)
+ run_client_t runner, delete_client_t deleter)
{
server_t *tmp;
void* data = NULL;
}
tmp = server_acquire();
+ tmp->listener = false;
tmp->fd = sock;
tmp->data = data;
+ tmp->run = runner;
tmp->clear_data = deleter;
epoll_register(sock, EPOLLIN, tmp);
return 0;
}
-event_t event_register(void *data)
+server_t *server_register(int fd, run_client_t runner, void *data)
{
- int fds[2];
- if (pipe(fds) != 0) {
- UNIXERR("pipe");
- return INVALID_EVENT;
- }
- if (setnonblock(fds[0]) != 0) {
- close(fds[0]);
- close(fds[1]);
- return INVALID_EVENT;
+ if (fd < 0) {
+ return NULL;
}
- server_t *tmp = server_acquire();
- tmp->event = true;
- tmp->fd = fds[0];
- tmp->fd2 = fds[1];
- tmp->data = data;
- epoll_register(fds[0], EPOLLIN, tmp);
- return tmp->fd2;
-}
-
-bool event_fire(event_t event)
-{
- static const char *data = "";
- return write(event, data, 1) == 0;
-}
-
-static bool event_cancel(int event)
-{
- char buff[32];
- while (true) {
- ssize_t res = read(event, buff, 32);
- if (res == -1 && errno != EAGAIN && errno != EINTR) {
- UNIXERR("read");
- return false;
- } else if (res == -1 && errno == EINTR) {
- continue;
- } else if (res != 32) {
- return true;
- }
- }
+ server_t *tmp = server_acquire();
+ tmp->listener = false;
+ tmp->fd = fd;
+ tmp->data = data;
+ tmp->run = runner;
+ tmp->clear_data = NULL;
+ epoll_register(fd, EPOLLIN, tmp);
+ return tmp;
}
int server_loop(start_client_t starter, delete_client_t deleter,
- run_client_t runner, event_handler_t handler,
- refresh_t refresh, void* config) {
+ run_client_t runner, refresh_t refresh, void* config)
+{
info("entering processing loop");
while (!sigint) {
struct epoll_event evts[1024];
server_t *d = evts[n].data.ptr;
if (d->listener) {
- (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);
- }
- }
+ (void)start_client(d, starter, runner, deleter);
continue;
}
- if (evts[n].events & EPOLLIN) {
- if (runner(d, config) < 0) {
- server_release(d);
- continue;
- }
- }
-
if ((evts[n].events & EPOLLOUT) && d->obuf.len) {
if (buffer_write(&d->obuf, d->fd) < 0) {
server_release(d);
epoll_modify(d->fd, EPOLLIN, d);
}
}
+
+ if (evts[n].events & EPOLLIN) {
+ if (d->run(d, config) < 0) {
+ server_release(d);
+ }
+ continue;
+ }
}
}
info("exit requested");