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

ram: Move bytes_xfer_prev into RAMState

Browse Source 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
This commit is contained in:
Juan Quintela 2017-03-28 14:59:01 +02:00
parent f664da80fc
commit eac7415958
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
migration/ram.c
View File

@ -157,6 +157,8 @@ struct RAMState {
/* these variables are used for bitmap sync */ /* these variables are used for bitmap sync */
/* last time we did a full bitmap_sync */ /* last time we did a full bitmap_sync */
int64_t time_last_bitmap_sync; int64_t time_last_bitmap_sync;
/* bytes transferred at start_time */
int64_t bytes_xfer_prev;
}; };
typedef struct RAMState RAMState; typedef struct RAMState RAMState;
@ -620,14 +622,13 @@ static void migration_bitmap_sync_range(ram_addr_t start, ram_addr_t length)
} }
/* Fix me: there are too many global variables used in migration process. */ /* Fix me: there are too many global variables used in migration process. */
static int64_t bytes_xfer_prev;
static uint64_t xbzrle_cache_miss_prev; static uint64_t xbzrle_cache_miss_prev;
static uint64_t iterations_prev; static uint64_t iterations_prev;
static void migration_bitmap_sync_init(RAMState *rs) static void migration_bitmap_sync_init(RAMState *rs)
{ {
rs->time_last_bitmap_sync = 0; rs->time_last_bitmap_sync = 0;
bytes_xfer_prev = 0; rs->bytes_xfer_prev = 0;
num_dirty_pages_period = 0; num_dirty_pages_period = 0;
xbzrle_cache_miss_prev = 0; xbzrle_cache_miss_prev = 0;
iterations_prev = 0; iterations_prev = 0;
@ -663,8 +664,8 @@ static void migration_bitmap_sync(RAMState *rs)
rs->bitmap_sync_count++; rs->bitmap_sync_count++;
if (!bytes_xfer_prev) { if (!rs->bytes_xfer_prev) {
bytes_xfer_prev = ram_bytes_transferred(); rs->bytes_xfer_prev = ram_bytes_transferred();
} }
if (!rs->time_last_bitmap_sync) { if (!rs->time_last_bitmap_sync) {
@ -698,13 +699,13 @@ static void migration_bitmap_sync(RAMState *rs)
if (s->dirty_pages_rate && if (s->dirty_pages_rate &&
(num_dirty_pages_period * TARGET_PAGE_SIZE > (num_dirty_pages_period * TARGET_PAGE_SIZE >
(bytes_xfer_now - bytes_xfer_prev)/2) && (bytes_xfer_now - rs->bytes_xfer_prev) / 2) &&
(rs->dirty_rate_high_cnt++ >= 2)) { (rs->dirty_rate_high_cnt++ >= 2)) {
trace_migration_throttle(); trace_migration_throttle();
rs->dirty_rate_high_cnt = 0; rs->dirty_rate_high_cnt = 0;
mig_throttle_guest_down(); mig_throttle_guest_down();
} }
bytes_xfer_prev = bytes_xfer_now; rs->bytes_xfer_prev = bytes_xfer_now;
} }
if (migrate_use_xbzrle()) { if (migrate_use_xbzrle()) {