First stab at adding job options to json output

[fio.git] / server.c

diff --git a/server.c b/server.c
index 6d96a66fa30262022851e6e14847a9fd013c735f..ca17f9a301ab87ef5116c210363f727122f8d37a 100644 (file)
--- a/server.c
+++ b/server.c
@@ -1889,7 +1889,7 @@ static int fio_init_server_connection(void)
 
        log_info("fio: server listening on %s\n", bind_str);
 
-       if (listen(sk, 0) < 0) {
+       if (listen(sk, 4) < 0) {
                log_err("fio: listen: %s\n", strerror(errno));
                close(sk);
                return -1;
@@ -2084,6 +2084,13 @@ static int fio_server(void)
 {
        int sk, ret;
 
+       if (pthread_key_create(&sk_out_key, NULL)) {
+               log_err("fio: can't create sk_out backend key\n");
+               return -1;
+       }
+
+       pthread_setspecific(sk_out_key, NULL);
+
        dprint(FD_NET, "starting server\n");
 
        if (fio_handle_server_arg())
@@ -2095,9 +2102,6 @@ static int fio_server(void)
 
        set_sig_handlers();
 
-       if (pthread_key_create(&sk_out_key, NULL))
-               log_err("fio: can't create sk_out backend key\n");
-
        ret = accept_loop(sk);
 
        close(sk);