diff --git a/src/frontend/sock.c b/src/frontend/sock.c
index 65884ea945bf61fe935b48fe60ab819b453b1eb8..b5a3dcdd6a2082af6f0b6ab0a75e23fb9a9b99dc 100644 (file)
--- a/src/frontend/sock.c
+++ b/src/frontend/sock.c
const char *prefix;
int (*opener)(listener_t *);
+ void (*closer)(listener_t *);
} fe_listener_impl_t;
struct sdb_fe_socket {
return 0;
} /* open_unix_sock */
+static void
+close_unix_sock(listener_t *listener)
+{
+ assert(listener);
+ if (! listener->address)
+ return;
+
+ if (listener->sock_fd >= 0)
+ close(listener->sock_fd);
+ listener->sock_fd = -1;
+
+ unlink(listener->address + strlen("unix:"));
+} /* close_unix_sock */
+
/*
* private variables
*/
LISTENER_UNIXSOCK = 0,
};
static fe_listener_impl_t listener_impls[] = {
- { LISTENER_UNIXSOCK, "unix", open_unix_sock },
+ { LISTENER_UNIXSOCK, "unix", open_unix_sock, close_unix_sock },
};
/*
* private helper functions
*/
+static int
+listener_listen(listener_t *listener)
+{
+ assert(listener);
+
+ /* try to reopen */
+ if (listener->sock_fd < 0)
+ if (listener_impls[listener->type].opener(listener))
+ return -1;
+ assert(listener->sock_fd >= 0);
+
+ if (listen(listener->sock_fd, /* backlog = */ 32)) {
+ char buf[1024];
+ sdb_log(SDB_LOG_ERR, "frontend: Failed to listen on socket %s: %s",
+ listener->address, sdb_strerror(errno, buf, sizeof(buf)));
+ return -1;
+ }
+ return 0;
+} /* listener_listen */
+
+static void
+listener_close(listener_t *listener)
+{
+ assert(listener);
+
+ if (listener_impls[listener->type].closer)
+ listener_impls[listener->type].closer(listener);
+
+ if (listener->sock_fd >= 0)
+ close(listener->sock_fd);
+ listener->sock_fd = -1;
+} /* listener_close */
+
static int
get_type(const char *address)
{
if (! listener)
return;
- if (listener->sock_fd >= 0)
- close(listener->sock_fd);
- listener->sock_fd = -1;
+ listener_close(listener);
if (listener->address)
free(listener->address);
+ listener->address = NULL;
} /* listener_destroy */
static listener_t *
return listener;
} /* listener_create */
-static int
-listener_listen(listener_t *listener)
-{
- assert(listener);
-
- /* try to reopen */
- if (listener->sock_fd < 0)
- if (listener_impls[listener->type].opener(listener))
- return -1;
- assert(listener->sock_fd >= 0);
-
- if (listen(listener->sock_fd, /* backlog = */ 32)) {
- char buf[1024];
- sdb_log(SDB_LOG_ERR, "frontend: Failed to listen on socket %s: %s",
- listener->address, sdb_strerror(errno, buf, sizeof(buf)));
- return -1;
- }
- return 0;
-} /* listener_listen */
-
-static void
-listener_close(listener_t *listener)
-{
- assert(listener);
-
- if (listener->sock_fd < 0)
- return;
-
- close(listener->sock_fd);
- listener->sock_fd = -1;
-} /* listener_close */
-
static void
socket_close(sdb_fe_socket_t *sock)
{
/* XXX: make the number of threads configurable */
pthread_t handler_threads[5];
+ size_t num_threads;
if ((! sock) || (! sock->listeners_num) || (! loop) || sock->chan)
return -1;
+ if (! loop->do_loop)
+ return 0;
+
FD_ZERO(&sockets);
for (i = 0; i < sock->listeners_num; ++i) {
listener_t *listener = sock->listeners + i;
return -1;
}
+ num_threads = SDB_STATIC_ARRAY_LEN(handler_threads);
memset(&handler_threads, 0, sizeof(handler_threads));
- /* XXX: error handling */
- for (i = 0; i < SDB_STATIC_ARRAY_LEN(handler_threads); ++i)
- pthread_create(&handler_threads[i], /* attr = */ NULL,
- connection_handler, /* arg = */ sock);
+ for (i = 0; i < num_threads; ++i) {
+ errno = 0;
+ if (pthread_create(&handler_threads[i], /* attr = */ NULL,
+ connection_handler, /* arg = */ sock)) {
+ char errbuf[1024];
+ sdb_log(SDB_LOG_ERR, "frontend: Failed to create "
+ "connection handler thread: %s",
+ sdb_strerror(errno, errbuf, sizeof(errbuf)));
+ num_threads = i;
+ break;
+ }
+ }
- while (loop->do_loop) {
+ while (loop->do_loop && num_threads) {
struct timeval timeout = { 1, 0 }; /* one second */
sdb_llist_iter_t *iter;
sdb_log(SDB_LOG_INFO, "frontend: Waiting for connection handler threads "
"to terminate");
if (! sdb_channel_shutdown(sock->chan))
- for (i = 0; i < SDB_STATIC_ARRAY_LEN(handler_threads); ++i)
+ for (i = 0; i < num_threads; ++i)
pthread_join(handler_threads[i], NULL);
/* else: we tried our best; let the operating system clean up */
sdb_channel_destroy(sock->chan);
sock->chan = NULL;
+
+ if (! num_threads)
+ return -1;
return 0;
} /* sdb_fe_sock_listen_and_server */