From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47885) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWbnS-00033A-CI for qemu-devel@nongnu.org; Wed, 03 Jan 2018 00:41:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWbnP-0000ut-4l for qemu-devel@nongnu.org; Wed, 03 Jan 2018 00:41:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42658) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eWbnO-0000uE-Sr for qemu-devel@nongnu.org; Wed, 03 Jan 2018 00:40:59 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0C6D67E423 for ; Wed, 3 Jan 2018 05:40:58 +0000 (UTC) From: Peter Xu Date: Wed, 3 Jan 2018 13:40:36 +0800 Message-Id: <20180103054043.25719-5-peterx@redhat.com> In-Reply-To: <20180103054043.25719-1-peterx@redhat.com> References: <20180103054043.25719-1-peterx@redhat.com> Subject: [Qemu-devel] [PATCH 04/11] migration: split use of MigrationState.total_time List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Laurent Vivier , Juan Quintela , "Dr . David Alan Gilbert" , peterx@redhat.com It was used either to: 1. store initial timestamp of migration start, and 2. store total time used by last migration Let's provide two parameters for each of them. Mix use of the two is slightly misleading. Signed-off-by: Peter Xu --- migration/migration.c | 13 +++++++------ migration/migration.h | 5 ++++- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 20f7565527..b684c2005d 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -613,7 +613,7 @@ MigrationInfo *qmp_query_migrate(Error **errp) info->has_status = true; info->has_total_time = true; info->total_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME) - - s->total_time; + - s->mig_start_time; info->has_expected_downtime = true; info->expected_downtime = s->expected_downtime; info->has_setup_time = true; @@ -629,7 +629,7 @@ MigrationInfo *qmp_query_migrate(Error **errp) case MIGRATION_STATUS_COMPLETED: info->has_status = true; info->has_total_time = true; - info->total_time = s->total_time; + info->total_time = s->mig_total_time; info->has_downtime = true; info->downtime = s->downtime; info->has_setup_time = true; @@ -1270,7 +1270,8 @@ MigrationState *migrate_init(void) migrate_set_state(&s->state, MIGRATION_STATUS_NONE, MIGRATION_STATUS_SETUP); - s->total_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); + s->mig_start_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); + s->mig_total_time = 0; return s; } @@ -2293,13 +2294,13 @@ static void *migration_thread(void *opaque) qemu_mutex_lock_iothread(); if (s->state == MIGRATION_STATUS_COMPLETED) { uint64_t transferred_bytes = qemu_ftell(s->to_dst_file); - s->total_time = end_time - s->total_time; + s->mig_total_time = end_time - s->mig_start_time; if (!entered_postcopy) { s->downtime = end_time - start_time; } - if (s->total_time) { + if (s->mig_total_time) { s->mbps = (((double) transferred_bytes * 8.0) / - ((double) s->total_time)) / 1000; + ((double) s->mig_total_time)) / 1000; } runstate_set(RUN_STATE_POSTMIGRATE); } else { diff --git a/migration/migration.h b/migration/migration.h index 663415fe48..ac74a12713 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -103,7 +103,10 @@ struct MigrationState } rp_state; double mbps; - int64_t total_time; + /* Timestamp when recent migration starts (ms) */ + int64_t mig_start_time; + /* Total time used by latest migration (ms) */ + int64_t mig_total_time; int64_t downtime; int64_t expected_downtime; bool enabled_capabilities[MIGRATION_CAPABILITY__MAX]; -- 2.14.3