From patchwork Thu Mar 5 04:15:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Snow X-Patchwork-Id: 446560 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 A80A414015A for ; Thu, 5 Mar 2015 15:16:16 +1100 (AEDT) Received: from localhost ([::1]:48052 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTNCm-0004WB-Qo for incoming@patchwork.ozlabs.org; Wed, 04 Mar 2015 23:16:12 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49398) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTNC0-0004T8-D7 for qemu-devel@nongnu.org; Wed, 04 Mar 2015 23:15:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YTNBz-0005Zu-8j for qemu-devel@nongnu.org; Wed, 04 Mar 2015 23:15:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35011) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTNBw-0005Z9-OU; Wed, 04 Mar 2015 23:15:20 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t254FK36025031 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 4 Mar 2015 23:15:20 -0500 Received: from scv.usersys.redhat.com (vpn-51-195.rdu2.redhat.com [10.10.51.195]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t254FDMi009946; Wed, 4 Mar 2015 23:15:19 -0500 From: John Snow To: qemu-block@nongnu.org Date: Wed, 4 Mar 2015 23:15:04 -0500 Message-Id: <1425528911-10300-5-git-send-email-jsnow@redhat.com> In-Reply-To: <1425528911-10300-1-git-send-email-jsnow@redhat.com> References: <1425528911-10300-1-git-send-email-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, famz@redhat.com, John Snow , qemu-devel@nongnu.org, armbru@redhat.com, vsementsov@parallels.com, stefanha@redhat.com, mreitz@redhat.com Subject: [Qemu-devel] [PATCH 04/11] block: add refcount to Job object 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 If we want to get at the job after the life of the job, we'll need a refcount for this object. This may occur for example if we wish to inspect the actions taken by a particular job after a transactional group of jobs runs, and further actions are required. Signed-off-by: John Snow Reviewed-by: Max Reitz --- blockjob.c | 18 ++++++++++++++++-- include/block/blockjob.h | 21 +++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/blockjob.c b/blockjob.c index ba2255d..d620082 100644 --- a/blockjob.c +++ b/blockjob.c @@ -35,6 +35,19 @@ #include "qemu/timer.h" #include "qapi-event.h" +void block_job_incref(BlockJob *job) +{ + job->refcount++; +} + +void block_job_decref(BlockJob *job) +{ + job->refcount--; + if (job->refcount == 0) { + g_free(job); + } +} + void *block_job_create(const BlockJobDriver *driver, BlockDriverState *bs, int64_t speed, BlockCompletionFunc *cb, void *opaque, Error **errp) @@ -57,6 +70,7 @@ void *block_job_create(const BlockJobDriver *driver, BlockDriverState *bs, job->cb = cb; job->opaque = opaque; job->busy = true; + job->refcount = 1; bs->job = job; /* Only set speed when necessary to avoid NotSupported error */ @@ -68,7 +82,7 @@ void *block_job_create(const BlockJobDriver *driver, BlockDriverState *bs, bs->job = NULL; bdrv_op_unblock_all(bs, job->blocker); error_free(job->blocker); - g_free(job); + block_job_decref(job); error_propagate(errp, local_err); return NULL; } @@ -85,7 +99,7 @@ void block_job_completed(BlockJob *job, int ret) bs->job = NULL; bdrv_op_unblock_all(bs, job->blocker); error_free(job->blocker); - g_free(job); + block_job_decref(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 b6d4ebb..8fe1c95 100644 --- a/include/block/blockjob.h +++ b/include/block/blockjob.h @@ -116,6 +116,9 @@ struct BlockJob { /** The opaque value that is passed to the completion function. */ void *opaque; + + /** A reference count, allowing for post-job actions in e.g. transactions */ + int refcount; }; /** @@ -141,6 +144,24 @@ void *block_job_create(const BlockJobDriver *driver, BlockDriverState *bs, void *opaque, Error **errp); /** + * block_job_incref: + * @job: The job to pick up a handle to + * + * Increment the refcount on @job, to be able to use it asynchronously + * from the job it is being used for. Put down the reference when done + * with @block_job_unref + */ +void block_job_incref(BlockJob *job); + +/** + * block_job_decref: + * @job: The job to unreference and delete. + * + * Decrement the refcount on @job, and delete it if there are no users. + */ +void block_job_decref(BlockJob *job); + +/** * block_job_sleep_ns: * @job: The job that calls the function. * @clock: The clock to sleep on.