On 10/18/2012 09:30 AM, Juan Quintela wrote:
> We want the file assignment to happen before the thread is created to
> avoid locking, so we just do it before creating the thread.
>
> Signed-off-by: Juan Quintela <quint...@redhat.com>
> ---
> buffered_file.c | 13 ++++++-------
> buffered_file.h | 2 +-
> migration.c | 2 +-
> migration.h | 1 +
> 4 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/buffered_file.c b/buffered_file.c
> index 4b90d54..6395b37 100644
> --- a/buffered_file.c
> +++ b/buffered_file.c
> @@ -33,7 +33,6 @@ typedef struct QEMUFileBuffered
> size_t buffer_size;
> size_t buffer_capacity;
> QemuThread thread;
> - bool complete;
> } QEMUFileBuffered;
>
> #ifdef DEBUG_BUFFERED_FILE
> @@ -163,7 +162,7 @@ static int buffered_close(void *opaque)
> ret = ret2;
> }
> ret = migrate_fd_close(s->migration_state);
> - s->complete = true;
> + s->migration_state->complete = true;
> return ret;
> }
>
> @@ -225,7 +224,7 @@ static void *buffered_file_thread(void *opaque)
> while (true) {
> int64_t current_time = qemu_get_clock_ms(rt_clock);
>
> - if (s->complete) {
> + if (s->migration_state->complete) {
> break;
> }
> if (s->freeze_output) {
> @@ -248,7 +247,7 @@ static void *buffered_file_thread(void *opaque)
> return NULL;
> }
>
> -QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state)
> +void qemu_fopen_ops_buffered(MigrationState *migration_state)
> {
> QEMUFileBuffered *s;
>
> @@ -256,15 +255,15 @@ QEMUFile *qemu_fopen_ops_buffered(MigrationState
> *migration_state)
>
> s->migration_state = migration_state;
> s->xfer_limit = migration_state->bandwidth_limit / 10;
> - s->complete = false;
> + s->migration_state->complete = false;
>
> s->file = qemu_fopen_ops(s, buffered_put_buffer, NULL,
> buffered_close, buffered_rate_limit,
> buffered_set_rate_limit,
> buffered_get_rate_limit);
>
> + migration_state->file = s->file;
> +
> qemu_thread_create(&s->thread, buffered_file_thread, s,
> QEMU_THREAD_DETACHED);
> -
> - return s->file;
> }
> diff --git a/buffered_file.h b/buffered_file.h
> index ef010fe..8a246fd 100644
> --- a/buffered_file.h
> +++ b/buffered_file.h
> @@ -17,6 +17,6 @@
> #include "hw/hw.h"
> #include "migration.h"
>
> -QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state);
> +void qemu_fopen_ops_buffered(MigrationState *migration_state);
>
> #endif
> diff --git a/migration.c b/migration.c
> index 62e0304..02f4ffa 100644
> --- a/migration.c
> +++ b/migration.c
> @@ -431,7 +431,7 @@ void migrate_fd_connect(MigrationState *s)
> int ret;
>
> s->state = MIG_STATE_ACTIVE;
> - s->file = qemu_fopen_ops_buffered(s);
> + qemu_fopen_ops_buffered(s);
>
> DPRINTF("beginning savevm\n");
> ret = qemu_savevm_state_begin(s->file, &s->params);
> diff --git a/migration.h b/migration.h
> index 1c3e9b7..a63c5d5 100644
> --- a/migration.h
> +++ b/migration.h
> @@ -45,6 +45,7 @@ struct MigrationState
> int64_t dirty_pages_rate;
> bool enabled_capabilities[MIGRATION_CAPABILITY_MAX];
> int64_t xbzrle_cache_size;
> + bool complete;
> };
>
> void process_incoming_migration(QEMUFile *f);
>
Reviewed-by: Orit Wasserman <owass...@redhat.com>