From nobody Wed May 14 20:29:50 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 151843297486014.839987981715467; Mon, 12 Feb 2018 02:56:14 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 794A361470; Mon, 12 Feb 2018 10:56:13 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 42A2360C8D; Mon, 12 Feb 2018 10:56:13 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id CEFDE18033E5; Mon, 12 Feb 2018 10:56:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w1CAr2lT025666 for ; Mon, 12 Feb 2018 05:53:03 -0500 Received: by smtp.corp.redhat.com (Postfix) id DA311124BB36; Mon, 12 Feb 2018 10:53:02 +0000 (UTC) Received: from localhost.localdomain (ovpn-204-25.brq.redhat.com [10.40.204.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id 49EFA1251BDC; Mon, 12 Feb 2018 10:53:02 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Mon, 12 Feb 2018 11:52:49 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/6] virObject: Introduce virObjectRecursiveLockableNew X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 12 Feb 2018 10:56:14 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Sometimes we need the lock in virObjectLockable to be recursive. Because of the nature of pthreads we don't need a special class for that - the pthread_* APIs don't distinguish between normal and recursive locks. Based-on-work-of: John Ferlan Signed-off-by: Michal Privoznik --- src/libvirt_private.syms | 1 + src/util/virobject.c | 22 +++++++++++++++++++--- src/util/virobject.h | 4 ++++ 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 3b14d7d15..fcf378105 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2417,6 +2417,7 @@ virObjectListFreeCount; virObjectLock; virObjectLockableNew; virObjectNew; +virObjectRecursiveLockableNew; virObjectRef; virObjectRWLockableNew; virObjectRWLockRead; diff --git a/src/util/virobject.c b/src/util/virobject.c index b2fc63aec..1d82e826b 100644 --- a/src/util/virobject.c +++ b/src/util/virobject.c @@ -257,8 +257,9 @@ virObjectNew(virClassPtr klass) } =20 =20 -void * -virObjectLockableNew(virClassPtr klass) +static void * +virObjectLockableNewInternal(virClassPtr klass, + bool recursive) { virObjectLockablePtr obj; =20 @@ -272,7 +273,8 @@ virObjectLockableNew(virClassPtr klass) if (!(obj =3D virObjectNew(klass))) return NULL; =20 - if (virMutexInit(&obj->lock) < 0) { + if ((!recursive && virMutexInit(&obj->lock) < 0) || + (recursive && virMutexInitRecursive(&obj->lock) < 0)) { virReportSystemError(errno, "%s", _("Unable to initialize mutex")); virObjectUnref(obj); @@ -283,6 +285,20 @@ virObjectLockableNew(virClassPtr klass) } =20 =20 +void * +virObjectLockableNew(virClassPtr klass) +{ + return virObjectLockableNewInternal(klass, false); +} + + +void * +virObjectRecursiveLockableNew(virClassPtr klass) +{ + return virObjectLockableNewInternal(klass, true); +} + + void * virObjectRWLockableNew(virClassPtr klass) { diff --git a/src/util/virobject.h b/src/util/virobject.h index ac6cf22f9..367d505ae 100644 --- a/src/util/virobject.h +++ b/src/util/virobject.h @@ -116,6 +116,10 @@ void * virObjectLockableNew(virClassPtr klass) ATTRIBUTE_NONNULL(1); =20 +void * +virObjectRecursiveLockableNew(virClassPtr klass) + ATTRIBUTE_NONNULL(1); + void * virObjectRWLockableNew(virClassPtr klass) ATTRIBUTE_NONNULL(1); --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list