mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migration: Abstract the number of bytes sent

Browse Source 
Right now we use the "position" inside the QEMUFile, but things like
RDMA already do weird things to be able to maintain that counter
right, and multifd will have some similar problems.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Juan Quintela 2018-06-26 15:38:00 +02:00
parent 6cde6fbe2b
commit 0c8f0efdd4
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
migration/migration.c
View File

@ -2704,9 +2704,15 @@ static MigThrError migration_detect_error(MigrationState *s)
} }
} }
/* How many bytes have we transferred since the beggining of the migration */
static uint64_t migration_total_bytes(MigrationState *s)
{
return qemu_ftell(s->to_dst_file);
}
static void migration_calculate_complete(MigrationState *s) static void migration_calculate_complete(MigrationState *s)
{ {
uint64_t bytes = qemu_ftell(s->to_dst_file); uint64_t bytes = migration_total_bytes(s);
int64_t end_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); int64_t end_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
int64_t transfer_time; int64_t transfer_time;
@ -2729,13 +2735,15 @@ static void migration_update_counters(MigrationState *s,
int64_t current_time) int64_t current_time)
{ {
uint64_t transferred, time_spent; uint64_t transferred, time_spent;
uint64_t current_bytes; /* bytes transferred since the beginning */
double bandwidth; double bandwidth;
if (current_time < s->iteration_start_time + BUFFER_DELAY) { if (current_time < s->iteration_start_time + BUFFER_DELAY) {
return; return;
} }
transferred = qemu_ftell(s->to_dst_file) - s->iteration_initial_bytes; current_bytes = migration_total_bytes(s);
transferred = current_bytes - s->iteration_initial_bytes;
time_spent = current_time - s->iteration_start_time; time_spent = current_time - s->iteration_start_time;
bandwidth = (double)transferred / time_spent; bandwidth = (double)transferred / time_spent;
s->threshold_size = bandwidth * s->parameters.downtime_limit; s->threshold_size = bandwidth * s->parameters.downtime_limit;
@ -2754,7 +2762,7 @@ static void migration_update_counters(MigrationState *s,
qemu_file_reset_rate_limit(s->to_dst_file); qemu_file_reset_rate_limit(s->to_dst_file);
s->iteration_start_time = current_time; s->iteration_start_time = current_time;
s->iteration_initial_bytes = qemu_ftell(s->to_dst_file); s->iteration_initial_bytes = current_bytes;
trace_migrate_transferred(transferred, time_spent, trace_migrate_transferred(transferred, time_spent,
bandwidth, s->threshold_size); bandwidth, s->threshold_size);