Patchwork [05/41] migration: rename expected_time to expected_downtime

login
register
mail settings
Submitter Juan Quintela
Date Sept. 21, 2012, 8:46 a.m.
Message ID <1348217255-22441-6-git-send-email-quintela@redhat.com>
Download mbox | patch
Permalink /patch/185619/
State New
Headers show

Comments

Juan Quintela - Sept. 21, 2012, 8:46 a.m.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 arch_init.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
Paolo Bonzini - Sept. 21, 2012, 12:19 p.m.
Il 21/09/2012 10:46, Juan Quintela ha scritto:
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  arch_init.c | 20 ++++++++++----------
>  1 file changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/arch_init.c b/arch_init.c
> index cdd8ab7..013e5e5 100644
> --- a/arch_init.c
> +++ b/arch_init.c
> @@ -539,7 +539,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
>      double bwidth = 0;
>      int ret;
>      int i;
> -    uint64_t expected_time;
> +    uint64_t expected_downtime;
> 
>      bytes_transferred_last = bytes_transferred;
>      bwidth = qemu_get_clock_ns(rt_clock);
> @@ -578,24 +578,24 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
>      bwidth = qemu_get_clock_ns(rt_clock) - bwidth;
>      bwidth = (bytes_transferred - bytes_transferred_last) / bwidth;
> 
> -    /* if we haven't transferred anything this round, force expected_time to a
> -     * a very high value, but without crashing */
> +    /* if we haven't transferred anything this round, force
> +     * expected_downtime to a very high value, but without
> +     * crashing */
>      if (bwidth == 0) {
>          bwidth = 0.000001;
>      }
> 
>      qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
> 
> -    expected_time = ram_save_remaining() * TARGET_PAGE_SIZE / bwidth;
> +    expected_downtime = ram_save_remaining() * TARGET_PAGE_SIZE / bwidth;
> +    DPRINTF("ram_save_live: expected(%" PRIu64 ") <= max(" PRIu64 ")?\n",
> +            expected_downtime, migrate_max_downtime());
> 
> -    DPRINTF("ram_save_live: expected(%" PRIu64 ") <= max(%" PRIu64 ")?\n",
> -            expected_time, migrate_max_downtime());
> -
> -    if (expected_time <= migrate_max_downtime()) {
> +    if (expected_downtime <= migrate_max_downtime()) {
>          memory_global_sync_dirty_bitmap(get_system_memory());
> -        expected_time = ram_save_remaining() * TARGET_PAGE_SIZE / bwidth;
> +        expected_downtime = ram_save_remaining() * TARGET_PAGE_SIZE / bwidth;
> 
> -        return expected_time <= migrate_max_downtime();
> +        return expected_downtime <= migrate_max_downtime();
>      }
>      return 0;
>  }
> 

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Orit Wasserman - Sept. 25, 2012, 8:21 a.m.
On 09/21/2012 11:46 AM, Juan Quintela wrote:
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  arch_init.c | 20 ++++++++++----------
>  1 file changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/arch_init.c b/arch_init.c
> index cdd8ab7..013e5e5 100644
> --- a/arch_init.c
> +++ b/arch_init.c
> @@ -539,7 +539,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
>      double bwidth = 0;
>      int ret;
>      int i;
> -    uint64_t expected_time;
> +    uint64_t expected_downtime;
> 
>      bytes_transferred_last = bytes_transferred;
>      bwidth = qemu_get_clock_ns(rt_clock);
> @@ -578,24 +578,24 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
>      bwidth = qemu_get_clock_ns(rt_clock) - bwidth;
>      bwidth = (bytes_transferred - bytes_transferred_last) / bwidth;
> 
> -    /* if we haven't transferred anything this round, force expected_time to a
> -     * a very high value, but without crashing */
> +    /* if we haven't transferred anything this round, force
> +     * expected_downtime to a very high value, but without
> +     * crashing */
>      if (bwidth == 0) {
>          bwidth = 0.000001;
>      }
> 
>      qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
> 
> -    expected_time = ram_save_remaining() * TARGET_PAGE_SIZE / bwidth;
> +    expected_downtime = ram_save_remaining() * TARGET_PAGE_SIZE / bwidth;
> +    DPRINTF("ram_save_live: expected(%" PRIu64 ") <= max(" PRIu64 ")?\n",
> +            expected_downtime, migrate_max_downtime());
> 
> -    DPRINTF("ram_save_live: expected(%" PRIu64 ") <= max(%" PRIu64 ")?\n",
> -            expected_time, migrate_max_downtime());
> -
> -    if (expected_time <= migrate_max_downtime()) {
> +    if (expected_downtime <= migrate_max_downtime()) {
>          memory_global_sync_dirty_bitmap(get_system_memory());
> -        expected_time = ram_save_remaining() * TARGET_PAGE_SIZE / bwidth;
> +        expected_downtime = ram_save_remaining() * TARGET_PAGE_SIZE / bwidth;
> 
> -        return expected_time <= migrate_max_downtime();
> +        return expected_downtime <= migrate_max_downtime();
>      }
>      return 0;
>  }
> 

Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Patch

diff --git a/arch_init.c b/arch_init.c
index cdd8ab7..013e5e5 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -539,7 +539,7 @@  static int ram_save_iterate(QEMUFile *f, void *opaque)
     double bwidth = 0;
     int ret;
     int i;
-    uint64_t expected_time;
+    uint64_t expected_downtime;

     bytes_transferred_last = bytes_transferred;
     bwidth = qemu_get_clock_ns(rt_clock);
@@ -578,24 +578,24 @@  static int ram_save_iterate(QEMUFile *f, void *opaque)
     bwidth = qemu_get_clock_ns(rt_clock) - bwidth;
     bwidth = (bytes_transferred - bytes_transferred_last) / bwidth;

-    /* if we haven't transferred anything this round, force expected_time to a
-     * a very high value, but without crashing */
+    /* if we haven't transferred anything this round, force
+     * expected_downtime to a very high value, but without
+     * crashing */
     if (bwidth == 0) {
         bwidth = 0.000001;
     }

     qemu_put_be64(f, RAM_SAVE_FLAG_EOS);

-    expected_time = ram_save_remaining() * TARGET_PAGE_SIZE / bwidth;
+    expected_downtime = ram_save_remaining() * TARGET_PAGE_SIZE / bwidth;
+    DPRINTF("ram_save_live: expected(%" PRIu64 ") <= max(" PRIu64 ")?\n",
+            expected_downtime, migrate_max_downtime());

-    DPRINTF("ram_save_live: expected(%" PRIu64 ") <= max(%" PRIu64 ")?\n",
-            expected_time, migrate_max_downtime());
-
-    if (expected_time <= migrate_max_downtime()) {
+    if (expected_downtime <= migrate_max_downtime()) {
         memory_global_sync_dirty_bitmap(get_system_memory());
-        expected_time = ram_save_remaining() * TARGET_PAGE_SIZE / bwidth;
+        expected_downtime = ram_save_remaining() * TARGET_PAGE_SIZE / bwidth;

-        return expected_time <= migrate_max_downtime();
+        return expected_downtime <= migrate_max_downtime();
     }
     return 0;
 }