From nobody Sat Feb 7 09:36:50 2026 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.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 149814018958593.61692212704668; Thu, 22 Jun 2017 07:03:09 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CD50E2B0A81; Thu, 22 Jun 2017 14:03:05 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 894915C472; Thu, 22 Jun 2017 14:03:05 +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 2DA304E98B; Thu, 22 Jun 2017 14:03:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v5ME2t54004497 for ; Thu, 22 Jun 2017 10:02:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2CAE75D960; Thu, 22 Jun 2017 14:02:55 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-36.phx2.redhat.com [10.3.116.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id DFA315D967 for ; Thu, 22 Jun 2017 14:02:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com CD50E2B0A81 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com CD50E2B0A81 From: John Ferlan To: libvir-list@redhat.com Date: Thu, 22 Jun 2017 10:02:38 -0400 Message-Id: <20170622140246.31777-9-jferlan@redhat.com> In-Reply-To: <20170622140246.31777-1-jferlan@redhat.com> References: <20170622140246.31777-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 08/16] util: Introduce virObjectLookupHash 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 22 Jun 2017 14:03:06 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Using the virObjectLockable class as the base and the virObjectLookupKeys uuid and name from the virObjectLookupKeys, create the virObjectLookupHash to manage a common mechanism to store objects for a driver via self locking hash tables. Each hash table will have : tableElemsStart -> # of elements to create the initial table objsUUID -> Hash table for the LookupKeys->UUID objsName -> Hash table for the LookupKeys->name A secondary benefit of self locking hash tables is each driver then does not have to keep a higher level driver lock for interactions with the object storage since the object itself can manage locking as needed. Signed-off-by: John Ferlan --- src/libvirt_private.syms | 2 ++ src/util/virobject.c | 85 ++++++++++++++++++++++++++++++++++++++++++++= +++- src/util/virobject.h | 24 ++++++++++++++ 3 files changed, 110 insertions(+), 1 deletion(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 6a87e6b..655a8f8 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2274,6 +2274,7 @@ virNumaSetupMemoryPolicy; # util/virobject.h virClassForObject; virClassForObjectLockable; +virClassForObjectLookupHash; virClassForObjectLookupKeys; virClassIsDerivedFrom; virClassName; @@ -2285,6 +2286,7 @@ virObjectListFree; virObjectListFreeCount; virObjectLock; virObjectLockableNew; +virObjectLookupHashNew; virObjectLookupKeysGetName; virObjectLookupKeysGetUUID; virObjectLookupKeysIsActive; diff --git a/src/util/virobject.c b/src/util/virobject.c index 6e2b222..79f1fe9 100644 --- a/src/util/virobject.c +++ b/src/util/virobject.c @@ -67,9 +67,11 @@ struct _virClass { static virClassPtr virObjectClass; static virClassPtr virObjectLockableClass; static virClassPtr virObjectLookupKeysClass; +static virClassPtr virObjectLookupHashClass; =20 static void virObjectLockableDispose(void *anyobj); static void virObjectLookupKeysDispose(void *anyobj); +static void virObjectLookupHashDispose(void *anyobj); =20 static int virObjectOnceInit(void) @@ -92,6 +94,12 @@ virObjectOnceInit(void) virObjectLookupKeysDispos= e))) return -1; =20 + if (!(virObjectLookupHashClass =3D virClassNew(virObjectLockableClass, + "virObjectLookupHash", + sizeof(virObjectLookupHas= h), + virObjectLookupHashDispos= e))) + return -1; + return 0; } =20 @@ -144,6 +152,21 @@ virClassForObjectLookupKeys(void) =20 =20 /** + * virClassForObjectLookupHash: + * + * Returns the class instance for the virObjectLookupHash type + */ +virClassPtr +virClassForObjectLookupHash(void) +{ + if (virObjectInitialize() < 0) + return NULL; + + return virObjectLookupHashClass; +} + + +/** * virClassNew: * @parent: the parent class * @name: the class name @@ -344,6 +367,65 @@ virObjectLookupKeysDispose(void *anyobj) =20 =20 /** + * virObjectLookupHashNew: + * @klass: the klass to check + * @tableElemsStart: number of elements initially in the table + * + * Create a new poolable hash table object for storing hash tables capable + * of storing virObjectLookupKeys objects. + * + * Returns: New object on success, NULL on failure w/ error message set + */ +void * +virObjectLookupHashNew(virClassPtr klass, + int tableElemsStart) +{ + virObjectLookupHashPtr obj; + + if (!virClassIsDerivedFrom(klass, virClassForObjectLookupHash())) { + virReportInvalidArg(klass, + _("Class %s must derive from virObjectLookupHa= sh"), + virClassName(klass)); + return NULL; + } + + if (!(obj =3D virObjectLockableNew(klass))) + return NULL; + + obj->tableElemsStart =3D tableElemsStart; + + if (!(obj->objsUUID =3D virHashCreate(tableElemsStart, + virObjectFreeHashData))) + goto error; + + if (!(obj->objsName =3D virHashCreate(tableElemsStart, + virObjectFreeHashData))) + goto error; + + VIR_DEBUG("obj=3D%p, elems=3D%d objsUUID=3D%p objsName=3D%p", + obj, tableElemsStart, obj->objsUUID, obj->objsName); + + return obj; + + error: + virObjectUnref(obj); + return NULL; +} + + +static void +virObjectLookupHashDispose(void *anyobj) +{ + virObjectLookupHashPtr obj =3D anyobj; + + VIR_DEBUG("dispose obj=3D%p", obj); + + virHashFree(obj->objsUUID); + virHashFree(obj->objsName); +} + + +/** * virObjectUnref: * @anyobj: any instance of virObjectPtr * @@ -410,7 +492,8 @@ static virObjectLockablePtr virObjectGetLockableObj(void *anyobj) { if (virObjectIsClass(anyobj, virObjectLockableClass) || - virObjectIsClass(anyobj, virObjectLookupKeysClass)) + virObjectIsClass(anyobj, virObjectLookupKeysClass) || + virObjectIsClass(anyobj, virObjectLookupHashClass)) return anyobj; =20 VIR_OBJECT_USAGE_PRINT_WARNING(anyobj, virObjectLockableClass); diff --git a/src/util/virobject.h b/src/util/virobject.h index 9e0ecc1..3c45182 100644 --- a/src/util/virobject.h +++ b/src/util/virobject.h @@ -23,6 +23,7 @@ # define __VIR_OBJECT_H__ =20 # include "internal.h" +# include "virhash.h" # include "virthread.h" =20 typedef struct _virClass virClass; @@ -37,6 +38,9 @@ typedef virObjectLockable *virObjectLockablePtr; typedef struct _virObjectLookupKeys virObjectLookupKeys; typedef virObjectLookupKeys *virObjectLookupKeysPtr; =20 +typedef struct _virObjectLookupHash virObjectLookupHash; +typedef virObjectLookupHash *virObjectLookupHashPtr; + typedef void (*virObjectDisposeCallback)(void *obj); =20 /* Most code should not play with the contents of this struct; however, @@ -71,10 +75,25 @@ struct _virObjectLookupKeys { bool active; /* true if object is active */ }; =20 +struct _virObjectLookupHash { + virObjectLockable parent; + + int tableElemsStart; + + /* uuid string -> object mapping for O(1), + * lockless lookup-by-uuid */ + virHashTable *objsUUID; + + /* name key -> object mapping for O(1), + * lockless lookup-by-name */ + virHashTable *objsName; +}; + =20 virClassPtr virClassForObject(void); virClassPtr virClassForObjectLockable(void); virClassPtr virClassForObjectLookupKeys(void); +virClassPtr virClassForObjectLookupHash(void); =20 # ifndef VIR_PARENT_REQUIRED # define VIR_PARENT_REQUIRED ATTRIBUTE_NONNULL(1) @@ -127,6 +146,11 @@ virObjectLookupKeysNew(virClassPtr klass, const char *name) ATTRIBUTE_NONNULL(1); =20 +void * +virObjectLookupHashNew(virClassPtr klass, + int tableElemsStart) + ATTRIBUTE_NONNULL(1); + void virObjectLock(void *lockableobj) ATTRIBUTE_NONNULL(1); --=20 2.9.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list