From patchwork Wed Apr 21 05:57:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshiaki Tamura X-Patchwork-Id: 50634 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F3B41B6EEB for ; Wed, 21 Apr 2010 17:05:41 +1000 (EST) Received: from localhost ([127.0.0.1]:55095 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4Tyv-0000rx-Rw for incoming@patchwork.ozlabs.org; Wed, 21 Apr 2010 03:04:21 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O4T10-0003PV-Lu for qemu-devel@nongnu.org; Wed, 21 Apr 2010 02:02:27 -0400 Received: from [140.186.70.92] (port=36746 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4T0c-0002y5-8n for qemu-devel@nongnu.org; Wed, 21 Apr 2010 02:02:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O4T0B-0006hf-Fi for qemu-devel@nongnu.org; Wed, 21 Apr 2010 02:02:00 -0400 Received: from sh.osrg.net ([192.16.179.4]:35928) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O4T09-0006e3-8v for qemu-devel@nongnu.org; Wed, 21 Apr 2010 02:01:33 -0400 Received: from fs.osrg.net (postfix@fs.osrg.net [10.0.0.12]) by sh.osrg.net (8.14.3/8.14.3/OSRG-NET) with ESMTP id o3L61Qhb004086; Wed, 21 Apr 2010 15:01:26 +0900 Received: from localhost (hype-wd0.osrg.net [10.72.1.16]) by fs.osrg.net (Postfix) with ESMTP id 3106D3E02F6; Wed, 21 Apr 2010 15:01:25 +0900 (JST) From: Yoshiaki Tamura To: kvm@vger.kernel.org, qemu-devel@nongnu.org Date: Wed, 21 Apr 2010 14:57:14 +0900 Message-Id: <1271829445-5328-10-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Mailer: git-send-email 1.7.0.31.g1df487 In-Reply-To: <1271829445-5328-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1271829445-5328-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Dispatcher: imput version 20070423(IM149) Lines: 114 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Wed, 21 Apr 2010 15:01:26 +0900 (JST) X-Virus-Scanned: clamav-milter 0.95.3 at sh X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: aliguori@us.ibm.com, ohmura.kei@lab.ntt.co.jp, mtosatti@redhat.com, Yoshiaki Tamura , yoshikawa.takuya@oss.ntt.co.jp, avi@redhat.com Subject: [Qemu-devel] [RFC PATCH 09/20] Introduce writev and read to FdMigrationState. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Currently FdMigrationState doesn't support writev() and read(). writev() is introduced to send data efficiently, and read() is necessary to get response from the other side. Signed-off-by: Yoshiaki Tamura --- migration-tcp.c | 20 ++++++++++++++++++++ migration.c | 27 +++++++++++++++++++++++++++ migration.h | 6 ++++++ 3 files changed, 53 insertions(+), 0 deletions(-) diff --git a/migration-tcp.c b/migration-tcp.c index e7f307c..56e1a3b 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -39,6 +39,24 @@ static int socket_write(FdMigrationState *s, const void * buf, size_t size) return send(s->fd, buf, size, 0); } +static int socket_read(FdMigrationState *s, const void * buf, size_t size) +{ + ssize_t len; + + do { + len = recv(s->fd, (void *)buf, size, 0); + } while (len == -1 && socket_error() == EINTR); + if (len == -1) + len = -socket_error(); + + return len; +} + +static int socket_writev(FdMigrationState *s, const struct iovec *v, int count) +{ + return writev(s->fd, v, count); +} + static int tcp_close(FdMigrationState *s) { DPRINTF("tcp_close\n"); @@ -94,6 +112,8 @@ MigrationState *tcp_start_outgoing_migration(Monitor *mon, s->get_error = socket_errno; s->write = socket_write; + s->writev = socket_writev; + s->read = socket_read; s->close = tcp_close; s->mig_state.cancel = migrate_fd_cancel; s->mig_state.get_status = migrate_fd_get_status; diff --git a/migration.c b/migration.c index 05f6cc5..5d238f5 100644 --- a/migration.c +++ b/migration.c @@ -337,6 +337,33 @@ ssize_t migrate_fd_put_buffer(void *opaque, const void *data, size_t size) return ret; } +int migrate_fd_get_buffer(void *opaque, uint8_t *data, int64_t pos, int size) +{ + FdMigrationState *s = opaque; + ssize_t ret; + ret = s->read(s, data, size); + + if (ret == -1) + ret = -(s->get_error(s)); + + return ret; +} + +ssize_t migrate_fd_put_vector(void *opaque, const struct iovec *vector, int count) +{ + FdMigrationState *s = opaque; + ssize_t ret; + + do { + ret = s->writev(s, vector, count); + } while (ret == -1 && ((s->get_error(s)) == EINTR)); + + if (ret == -1) + ret = -(s->get_error(s)); + + return ret; +} + void migrate_fd_connect(FdMigrationState *s) { int ret; diff --git a/migration.h b/migration.h index 385423f..ddc1d42 100644 --- a/migration.h +++ b/migration.h @@ -47,6 +47,8 @@ struct FdMigrationState int (*get_error)(struct FdMigrationState*); int (*close)(struct FdMigrationState*); int (*write)(struct FdMigrationState*, const void *, size_t); + int (*writev)(struct FdMigrationState*, const struct iovec *, int); + int (*read)(struct FdMigrationState *, const void *, size_t); void *opaque; }; @@ -113,6 +115,10 @@ void migrate_fd_put_notify(void *opaque); ssize_t migrate_fd_put_buffer(void *opaque, const void *data, size_t size); +ssize_t migrate_fd_put_vector(void *opaque, const struct iovec *iov, int count); + +int migrate_fd_get_buffer(void *opaque, uint8_t *data, int64_t pos, int size); + void migrate_fd_connect(FdMigrationState *s); void migrate_fd_put_ready(void *opaque);