From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>
Subject: [Qemu-devel] [PATCH 22/34] migration: add XFER_LIMIT_RATIO
Date: Wed, 19 Dec 2012 13:33:45 +0100 [thread overview]
Message-ID: <1355920437-29882-23-git-send-email-quintela@redhat.com> (raw)
In-Reply-To: <1355920437-29882-1-git-send-email-quintela@redhat.com>
The "magic" divisions by 10 are there because of the value of BUFFER_DELAY.
Introduce a constant to explain them better.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/migration.c b/migration.c
index 26bb85e..a233215 100644
--- a/migration.c
+++ b/migration.c
@@ -44,6 +44,11 @@ enum {
#define MAX_THROTTLE (32 << 20) /* Migration speed throttling */
+/* Amount of time to allocate to each "chunk" of bandwidth-throttled
+ * data. */
+#define BUFFER_DELAY 100
+#define XFER_LIMIT_RATIO (1000 / BUFFER_DELAY)
+
/* Migration XBZRLE default cache size */
#define DEFAULT_MIGRATE_CACHE_SIZE (64 * 1024 * 1024)
@@ -743,9 +748,6 @@ static int64_t buffered_get_rate_limit(void *opaque)
return s->xfer_limit;
}
-/* 100ms xfer_limit is the limit that we should write each 100ms */
-#define BUFFER_DELAY 100
-
static void *buffered_file_thread(void *opaque)
{
QEMUFileBuffered *s = opaque;
@@ -808,7 +810,7 @@ void qemu_fopen_ops_buffered(MigrationState *migration_state)
s = g_malloc0(sizeof(*s));
s->migration_state = migration_state;
- s->xfer_limit = migration_state->bandwidth_limit / 10;
+ s->xfer_limit = s->migration_state->bandwidth_limit / XFER_LIMIT_RATIO;
s->migration_state->complete = false;
s->file = qemu_fopen_ops(s, &buffered_file_ops);
--
1.7.11.7
next prev parent reply other threads:[~2012-12-19 12:34 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-19 12:33 [Qemu-devel] [PATCH 00/34] migration thread and queue Juan Quintela
2012-12-19 12:33 ` [Qemu-devel] [PATCH 01/34] migration: fix migration_bitmap leak Juan Quintela
2012-12-19 12:33 ` [Qemu-devel] [PATCH 02/34] buffered_file: do not send more than s->bytes_xfer bytes per tick Juan Quintela
2012-12-19 12:33 ` [Qemu-devel] [PATCH 03/34] migration: remove double call to migrate_fd_close Juan Quintela
2012-12-19 12:33 ` [Qemu-devel] [PATCH 04/34] migration: include qemu-file.h Juan Quintela
2012-12-19 12:33 ` [Qemu-devel] [PATCH 05/34] migration-fd: remove duplicate include Juan Quintela
2012-12-19 12:33 ` [Qemu-devel] [PATCH 06/34] exec: change ramlist from MRU order to a 1-item cache Juan Quintela
2012-12-19 12:33 ` [Qemu-devel] [PATCH 07/34] exec: change RAM list to a TAILQ Juan Quintela
2012-12-19 12:33 ` [Qemu-devel] [PATCH 08/34] exec: sort the memory from biggest to smallest Juan Quintela
2012-12-19 12:33 ` [Qemu-devel] [PATCH 09/34] add a version number to ram_list Juan Quintela
2012-12-19 12:33 ` [Qemu-devel] [PATCH 10/34] protect the ramlist with a separate mutex Juan Quintela
2012-12-19 12:33 ` [Qemu-devel] [PATCH 11/34] buffered_file: Move from using a timer to use a thread Juan Quintela
2012-12-19 12:33 ` [Qemu-devel] [PATCH 12/34] migration: make qemu_fopen_ops_buffered() return void Juan Quintela
2012-12-19 12:33 ` [Qemu-devel] [PATCH 13/34] migration: move migration thread init code to migrate_fd_put_ready Juan Quintela
2012-12-19 12:33 ` [Qemu-devel] [PATCH 14/34] migration: make writes blocking Juan Quintela
2012-12-19 12:33 ` [Qemu-devel] [PATCH 15/34] migration: remove unfreeze logic Juan Quintela
2012-12-19 12:33 ` [Qemu-devel] [PATCH 16/34] migration: just lock migrate_fd_put_ready Juan Quintela
2012-12-19 12:33 ` [Qemu-devel] [PATCH 17/34] buffered_file: Unfold the trick to restart generating migration data Juan Quintela
2012-12-19 12:33 ` [Qemu-devel] [PATCH 18/34] buffered_file: don't flush on put buffer Juan Quintela
2012-12-19 12:33 ` [Qemu-devel] [PATCH 19/34] buffered_file: unfold buffered_append in buffered_put_buffer Juan Quintela
2012-12-19 12:33 ` [Qemu-devel] [PATCH 20/34] savevm: New save live migration method: pending Juan Quintela
2012-12-19 12:33 ` [Qemu-devel] [PATCH 21/34] migration: move buffered_file.c code into migration.c Juan Quintela
2012-12-19 12:33 ` Juan Quintela [this message]
2012-12-19 12:33 ` [Qemu-devel] [PATCH 23/34] migration: move migration_fd_put_ready() Juan Quintela
2012-12-19 12:33 ` [Qemu-devel] [PATCH 24/34] migration: Inline qemu_fopen_ops_buffered into migrate_fd_connect Juan Quintela
2012-12-19 12:33 ` [Qemu-devel] [PATCH 25/34] migration: move migration notifier Juan Quintela
2012-12-19 12:33 ` [Qemu-devel] [PATCH 26/34] ram: rename last_block to last_seen_block Juan Quintela
2012-12-19 12:33 ` [Qemu-devel] [PATCH 27/34] ram: Add last_sent_block Juan Quintela
2012-12-19 12:33 ` [Qemu-devel] [PATCH 28/34] memory: introduce memory_region_test_and_clear_dirty Juan Quintela
2012-12-19 12:33 ` [Qemu-devel] [PATCH 29/34] ram: Use memory_region_test_and_clear_dirty Juan Quintela
2012-12-20 23:38 ` Eric Blake
2012-12-19 12:33 ` [Qemu-devel] [PATCH 30/34] ram: optimize migration bitmap walking Juan Quintela
2012-12-19 12:33 ` [Qemu-devel] [PATCH 31/34] ram: account the amount of transferred ram better Juan Quintela
2012-12-19 12:33 ` [Qemu-devel] [PATCH 32/34] ram: refactor ram_save_block() return value Juan Quintela
2012-12-20 23:42 ` Eric Blake
2012-12-19 12:33 ` [Qemu-devel] [PATCH 33/34] migration: fix qemu_get_fd for BufferedFile Juan Quintela
2012-12-19 12:33 ` [Qemu-devel] [PATCH 34/34] migration: merge QEMUFileBuffered into MigrationState Juan Quintela
2012-12-19 12:54 ` [Qemu-devel] [PATCH 00/34] migration thread and queue Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1355920437-29882-23-git-send-email-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).