From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:44321) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RML7g-0000ry-Ln for qemu-devel@nongnu.org; Fri, 04 Nov 2011 10:52:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RML7f-0003En-C8 for qemu-devel@nongnu.org; Fri, 04 Nov 2011 10:52:00 -0400 Received: from mail-gy0-f173.google.com ([209.85.160.173]:61816) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RML7f-0003Co-6b for qemu-devel@nongnu.org; Fri, 04 Nov 2011 10:51:59 -0400 Received: by mail-gy0-f173.google.com with SMTP id 11so1197703gyb.4 for ; Fri, 04 Nov 2011 07:51:59 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 4 Nov 2011 15:51:23 +0100 Message-Id: <1320418284-11081-7-git-send-email-pbonzini@redhat.com> In-Reply-To: <1320418284-11081-1-git-send-email-pbonzini@redhat.com> References: <1320418284-11081-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 6/7] qemu-nbd: fix socket creation race List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com Now that the client and server are in the same process, there is no need to race on the creation of the socket. We can open the listening socket before starting the client thread. This avoids that "qemu-nbd -v -c" prints this once before connecting successfully to the socket: connect(unix:/var/lock/qemu-nbd-nbd0): No such file or directory Signed-off-by: Paolo Bonzini --- qemu-nbd.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qemu-nbd.c b/qemu-nbd.c index 7490008..20fe4b5 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -204,10 +204,7 @@ static void *nbd_client_thread(void *arg) do { sock = unix_socket_outgoing(sockpath); if (sock == -1) { - if (errno != ENOENT && errno != ECONNREFUSED) { - goto out; - } - sleep(1); /* wait parent */ + goto out; } } while (sock == -1); @@ -484,8 +481,6 @@ int main(int argc, char **argv) err(EXIT_FAILURE, "Could not find partition %d", partition); if (device) { - int ret; - /* Open before spawning new threads. In the future, we may * drop privileges after opening. */ @@ -498,15 +493,6 @@ int main(int argc, char **argv) sockpath = g_malloc(128); snprintf(sockpath, 128, SOCKET_PATH, basename(device)); } - - ret = pthread_create(&client_thread, NULL, nbd_client_thread, &fd); - if (ret != 0) { - errx(EXIT_FAILURE, "Failed to create client thread: %s", - strerror(ret)); - } - } else { - /* Shut up GCC warnings. */ - memset(&client_thread, 0, sizeof(client_thread)); } sharing_fds = g_malloc((shared + 1) * sizeof(int)); @@ -519,6 +505,20 @@ int main(int argc, char **argv) if (sharing_fds[0] == -1) return 1; + + if (device) { + int ret; + + ret = pthread_create(&client_thread, NULL, nbd_client_thread, &fd); + if (ret != 0) { + errx(EXIT_FAILURE, "Failed to create client thread: %s", + strerror(ret)); + } + } else { + /* Shut up GCC warnings. */ + memset(&client_thread, 0, sizeof(client_thread)); + } + max_fd = sharing_fds[0]; nb_fds++; -- 1.7.6.4