From patchwork Thu Mar 22 03:52:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amos Kong X-Patchwork-Id: 148157 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DDCF7B6EE7 for ; Thu, 22 Mar 2012 14:53:21 +1100 (EST) Received: from localhost ([::1]:56651 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SAZ5T-0002eS-NM for incoming@patchwork.ozlabs.org; Wed, 21 Mar 2012 23:53:19 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37302) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SAZ52-0001oH-Kx for qemu-devel@nongnu.org; Wed, 21 Mar 2012 23:52:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SAZ50-00031O-4I for qemu-devel@nongnu.org; Wed, 21 Mar 2012 23:52:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:12647) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SAZ4z-00031C-Sy for qemu-devel@nongnu.org; Wed, 21 Mar 2012 23:52:50 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q2M3qkP4009155 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 21 Mar 2012 23:52:46 -0400 Received: from dhcp-8-167.nay.redhat.com (dhcp-8-167.nay.redhat.com [10.66.8.167]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q2M3qhK5029260; Wed, 21 Mar 2012 23:52:43 -0400 To: aliguori@us.ibm.com, kvm@vger.kernel.org, quintela@redhat.com, jasowang@redhat.com, qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com, owasserm@redhat.com, laine@redhat.com From: Amos Kong Date: Thu, 22 Mar 2012 11:52:45 +0800 Message-ID: <20120322035245.2431.59699.stgit@dhcp-8-167.nay.redhat.com> In-Reply-To: <20120322035052.2431.4994.stgit@dhcp-8-167.nay.redhat.com> References: <20120322035052.2431.4994.stgit@dhcp-8-167.nay.redhat.com> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v5 2/4] qemu-socket: change inet_connect() to to support nonblock socket 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 Change inet_connect(const char *str, int socktype) to inet_connect(const char *str, bool block), socktype is unused, block is used to assign if set socket to block/nonblock. Retry to connect when -EINTR/-EWOULDBLOCK is got. Connect's successful for nonblock socket when following errors are got: -EINPROGRESS -WSAEALREADY/-WSAEINVAL (win32) Add a bool entry(block) for dummy_opts to tag block type. Use set_socket_error() to set real errno, set errno to EINVAL for parse error. Change nbd, vnc to use new interface. Signed-off-by: Amos Kong --- nbd.c | 2 +- qemu-sockets.c | 66 +++++++++++++++++++++++++++++++++++++++++++------------- qemu_socket.h | 2 +- ui/vnc.c | 2 +- 4 files changed, 54 insertions(+), 18 deletions(-) diff --git a/nbd.c b/nbd.c index 567e94e..3618344 100644 --- a/nbd.c +++ b/nbd.c @@ -146,7 +146,7 @@ int tcp_socket_outgoing(const char *address, uint16_t port) int tcp_socket_outgoing_spec(const char *address_and_port) { - return inet_connect(address_and_port, SOCK_STREAM); + return inet_connect(address_and_port, true); } int tcp_socket_incoming(const char *address, uint16_t port) diff --git a/qemu-sockets.c b/qemu-sockets.c index 6bcb8e3..908479e 100644 --- a/qemu-sockets.c +++ b/qemu-sockets.c @@ -51,6 +51,9 @@ static QemuOptsList dummy_opts = { },{ .name = "ipv6", .type = QEMU_OPT_BOOL, + },{ + .name = "block", + .type = QEMU_OPT_BOOL, }, { /* end if list */ } }, @@ -201,7 +204,8 @@ int inet_connect_opts(QemuOpts *opts) const char *port; char uaddr[INET6_ADDRSTRLEN+1]; char uport[33]; - int sock,rc; + int sock, rc, err; + bool block; memset(&ai,0, sizeof(ai)); ai.ai_flags = AI_CANONNAME | AI_ADDRCONFIG; @@ -210,9 +214,11 @@ int inet_connect_opts(QemuOpts *opts) addr = qemu_opt_get(opts, "host"); port = qemu_opt_get(opts, "port"); + block = qemu_opt_get_bool(opts, "block", 0); if (addr == NULL || port == NULL) { fprintf(stderr, "inet_connect: host and/or port not specified\n"); - return -1; + err = -EINVAL; + goto err; } if (qemu_opt_get_bool(opts, "ipv4", 0)) @@ -224,7 +230,8 @@ int inet_connect_opts(QemuOpts *opts) if (0 != (rc = getaddrinfo(addr, port, &ai, &res))) { fprintf(stderr,"getaddrinfo(%s,%s): %s\n", addr, port, gai_strerror(rc)); - return -1; + err = -EINVAL; + goto err; } for (e = res; e != NULL; e = e->ai_next) { @@ -241,21 +248,44 @@ int inet_connect_opts(QemuOpts *opts) continue; } setsockopt(sock,SOL_SOCKET,SO_REUSEADDR,(void*)&on,sizeof(on)); - + if (!block) { + socket_set_nonblock(sock); + } /* connect to peer */ - if (connect(sock,e->ai_addr,e->ai_addrlen) < 0) { - if (NULL == e->ai_next) - fprintf(stderr, "%s: connect(%s,%s,%s,%s): %s\n", __FUNCTION__, - inet_strfamily(e->ai_family), - e->ai_canonname, uaddr, uport, strerror(errno)); - closesocket(sock); - continue; + do { + err = 0; + if (connect(sock, e->ai_addr, e->ai_addrlen) < 0) { + err = -socket_error(); + } + } while (err == -EINTR || err == -EWOULDBLOCK); + + if (err >= 0) { + goto success; + } else if (!block && err == -EINPROGRESS) { + goto success; +#ifdef _WIN32 + } else if (!block && (err == -WSAEALREADY || err == -WSAEINVAL)) { + goto success; +#endif } - freeaddrinfo(res); - return sock; + + if (NULL == e->ai_next) { + fprintf(stderr, "%s: connect(%s,%s,%s,%s): %s\n", __func__, + inet_strfamily(e->ai_family), + e->ai_canonname, uaddr, uport, strerror(errno)); + } + closesocket(sock); } freeaddrinfo(res); + +err: + set_socket_error(-err); return -1; + +success: + freeaddrinfo(res); + set_socket_error(-err); + return sock; } int inet_dgram_opts(QemuOpts *opts) @@ -449,14 +479,20 @@ int inet_listen(const char *str, char *ostr, int olen, return sock; } -int inet_connect(const char *str, int socktype) +int inet_connect(const char *str, bool block) { QemuOpts *opts; int sock = -1; opts = qemu_opts_create(&dummy_opts, NULL, 0); - if (inet_parse(opts, str) == 0) + if (inet_parse(opts, str) == 0) { + if (block) { + qemu_opt_set(opts, "block", "on"); + } sock = inet_connect_opts(opts); + } else { + set_socket_error(EINVAL); + } qemu_opts_del(opts); return sock; } diff --git a/qemu_socket.h b/qemu_socket.h index a4c5170..f86cd3f 100644 --- a/qemu_socket.h +++ b/qemu_socket.h @@ -47,7 +47,7 @@ int inet_listen_opts(QemuOpts *opts, int port_offset); int inet_listen(const char *str, char *ostr, int olen, int socktype, int port_offset); int inet_connect_opts(QemuOpts *opts); -int inet_connect(const char *str, int socktype); +int inet_connect(const char *str, bool block); int inet_dgram_opts(QemuOpts *opts); const char *inet_strfamily(int family); diff --git a/ui/vnc.c b/ui/vnc.c index deb9ecd..4a96153 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3068,7 +3068,7 @@ int vnc_display_open(DisplayState *ds, const char *display) if (strncmp(display, "unix:", 5) == 0) vs->lsock = unix_connect(display+5); else - vs->lsock = inet_connect(display, SOCK_STREAM); + vs->lsock = inet_connect(display, true); if (-1 == vs->lsock) { g_free(vs->display); vs->display = NULL;