From patchwork Mon Sep 7 07:34:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 514987 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7C6D21401CB for ; Mon, 7 Sep 2015 17:36:06 +1000 (AEST) Received: from localhost ([::1]:53972 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZYqyC-00038L-Ak for incoming@patchwork.ozlabs.org; Mon, 07 Sep 2015 03:36:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53082) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZYqxM-0001nh-JS for qemu-devel@nongnu.org; Mon, 07 Sep 2015 03:35:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZYqxL-0004Pc-K2 for qemu-devel@nongnu.org; Mon, 07 Sep 2015 03:35:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43995) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZYqxL-0004P6-Cq for qemu-devel@nongnu.org; Mon, 07 Sep 2015 03:35:11 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 228252D8B58; Mon, 7 Sep 2015 07:35:11 +0000 (UTC) Received: from ad.nay.redhat.com. (dhcp-15-42.nay.redhat.com [10.66.15.42]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t877Yc4Z018875; Mon, 7 Sep 2015 03:35:04 -0400 From: Fam Zheng To: qemu-devel@nongnu.org Date: Mon, 7 Sep 2015 15:34:28 +0800 Message-Id: <1441611277-24596-6-git-send-email-famz@redhat.com> In-Reply-To: <1441611277-24596-1-git-send-email-famz@redhat.com> References: <1441611277-24596-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Jeff Cody , Max Reitz , vsementsov@parallels.com, stefanha@redhat.com, John Snow Subject: [Qemu-devel] [PATCH v5 05/14] blockjob: Introduce reference count 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 So that block_job_complete_sync can be simplified. Signed-off-by: Fam Zheng Reviewed-by: Max Reitz --- block/mirror.c | 2 +- blockjob.c | 22 ++++++++++++++-------- include/block/blockjob.h | 18 +++++++++++++++--- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/block/mirror.c b/block/mirror.c index a258926..3472ad4 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -736,7 +736,7 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target, s->dirty_bitmap = bdrv_create_dirty_bitmap(bs, granularity, NULL, errp); if (!s->dirty_bitmap) { g_free(s->replaces); - block_job_release(bs); + block_job_unref(&s->common); return; } bdrv_set_enable_write_cache(s->target, true); diff --git a/blockjob.c b/blockjob.c index 62bb906..ec12887 100644 --- a/blockjob.c +++ b/blockjob.c @@ -58,6 +58,7 @@ void *block_job_create(const BlockJobDriver *driver, BlockDriverState *bs, job->cb = cb; job->opaque = opaque; job->busy = true; + job->refcnt = 1; bs->job = job; /* Only set speed when necessary to avoid NotSupported error */ @@ -66,7 +67,7 @@ void *block_job_create(const BlockJobDriver *driver, BlockDriverState *bs, block_job_set_speed(job, speed, &local_err); if (local_err) { - block_job_release(bs); + block_job_unref(job); error_propagate(errp, local_err); return NULL; } @@ -74,14 +75,19 @@ void *block_job_create(const BlockJobDriver *driver, BlockDriverState *bs, return job; } -void block_job_release(BlockDriverState *bs) +void block_job_ref(BlockJob *job) { - BlockJob *job = bs->job; + ++job->refcnt; +} - bs->job = NULL; - bdrv_op_unblock_all(bs, job->blocker); - error_free(job->blocker); - g_free(job); +void block_job_unref(BlockJob *job) +{ + if (--job->refcnt == 0) { + job->bs->job = NULL; + bdrv_op_unblock_all(job->bs, job->blocker); + error_free(job->blocker); + g_free(job); + } } void block_job_completed(BlockJob *job, int ret) @@ -90,7 +96,7 @@ void block_job_completed(BlockJob *job, int ret) assert(bs->job == job); job->cb(job->opaque, ret); - block_job_release(bs); + block_job_unref(job); } void block_job_set_speed(BlockJob *job, int64_t speed, Error **errp) diff --git a/include/block/blockjob.h b/include/block/blockjob.h index dd9d5e6..3e7ad21 100644 --- a/include/block/blockjob.h +++ b/include/block/blockjob.h @@ -122,6 +122,9 @@ struct BlockJob { /** The opaque value that is passed to the completion function. */ void *opaque; + + /** Reference count of the block job */ + int refcnt; }; /** @@ -166,12 +169,21 @@ void block_job_sleep_ns(BlockJob *job, QEMUClockType type, int64_t ns); void block_job_yield(BlockJob *job); /** - * block_job_release: + * block_job_ref: * @bs: The block device. * - * Release job resources when an error occurred or job completed. + * Grab a reference to the block job. Should be paired with block_job_unref. */ -void block_job_release(BlockDriverState *bs); +void block_job_ref(BlockJob *job); + +/** + * block_job_unref: + * @bs: The block device. + * + * Release reference to the block job and release resources if it is the last + * reference. + */ +void block_job_unref(BlockJob *job); /** * block_job_completed: