| Message ID | 20180626181932.11909-9-quintela@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v16,01/14] migration: Create multipage support | expand |
* Juan Quintela (quintela@redhat.com) wrote: > This will include how many bytes they are sent through multifd. > > Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > hmp.c | 2 ++ > migration/migration.c | 1 + > qapi/migration.json | 5 ++++- > 3 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/hmp.c b/hmp.c > index f601099f90..0da0b0ac33 100644 > --- a/hmp.c > +++ b/hmp.c > @@ -234,6 +234,8 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict) > info->ram->dirty_sync_count); > monitor_printf(mon, "page size: %" PRIu64 " kbytes\n", > info->ram->page_size >> 10); > + monitor_printf(mon, "multifd bytes: %" PRIu64 " kbytes\n", > + info->ram->multifd_bytes >> 10); > > if (info->ram->dirty_pages_rate) { > monitor_printf(mon, "dirty pages rate: %" PRIu64 " pages\n", > diff --git a/migration/migration.c b/migration/migration.c > index 264f3ce84e..2680ba2d47 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -708,6 +708,7 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s) > info->ram->dirty_sync_count = ram_counters.dirty_sync_count; > info->ram->postcopy_requests = ram_counters.postcopy_requests; > info->ram->page_size = qemu_target_page_size(); > + info->ram->multifd_bytes = ram_counters.multifd_bytes; > > if (migrate_use_xbzrle()) { > info->has_xbzrle_cache = true; > diff --git a/qapi/migration.json b/qapi/migration.json > index 1b4c1db670..186e8a7303 100644 > --- a/qapi/migration.json > +++ b/qapi/migration.json > @@ -39,6 +39,8 @@ > # @page-size: The number of bytes per page for the various page-based > # statistics (since 2.10) > # > +# @multifd-bytes: The number of bytes sent through multifd (since 3.0) > +# > # Since: 0.14.0 > ## > { 'struct': 'MigrationStats', > @@ -46,7 +48,8 @@ > 'duplicate': 'int', 'skipped': 'int', 'normal': 'int', > 'normal-bytes': 'int', 'dirty-pages-rate' : 'int', > 'mbps' : 'number', 'dirty-sync-count' : 'int', > - 'postcopy-requests' : 'int', 'page-size' : 'int' } } > + 'postcopy-requests' : 'int', 'page-size' : 'int', > + 'multifd-bytes' : 'uint64' } } > > ## > # @XBZRLECacheStats: > -- > 2.17.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/hmp.c b/hmp.c index f601099f90..0da0b0ac33 100644 --- a/hmp.c +++ b/hmp.c @@ -234,6 +234,8 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict) info->ram->dirty_sync_count); monitor_printf(mon, "page size: %" PRIu64 " kbytes\n", info->ram->page_size >> 10); + monitor_printf(mon, "multifd bytes: %" PRIu64 " kbytes\n", + info->ram->multifd_bytes >> 10); if (info->ram->dirty_pages_rate) { monitor_printf(mon, "dirty pages rate: %" PRIu64 " pages\n", diff --git a/migration/migration.c b/migration/migration.c index 264f3ce84e..2680ba2d47 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -708,6 +708,7 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s) info->ram->dirty_sync_count = ram_counters.dirty_sync_count; info->ram->postcopy_requests = ram_counters.postcopy_requests; info->ram->page_size = qemu_target_page_size(); + info->ram->multifd_bytes = ram_counters.multifd_bytes; if (migrate_use_xbzrle()) { info->has_xbzrle_cache = true; diff --git a/qapi/migration.json b/qapi/migration.json index 1b4c1db670..186e8a7303 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -39,6 +39,8 @@ # @page-size: The number of bytes per page for the various page-based # statistics (since 2.10) # +# @multifd-bytes: The number of bytes sent through multifd (since 3.0) +# # Since: 0.14.0 ## { 'struct': 'MigrationStats', @@ -46,7 +48,8 @@ 'duplicate': 'int', 'skipped': 'int', 'normal': 'int', 'normal-bytes': 'int', 'dirty-pages-rate' : 'int', 'mbps' : 'number', 'dirty-sync-count' : 'int', - 'postcopy-requests' : 'int', 'page-size' : 'int' } } + 'postcopy-requests' : 'int', 'page-size' : 'int', + 'multifd-bytes' : 'uint64' } } ## # @XBZRLECacheStats:
This will include how many bytes they are sent through multifd. Signed-off-by: Juan Quintela <quintela@redhat.com> --- hmp.c | 2 ++ migration/migration.c | 1 + qapi/migration.json | 5 ++++- 3 files changed, 7 insertions(+), 1 deletion(-)