diff options
| author | Andrei Gudkov <gudkov.andrei@huawei.com> | 2023-08-28 20:55:57 +0800 |
|---|---|---|
| committer | Hyman Huang <yong.huang@smartx.com> | 2023-08-29 10:19:03 +0800 |
| commit | 3eb82637fbf8c0471990b59e6733fd4beb1f9939 (patch) | |
| tree | c91b4a98e63f82559e0b9d1bd29869f2cbfd1ad8 | |
| parent | 19b14cea453b7429a06922fe96e55e6b32fe718a (diff) | |
| download | focaccia-qemu-3eb82637fbf8c0471990b59e6733fd4beb1f9939.tar.gz focaccia-qemu-3eb82637fbf8c0471990b59e6733fd4beb1f9939.zip | |
migration/dirtyrate: Fix precision losses and g_usleep overshoot
Signed-off-by: Andrei Gudkov <gudkov.andrei@huawei.com> Reviewed-by: Hyman Huang <yong.huang@smartx.com> Message-Id: <8ddb0d40d143f77aab8f602bd494e01e5fa01614.1691161009.git.gudkov.andrei@huawei.com> Signed-off-by: Hyman Huang <yong.huang@smartx.com>
| -rw-r--r-- | migration/dirtyrate.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c index 84f1b0fb20..bccb3515e3 100644 --- a/migration/dirtyrate.c +++ b/migration/dirtyrate.c @@ -57,6 +57,8 @@ static int64_t dirty_stat_wait(int64_t msec, int64_t initial_time) msec = current_time - initial_time; } else { g_usleep((msec + initial_time - current_time) * 1000); + /* g_usleep may overshoot */ + msec = qemu_clock_get_ms(QEMU_CLOCK_REALTIME) - initial_time; } return msec; @@ -77,9 +79,13 @@ static int64_t do_calculate_dirtyrate(DirtyPageRecord dirty_pages, { uint64_t increased_dirty_pages = dirty_pages.end_pages - dirty_pages.start_pages; - uint64_t memory_size_MiB = qemu_target_pages_to_MiB(increased_dirty_pages); - return memory_size_MiB * 1000 / calc_time_ms; + /* + * multiply by 1000ms/s _before_ converting down to megabytes + * to avoid losing precision + */ + return qemu_target_pages_to_MiB(increased_dirty_pages * 1000) / + calc_time_ms; } void global_dirty_log_change(unsigned int flag, bool start) |