From patchwork Wed Aug 21 02:15:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pingfan liu X-Patchwork-Id: 268673 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5C9942C0119 for ; Wed, 21 Aug 2013 12:17:24 +1000 (EST) Received: from localhost ([::1]:51097 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBxz8-0008C2-Fx for incoming@patchwork.ozlabs.org; Tue, 20 Aug 2013 22:17:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33900) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBxyb-0007tI-Bx for qemu-devel@nongnu.org; Tue, 20 Aug 2013 22:16:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VBxyS-0002vZ-Ud for qemu-devel@nongnu.org; Tue, 20 Aug 2013 22:16:49 -0400 Received: from mail-pb0-x229.google.com ([2607:f8b0:400e:c01::229]:46163) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBxyS-0002vP-OI for qemu-devel@nongnu.org; Tue, 20 Aug 2013 22:16:40 -0400 Received: by mail-pb0-f41.google.com with SMTP id rp2so1138304pbb.0 for ; Tue, 20 Aug 2013 19:16:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vMVKdU2wx+P/QUEfI+Dq3xij5/adsxdLbT4pxRVKRCE=; b=wVrHjsoZVVwUIFf7X/a+zpB7X9OyEFU2ZODjV43AbpB8QrCJx3UTciKA/PhODqF0KI +b2H/cMY2PxbVCeOD8O69tWeVp83tPYUSiEi66q2Lxv0tyvS+M4CDQuQGnv+4WOGHx1E 6+yJKyHVX6ztgWv9uWMXlB5j6bW7sKwk7xdudc6KUmQooMBZ0Rx1CtUUeqJn1D6of8/w 3ytIkkgNXqAAGUbhQkGhwP/bOrUJhTsAeXw2Ey2lM9T7uFSVN5Qa3btRMtjiGpfdE0RR DHqQ0mCTjTEAz00ny8sFaN2hxfK6yrgVnWmCItFrOwHHk8I9OV8PuB5M91ddmYsKSy4e 4wBg== X-Received: by 10.66.171.77 with SMTP id as13mr296682pac.170.1377051400060; Tue, 20 Aug 2013 19:16:40 -0700 (PDT) Received: from localhost ([111.192.245.86]) by mx.google.com with ESMTPSA id os4sm5060772pbb.25.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 20 Aug 2013 19:16:38 -0700 (PDT) From: Liu Ping Fan To: qemu-devel@nongnu.org Date: Wed, 21 Aug 2013 10:15:52 +0800 Message-Id: <1377051352-23499-4-git-send-email-pingfank@linux.vnet.ibm.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1377051352-23499-1-git-send-email-pingfank@linux.vnet.ibm.com> References: <1377051352-23499-1-git-send-email-pingfank@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c01::229 Cc: Jan Kiszka , Stefan Hajnoczi , Paolo Bonzini Subject: [Qemu-devel] [PATCH v3 3/3] slirp: set mainloop timeout with more precise value 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 If slirp needs to emulate tcp timeout, then the timeout value for mainloop should be more precise, which is determined by slirp's fasttimo or slowtimo. Achieve this by swap the logic sequence of slirp_pollfds_fill and slirp_update_timeout. Signed-off-by: Liu Ping Fan --- main-loop.c | 3 +-- slirp/libslirp.h | 3 +-- slirp/slirp.c | 28 ++++++++++++++++++++++++---- stubs/slirp.c | 6 +----- 4 files changed, 27 insertions(+), 13 deletions(-) diff --git a/main-loop.c b/main-loop.c index a44fff6..e258567 100644 --- a/main-loop.c +++ b/main-loop.c @@ -458,8 +458,7 @@ int main_loop_wait(int nonblocking) g_array_set_size(gpollfds, 0); /* reset for new iteration */ /* XXX: separate device handlers from system ones */ #ifdef CONFIG_SLIRP - slirp_update_timeout(&timeout); - slirp_pollfds_fill(gpollfds); + slirp_pollfds_fill(gpollfds, &timeout); #endif qemu_iohandler_fill(gpollfds); ret = os_host_main_loop_wait(timeout); diff --git a/slirp/libslirp.h b/slirp/libslirp.h index ceabff8..5bdcbd5 100644 --- a/slirp/libslirp.h +++ b/slirp/libslirp.h @@ -16,8 +16,7 @@ Slirp *slirp_init(int restricted, struct in_addr vnetwork, void *opaque); void slirp_cleanup(Slirp *slirp); -void slirp_update_timeout(uint32_t *timeout); -void slirp_pollfds_fill(GArray *pollfds); +void slirp_pollfds_fill(GArray *pollfds, uint32_t *timeout); void slirp_pollfds_poll(GArray *pollfds, int select_error); diff --git a/slirp/slirp.c b/slirp/slirp.c index 1e8983e..f312a7d 100644 --- a/slirp/slirp.c +++ b/slirp/slirp.c @@ -260,14 +260,33 @@ void slirp_cleanup(Slirp *slirp) #define CONN_CANFSEND(so) (((so)->so_state & (SS_FCANTSENDMORE|SS_ISFCONNECTED)) == SS_ISFCONNECTED) #define CONN_CANFRCV(so) (((so)->so_state & (SS_FCANTRCVMORE|SS_ISFCONNECTED)) == SS_ISFCONNECTED) -void slirp_update_timeout(uint32_t *timeout) +static void slirp_update_timeout(uint32_t *timeout) { - if (!QTAILQ_EMPTY(&slirp_instances)) { - *timeout = MIN(1000, *timeout); + Slirp *slirp; + uint32_t t; + + *timeout = MIN(1000, *timeout); + if (*timeout <= TIMEOUT_FAST) { + return; + } + t = *timeout; + + /* If we have tcp timeout with slirp, then we will fill @timeout with + * more precise value. + */ + QTAILQ_FOREACH(slirp, &slirp_instances, entry) { + if (slirp->time_fasttimo) { + *timeout = TIMEOUT_FAST; + return; + } + if (slirp->do_slowtimo) { + t = MIN(TIMEOUT_SLOW, t); + } } + *timeout = t; } -void slirp_pollfds_fill(GArray *pollfds) +void slirp_pollfds_fill(GArray *pollfds, uint32_t *timeout) { Slirp *slirp; struct socket *so, *so_next; @@ -437,6 +456,7 @@ void slirp_pollfds_fill(GArray *pollfds) } } } + slirp_update_timeout(timeout); } void slirp_pollfds_poll(GArray *pollfds, int select_error) diff --git a/stubs/slirp.c b/stubs/slirp.c index f1fc833..bd0ac7f 100644 --- a/stubs/slirp.c +++ b/stubs/slirp.c @@ -1,11 +1,7 @@ #include "qemu-common.h" #include "slirp/slirp.h" -void slirp_update_timeout(uint32_t *timeout) -{ -} - -void slirp_pollfds_fill(GArray *pollfds) +void slirp_pollfds_fill(GArray *pollfds, uint32_t *timeout) { }