X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Ffrontend%2Fsock.c;h=3b9799496df8bf1e70d501393e36b91de0ebd86e;hp=b5a3dcdd6a2082af6f0b6ab0a75e23fb9a9b99dc;hb=39a45905e0b237e458b1826ff9b4fad1c4a59550;hpb=e78462d85dd6147ca1ff5a1e52d2ed5b6d1297a1

diff --git a/src/frontend/sock.c b/src/frontend/sock.c
index b5a3dcd..3b97994 100644
--- a/src/frontend/sock.c
+++ b/src/frontend/sock.c
@@ -25,6 +25,10 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_CONFIG_H
+#	include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #include "sysdb.h"
 #include "core/object.h"
 #include "frontend/connection-private.h"
@@ -238,7 +242,7 @@ listener_create(sdb_fe_socket_t *sock, const char *address)
 	}
 
 	listener = realloc(sock->listeners,
-			sock->listeners_num * sizeof(*sock->listeners));
+			(sock->listeners_num + 1) * sizeof(*sock->listeners));
 	if (! listener) {
 		char buf[1024];
 		sdb_log(SDB_LOG_ERR, "frontend: Failed to allocate memory: %s",
@@ -452,11 +456,11 @@ sdb_fe_sock_listen_and_serve(sdb_fe_socket_t *sock, sdb_fe_loop_t *loop)
 	int max_listen_fd = 0;
 	size_t i;
 
-	/* XXX: make the number of threads configurable */
-	pthread_t handler_threads[5];
+	pthread_t handler_threads[loop->num_threads];
 	size_t num_threads;
 
-	if ((! sock) || (! sock->listeners_num) || (! loop) || sock->chan)
+	if ((! sock) || (! sock->listeners_num) || sock->chan
+			|| (! loop) || (loop->num_threads <= 0))
 		return -1;
 
 	if (! loop->do_loop)
@@ -482,7 +486,12 @@ sdb_fe_sock_listen_and_serve(sdb_fe_socket_t *sock, sdb_fe_loop_t *loop)
 		return -1;
 	}
 
-	num_threads = SDB_STATIC_ARRAY_LEN(handler_threads);
+	sdb_log(SDB_LOG_INFO, "frontend: Starting %d connection "
+			"handler thread%s managing %d listener%s",
+			loop->num_threads, loop->num_threads == 1 ? "" : "s",
+			sock->listeners_num, sock->listeners_num == 1 ? "" : "s");
+
+	num_threads = loop->num_threads;
 	memset(&handler_threads, 0, sizeof(handler_threads));
 	for (i = 0; i < num_threads; ++i) {
 		errno = 0;