From 84f93cf7b7768cbf522c75c4e3fe204cf6fd785c Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Mon, 5 Jan 2015 14:17:49 +0100 Subject: [SERVER] Use a thread pool for client connections --- src/server/net.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/server/net.c') diff --git a/src/server/net.c b/src/server/net.c index 8e5189f..9525456 100644 --- a/src/server/net.c +++ b/src/server/net.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -118,7 +117,7 @@ static inline bool send_reply(int sock, dnbd3_reply_t *reply, void *payload) void *net_client_handler(void *dnbd3_client) { - dnbd3_client_t *client = (dnbd3_client_t *)(uintptr_t)dnbd3_client; + dnbd3_client_t *client = (dnbd3_client_t *)dnbd3_client; dnbd3_request_t request; dnbd3_reply_t reply; @@ -136,9 +135,6 @@ void *net_client_handler(void *dnbd3_client) dnbd3_server_entry_t server_list[NUMBER_SERVERS]; - // Block some signals not important to this thread - blockNoncriticalSignals(); - // Set to zero to make valgrind happy memset( &reply, 0, sizeof(reply) ); memset( &payload, 0, sizeof(payload) ); @@ -359,8 +355,7 @@ void *net_client_handler(void *dnbd3_client) exit_client_cleanup: ; if ( image_file != -1 ) close( image_file ); dnbd3_remove_client( client ); - client->running = false; client = dnbd3_free_client( client ); - pthread_exit( NULL ); return NULL ; } + -- cgit v1.2.3-55-g7522