From patchwork Mon Aug 13 10:50:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 176906 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 AC44E2C0088 for ; Mon, 13 Aug 2012 20:51:27 +1000 (EST) Received: from localhost ([::1]:51373 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T0sF3-0001Tq-Oy for incoming@patchwork.ozlabs.org; Mon, 13 Aug 2012 06:51:25 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58547) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T0sEl-0001Hg-Hq for qemu-devel@nongnu.org; Mon, 13 Aug 2012 06:51:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T0sEk-0003EQ-1V for qemu-devel@nongnu.org; Mon, 13 Aug 2012 06:51:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45789) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T0sEj-0003DX-PV for qemu-devel@nongnu.org; Mon, 13 Aug 2012 06:51:05 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q7DAp5Vr020126 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 13 Aug 2012 06:51:05 -0400 Received: from trasno.mitica (ovpn-116-54.ams2.redhat.com [10.36.116.54]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q7DAowcL014566; Mon, 13 Aug 2012 06:51:03 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 13 Aug 2012 12:50:53 +0200 Message-Id: <1344855057-32509-4-git-send-email-quintela@redhat.com> In-Reply-To: <1344855057-32509-1-git-send-email-quintela@redhat.com> References: <1344855057-32509-1-git-send-email-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: eblake@redhat.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH 3/7] migration: print total downtime for final phase of migration 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 Signed-off-by: Juan Quintela Reviewed-by: Eric Blake --- hmp.c | 4 ++++ migration.c | 5 ++++- migration.h | 1 + qapi-schema.json | 6 +++++- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/hmp.c b/hmp.c index c0b0a10..10fee1b 100644 --- a/hmp.c +++ b/hmp.c @@ -151,6 +151,10 @@ void hmp_info_migrate(Monitor *mon) monitor_printf(mon, "Migration status: %s\n", info->status); monitor_printf(mon, "total time: %" PRIu64 " milliseconds\n", info->total_time); + if (strcmp(info->status, "completed") == 0) { + monitor_printf(mon, "downtime: %" PRIu64 " milliseconds\n", + info->downtime); + } } if (info->has_ram) { diff --git a/migration.c b/migration.c index 159728d..4c2ac6c 100644 --- a/migration.c +++ b/migration.c @@ -194,6 +194,7 @@ MigrationInfo *qmp_query_migrate(Error **errp) info->has_status = true; info->status = g_strdup("completed"); info->total_time = s->total_time; + info->downtime = s->downtime; info->has_ram = true; info->ram = g_malloc0(sizeof(*info->ram)); @@ -326,9 +327,10 @@ static void migrate_fd_put_ready(void *opaque) migrate_fd_error(s); } else if (ret == 1) { int old_vm_running = runstate_is_running(); - int64_t end_time; + int64_t start_time, end_time; DPRINTF("done iterating\n"); + start_time = qemu_get_clock_ms(rt_clock); qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER); vm_stop_force_state(RUN_STATE_FINISH_MIGRATE); @@ -339,6 +341,7 @@ static void migrate_fd_put_ready(void *opaque) } end_time = qemu_get_clock_ms(rt_clock); s->total_time = end_time - s->total_time; + s->downtime = end_time - start_time; if (s->state != MIG_STATE_COMPLETED) { if (old_vm_running) { vm_start(); diff --git a/migration.h b/migration.h index a9852fc..3462917 100644 --- a/migration.h +++ b/migration.h @@ -40,6 +40,7 @@ struct MigrationState void *opaque; MigrationParams params; int64_t total_time; + int64_t downtime; bool enabled_capabilities[MIGRATION_CAPABILITY_MAX]; int64_t xbzrle_cache_size; }; diff --git a/qapi-schema.json b/qapi-schema.json index 907051a..6df1ce3 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -319,13 +319,17 @@ # If migration has ended, it returns the total migration # time. (since 1.2) # +# @downtime: total downtime in milliseconds for the guest. +# (since 1.2) +# # Since: 0.14.0 ## { 'type': 'MigrationInfo', 'data': {'*status': 'str', '*ram': 'MigrationStats', '*disk': 'MigrationStats', '*xbzrle-cache': 'XBZRLECacheStats', - 'total-time': 'int'} } + 'total-time': 'int', + 'downtime': 'int'} } ## # @query-migrate