From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:57184) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF4fq-0002YJ-F8 for qemu-devel@nongnu.org; Fri, 21 Sep 2012 10:57:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TF4fh-0001kw-AP for qemu-devel@nongnu.org; Fri, 21 Sep 2012 10:57:46 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:52986) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF4fh-0001kg-3R for qemu-devel@nongnu.org; Fri, 21 Sep 2012 10:57:37 -0400 Received: by pbbrp12 with SMTP id rp12so7862459pbb.4 for ; Fri, 21 Sep 2012 07:57:36 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <505C805A.6020800@redhat.com> Date: Fri, 21 Sep 2012 16:57:30 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1348236500-2565-1-git-send-email-quintela@redhat.com> <1348236500-2565-6-git-send-email-quintela@redhat.com> In-Reply-To: <1348236500-2565-6-git-send-email-quintela@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 05/14] migration: make qemu_fopen_ops_buffered() return void List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org Il 21/09/2012 16:08, Juan Quintela ha scritto: > 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 > --- > 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 61985a9..6c3d057 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; Not a separate patch? :) (Just kidding). > } QEMUFileBuffered; > > #ifdef DEBUG_BUFFERED_FILE > @@ -162,7 +161,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; > } > > @@ -224,7 +223,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) { > @@ -247,7 +246,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; > > @@ -255,15 +254,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 2c29d04..550c5c2 100644 > --- a/migration.c > +++ b/migration.c > @@ -429,7 +429,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); > Consider a rename of qemu_fopen_ops_buffered, buffered_file.*, and QEMUFileBuffered at the end of the series (e.g. migration_start_thread, migration-thread.*, QEMUFileMigration). Paolo