[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/21] savevm, buffered_file: introduce method to dr
From: |
Isaku Yamahata |
Subject: |
[Qemu-devel] [PATCH 13/21] savevm, buffered_file: introduce method to drain buffer of buffered file |
Date: |
Thu, 29 Dec 2011 10:25:52 +0900 |
Introduce a new method to drain the buffer of QEMUBufferedFile.
When postcopy migration, buffer size can increase unboundedly.
To keep the buffer size reasonably small, introduce the method to
wait for buffer to drain.
Signed-off-by: Isaku Yamahata <address@hidden>
---
buffered_file.c | 20 +++++++++++++++-----
buffered_file.h | 1 +
hw/hw.h | 1 +
savevm.c | 6 ++++++
4 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/buffered_file.c b/buffered_file.c
index fed9a22..be1a192 100644
--- a/buffered_file.c
+++ b/buffered_file.c
@@ -168,6 +168,15 @@ static int buffered_put_buffer(void *opaque, const uint8_t
*buf, int64_t pos, in
return offset;
}
+static void buffered_drain(QEMUFileBuffered *s)
+{
+ while (!qemu_file_get_error(s->file) && s->buffer_size) {
+ buffered_flush(s);
+ if (s->freeze_output)
+ s->wait_for_unfreeze(s->opaque);
+ }
+}
+
static int buffered_close(void *opaque)
{
QEMUFileBuffered *s = opaque;
@@ -175,11 +184,7 @@ static int buffered_close(void *opaque)
DPRINTF("closing\n");
- while (!qemu_file_get_error(s->file) && s->buffer_size) {
- buffered_flush(s);
- if (s->freeze_output)
- s->wait_for_unfreeze(s->opaque);
- }
+ buffered_drain(s);
ret = s->close(s->opaque);
@@ -289,3 +294,8 @@ QEMUFile *qemu_fopen_ops_buffered(void *opaque,
return s->file;
}
+
+void qemu_buffered_file_drain_buffer(void *buffered_file)
+{
+ buffered_drain(buffered_file);
+}
diff --git a/buffered_file.h b/buffered_file.h
index 98d358b..cd8e1e8 100644
--- a/buffered_file.h
+++ b/buffered_file.h
@@ -26,5 +26,6 @@ QEMUFile *qemu_fopen_ops_buffered(void *opaque, size_t
xfer_limit,
BufferedPutReadyFunc *put_ready,
BufferedWaitForUnfreezeFunc
*wait_for_unfreeze,
BufferedCloseFunc *close);
+void qemu_buffered_file_drain_buffer(void *buffered_file);
#endif
diff --git a/hw/hw.h b/hw/hw.h
index d508b4e..a59b770 100644
--- a/hw/hw.h
+++ b/hw/hw.h
@@ -61,6 +61,7 @@ QEMUFile *qemu_popen(FILE *popen_file, const char *mode);
QEMUFile *qemu_popen_cmd(const char *command, const char *mode);
int qemu_stdio_fd(QEMUFile *f);
void qemu_fflush(QEMUFile *f);
+void qemu_buffered_file_drain(QEMUFile *f);
int qemu_fclose(QEMUFile *f);
void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, int size);
void qemu_put_byte(QEMUFile *f, int v);
diff --git a/savevm.c b/savevm.c
index 1d9e218..891c4fd 100644
--- a/savevm.c
+++ b/savevm.c
@@ -83,6 +83,7 @@
#include "qemu-queue.h"
#include "qemu-timer.h"
#include "cpus.h"
+#include "buffered_file.h"
#define SELF_ANNOUNCE_ROUNDS 5
@@ -475,6 +476,11 @@ void qemu_fflush(QEMUFile *f)
}
}
+void qemu_buffered_file_drain(QEMUFile *f)
+{
+ qemu_buffered_file_drain_buffer(f->opaque);
+}
+
static void qemu_fill_buffer(QEMUFile *f)
{
int len;
--
1.7.1.1
- [Qemu-devel] [PATCH 12/21] savevm: qemu_pending_size() to return pending buffered size, (continued)
- [Qemu-devel] [PATCH 12/21] savevm: qemu_pending_size() to return pending buffered size, Isaku Yamahata, 2011/12/28
- [Qemu-devel] [PATCH 18/21] configure: add CONFIG_POSTCOPY option, Isaku Yamahata, 2011/12/28
- [Qemu-devel] [PATCH 16/21] umem.h: import Linux umem.h, Isaku Yamahata, 2011/12/28
- [Qemu-devel] [PATCH 14/21] migration: export migrate_fd_completed() and migrate_fd_cleanup(), Isaku Yamahata, 2011/12/28
- [Qemu-devel] [PATCH 19/21] postcopy: introduce -postcopy and -postcopy-flags option, Isaku Yamahata, 2011/12/28
- [Qemu-devel] [PATCH 09/21] exec.c: factor out qemu_get_ram_ptr(), Isaku Yamahata, 2011/12/28
- [Qemu-devel] [PATCH 01/21] arch_init: export sort_ram_list() and ram_save_block(), Isaku Yamahata, 2011/12/28
- [Qemu-devel] [PATCH 21/21] postcopy: implement postcopy livemigration, Isaku Yamahata, 2011/12/28
- [Qemu-devel] [PATCH 13/21] savevm, buffered_file: introduce method to drain buffer of buffered file,
Isaku Yamahata <=
- Re: [Qemu-devel] [PATCH 00/21][RFC] postcopy live migration, Anthony Liguori, 2011/12/29