From patchwork Mon Oct 29 14:11:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 195026 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 38E472C0084 for ; Tue, 30 Oct 2012 02:14:06 +1100 (EST) Received: from localhost ([::1]:39863 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSq5D-0004BI-2H for incoming@patchwork.ozlabs.org; Mon, 29 Oct 2012 10:12:51 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38789) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSq4P-0001qE-UJ for qemu-devel@nongnu.org; Mon, 29 Oct 2012 10:12:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TSq4K-0007CN-UZ for qemu-devel@nongnu.org; Mon, 29 Oct 2012 10:12:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36883) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSq4K-0007CA-My for qemu-devel@nongnu.org; Mon, 29 Oct 2012 10:11:56 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q9TEBueU027704 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 29 Oct 2012 10:11:56 -0400 Received: from trasno.mitica (ovpn-113-116.phx2.redhat.com [10.3.113.116]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q9TEBikH011647; Mon, 29 Oct 2012 10:11:54 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 29 Oct 2012 15:11:29 +0100 Message-Id: <1351519903-26607-5-git-send-email-quintela@redhat.com> In-Reply-To: <1351519903-26607-1-git-send-email-quintela@redhat.com> References: <1351519903-26607-1-git-send-email-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: owasserm@redhat.com, mtosatti@redhat.com, avi@redhat.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH 04/18] buffered_file: Move from using a timer to use a thread X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org We still protect everything except the wait with the iothread lock. But we moved from a timer to a thread. Steps one by one. We also need to detect when we have finished with a variable "complete". Signed-off-by: Juan Quintela --- buffered_file.c | 58 +++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 22 deletions(-) diff --git a/buffered_file.c b/buffered_file.c index ed92df1..ec7abc6 100644 --- a/buffered_file.c +++ b/buffered_file.c @@ -18,6 +18,7 @@ #include "qemu-timer.h" #include "qemu-char.h" #include "buffered_file.h" +#include "qemu-thread.h" //#define DEBUG_BUFFERED_FILE @@ -31,7 +32,8 @@ typedef struct QEMUFileBuffered uint8_t *buffer; size_t buffer_size; size_t buffer_capacity; - QEMUTimer *timer; + QemuThread thread; + bool complete; } QEMUFileBuffered; #ifdef DEBUG_BUFFERED_FILE @@ -160,11 +162,8 @@ static int buffered_close(void *opaque) if (ret >= 0) { ret = ret2; } - qemu_del_timer(s->timer); - qemu_free_timer(s->timer); - g_free(s->buffer); - g_free(s); - + ret = migrate_fd_close(s->migration_state); + s->complete = true; return ret; } @@ -215,23 +214,38 @@ static int64_t buffered_get_rate_limit(void *opaque) return s->xfer_limit; } -static void buffered_rate_tick(void *opaque) +/* 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; + int64_t expire_time = qemu_get_clock_ms(rt_clock) + BUFFER_DELAY; - if (qemu_file_get_error(s->file)) { - buffered_close(s); - return; - } - - qemu_mod_timer(s->timer, qemu_get_clock_ms(rt_clock) + 100); - - if (s->freeze_output) - return; - - s->bytes_xfer = 0; + while (true) { + int64_t current_time = qemu_get_clock_ms(rt_clock); - buffered_put_buffer(s, NULL, 0, 0); + if (s->complete) { + break; + } + if (s->freeze_output) { + continue; + } + if (current_time >= expire_time) { + s->bytes_xfer = 0; + expire_time = current_time + BUFFER_DELAY; + } + if (s->bytes_xfer >= s->xfer_limit) { + /* usleep expects microseconds */ + g_usleep((expire_time - current_time)*1000); + } + qemu_mutex_lock_iothread(); + buffered_put_buffer(s, NULL, 0, 0); + qemu_mutex_unlock_iothread(); + } + g_free(s->buffer); + g_free(s); + return NULL; } QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state) @@ -242,15 +256,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->file = qemu_fopen_ops(s, buffered_put_buffer, NULL, buffered_close, buffered_rate_limit, buffered_set_rate_limit, buffered_get_rate_limit); - s->timer = qemu_new_timer_ms(rt_clock, buffered_rate_tick, s); - - qemu_mod_timer(s->timer, qemu_get_clock_ms(rt_clock) + 100); + qemu_thread_create(&s->thread, buffered_file_thread, s, + QEMU_THREAD_DETACHED); return s->file; }