From patchwork Fri Dec 23 15:26:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 133095 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4CD07B714C for ; Sat, 24 Dec 2011 03:19:10 +1100 (EST) Received: from localhost ([::1]:40197 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Re74X-00052t-SG for incoming@patchwork.ozlabs.org; Fri, 23 Dec 2011 10:30:13 -0500 Received: from eggs.gnu.org ([140.186.70.92]:41457) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Re74D-00047o-5x for qemu-devel@nongnu.org; Fri, 23 Dec 2011 10:29:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Re74C-0006np-1A for qemu-devel@nongnu.org; Fri, 23 Dec 2011 10:29:53 -0500 Received: from mail-gx0-f173.google.com ([209.85.161.173]:54035) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Re74B-0006gC-Ud for qemu-devel@nongnu.org; Fri, 23 Dec 2011 10:29:51 -0500 Received: by mail-gx0-f173.google.com with SMTP id k1so8050701ggn.4 for ; Fri, 23 Dec 2011 07:29:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=3zVU4N2m2CfbSUz6zJYoTEkNYFhgGfpvGmKAc7UofiA=; b=LXuS/FfI4HlcBhNJDqQKPM/nHtq5zm4zsiTd+qVav+alc1su09pJ1FdA61WGCGS1X5 nbecEFJ8hCPlswt6eweVGmyVxMHUFVtzxCo8+vPUxG+7m8Nk/c7jJuD5+u7kJuhIj7Xd 11lX3+fnpgqVCbOj/8PSIMK1UPVXRNQk6RlkQ= Received: by 10.50.188.132 with SMTP id ga4mr16998958igc.4.1324654191102; Fri, 23 Dec 2011 07:29:51 -0800 (PST) Received: from localhost.localdomain (93-34-178-147.ip50.fastwebnet.it. [93.34.178.147]) by mx.google.com with ESMTPS id aq5sm42055557igc.5.2011.12.23.07.29.46 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 23 Dec 2011 07:29:50 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 23 Dec 2011 16:26:25 +0100 Message-Id: <1324653990-20074-22-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.7.1 In-Reply-To: <1324653990-20074-1-git-send-email-pbonzini@redhat.com> References: <1324653990-20074-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.161.173 Subject: [Qemu-devel] [PATCH 21/26] qemu-nbd: use common main loop X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Using a single main loop for sockets will help yielding from the socket coroutine back to the main loop, and later reentering it. Signed-off-by: Paolo Bonzini --- qemu-nbd.c | 112 ++++++++++++++++++++++++------------------------------------ 1 files changed, 45 insertions(+), 67 deletions(-) diff --git a/qemu-nbd.c b/qemu-nbd.c index d5ac75e..347c776 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -35,12 +35,15 @@ #define SOCKET_PATH "/var/lock/qemu-nbd-%s" -static int sigterm_wfd; static NBDExport *exp; static int verbose; static char *device; static char *srcpath; static char *sockpath; +static bool sigterm_reported; +static bool nbd_started; +static int shared = 1; +static int nb_fds; static void usage(const char *name) { @@ -169,10 +172,8 @@ static int find_partition(BlockDriverState *bs, int partition, static void termsig_handler(int signum) { - static int sigterm_reported; - if (!sigterm_reported) { - sigterm_reported = (write(sigterm_wfd, "", 1) == 1); - } + sigterm_reported = true; + qemu_notify_event(); } static void *show_parts(void *arg) @@ -243,6 +244,36 @@ out: return (void *) EXIT_FAILURE; } +static int nbd_can_accept(void *opaque) +{ + return nb_fds < shared; +} + +static void nbd_read(void *opaque) +{ + int fd = (uintptr_t) opaque; + + if (nbd_trip(exp, fd) != 0) { + qemu_set_fd_handler2(fd, NULL, NULL, NULL, NULL); + close(fd); + nb_fds--; + } +} + +static void nbd_accept(void *opaque) +{ + int server_fd = (uintptr_t) opaque; + struct sockaddr_in addr; + socklen_t addr_len = sizeof(addr); + + int fd = accept(server_fd, (struct sockaddr *)&addr, &addr_len); + nbd_started = true; + if (fd != -1 && nbd_negotiate(exp, fd) != -1) { + qemu_set_fd_handler2(fd, NULL, nbd_read, NULL, (void *) (intptr_t) fd); + nb_fds++; + } +} + int main(int argc, char **argv) { BlockDriverState *bs; @@ -251,8 +282,6 @@ int main(int argc, char **argv) bool disconnect = false; const char *bindto = "0.0.0.0"; int port = NBD_DEFAULT_PORT; - struct sockaddr_in addr; - socklen_t addr_len = sizeof(addr); off_t fd_size; const char *sopt = "hVb:o:p:rsnP:c:dvk:e:t"; struct option lopt[] = { @@ -280,13 +309,7 @@ int main(int argc, char **argv) int flags = BDRV_O_RDWR; int partition = -1; int ret; - int shared = 1; - fd_set fds; - int *sharing_fds; int fd; - int i; - int nb_fds = 0; - int max_fd; int persistent = 0; pthread_t client_thread; @@ -294,12 +317,6 @@ int main(int argc, char **argv) * handler ensures that "qemu-nbd -v -c" exits with a nice status code. */ struct sigaction sa_sigterm; - int sigterm_fd[2]; - if (qemu_pipe(sigterm_fd) == -1) { - err(EXIT_FAILURE, "Error setting up communication pipe"); - } - - sigterm_wfd = sigterm_fd[1]; memset(&sa_sigterm, 0, sizeof(sa_sigterm)); sa_sigterm.sa_handler = termsig_handler; sigaction(SIGTERM, &sa_sigterm, NULL); @@ -490,16 +507,16 @@ int main(int argc, char **argv) } exp = nbd_export_new(bs, dev_offset, fd_size, nbdflags); - sharing_fds = g_malloc((shared + 1) * sizeof(int)); if (sockpath) { - sharing_fds[0] = unix_socket_incoming(sockpath); + fd = unix_socket_incoming(sockpath); } else { - sharing_fds[0] = tcp_socket_incoming(bindto, port); + fd = tcp_socket_incoming(bindto, port); } - if (sharing_fds[0] == -1) + if (fd == -1) { return 1; + } if (device) { int ret; @@ -514,54 +531,15 @@ int main(int argc, char **argv) memset(&client_thread, 0, sizeof(client_thread)); } - max_fd = sharing_fds[0]; - nb_fds++; + qemu_init_main_loop(); + qemu_set_fd_handler2(fd, nbd_can_accept, nbd_accept, NULL, + (void *)(uintptr_t)fd); do { - FD_ZERO(&fds); - FD_SET(sigterm_fd[0], &fds); - for (i = 0; i < nb_fds; i++) - FD_SET(sharing_fds[i], &fds); - - do { - ret = select(max_fd + 1, &fds, NULL, NULL, NULL); - } while (ret == -1 && errno == EINTR); - if (ret == -1 || FD_ISSET(sigterm_fd[0], &fds)) { - break; - } - - if (FD_ISSET(sharing_fds[0], &fds)) - ret--; - for (i = 1; i < nb_fds && ret; i++) { - if (FD_ISSET(sharing_fds[i], &fds)) { - if (nbd_trip(exp, sharing_fds[i]) != 0) { - close(sharing_fds[i]); - nb_fds--; - sharing_fds[i] = sharing_fds[nb_fds]; - i--; - } - ret--; - } - } - /* new connection ? */ - if (FD_ISSET(sharing_fds[0], &fds)) { - if (nb_fds < shared + 1) { - sharing_fds[nb_fds] = accept(sharing_fds[0], - (struct sockaddr *)&addr, - &addr_len); - if (sharing_fds[nb_fds] != -1 && - nbd_negotiate(exp, sharing_fds[nb_fds]) != -1) { - if (sharing_fds[nb_fds] > max_fd) - max_fd = sharing_fds[nb_fds]; - nb_fds++; - } - } - } - } while (persistent || nb_fds > 1); + main_loop_wait(false); + } while (!sigterm_reported && (persistent || !nbd_started || nb_fds > 0)); - close(sharing_fds[0]); nbd_export_close(exp); - g_free(sharing_fds); if (sockpath) { unlink(sockpath); }