External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

virdomainobjlist: Use virObjectRWLockable

Browse Source 
There is no reason why two threads trying to look up two domains
should mutually exclude each other. Utilize new
virObjectRWLockable that was just introduced.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Michal Privoznik 2017-07-19 12:11:05 +02:00
parent 77f4593b09
commit 4860582f67
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/conf/virdomainobjlist.c
View File

@ -42,7 +42,7 @@ static void virDomainObjListDispose(void *obj);
struct _virDomainObjList { struct _virDomainObjList {
virObjectLockable parent; virObjectRWLockable parent;
/* uuid string -> virDomainObj mapping /* uuid string -> virDomainObj mapping
* for O(1), lockless lookup-by-uuid */ * for O(1), lockless lookup-by-uuid */
@ -56,7 +56,7 @@ struct _virDomainObjList {
static int virDomainObjListOnceInit(void) static int virDomainObjListOnceInit(void)
{ {
if (!(virDomainObjListClass = virClassNew(virClassForObjectLockable(), if (!(virDomainObjListClass = virClassNew(virClassForObjectRWLockable(),
"virDomainObjList", "virDomainObjList",
sizeof(virDomainObjList), sizeof(virDomainObjList),
virDomainObjListDispose))) virDomainObjListDispose)))
@ -74,7 +74,7 @@ virDomainObjListPtr virDomainObjListNew(void)
if (virDomainObjListInitialize() < 0) if (virDomainObjListInitialize() < 0)
return NULL; return NULL;
if (!(doms = virObjectLockableNew(virDomainObjListClass))) if (!(doms = virObjectRWLockableNew(virDomainObjListClass)))
return NULL; return NULL;
if (!(doms->objs = virHashCreate(50, virObjectFreeHashData)) || if (!(doms->objs = virHashCreate(50, virObjectFreeHashData)) ||
@ -118,7 +118,7 @@ virDomainObjListFindByIDInternal(virDomainObjListPtr doms,
bool ref) bool ref)
{ {
virDomainObjPtr obj; virDomainObjPtr obj;
virObjectLock(doms); virObjectLockRead(doms);
obj = virHashSearch(doms->objs, virDomainObjListSearchID, &id, NULL); obj = virHashSearch(doms->objs, virDomainObjListSearchID, &id, NULL);
if (ref) { if (ref) {
virObjectRef(obj); virObjectRef(obj);
@ -160,7 +160,7 @@ virDomainObjListFindByUUIDInternal(virDomainObjListPtr doms,
char uuidstr[VIR_UUID_STRING_BUFLEN]; char uuidstr[VIR_UUID_STRING_BUFLEN];
virDomainObjPtr obj; virDomainObjPtr obj;
virObjectLock(doms); virObjectLockRead(doms);
virUUIDFormat(uuid, uuidstr); virUUIDFormat(uuid, uuidstr);
obj = virHashLookup(doms->objs, uuidstr); obj = virHashLookup(doms->objs, uuidstr);
@ -204,7 +204,7 @@ virDomainObjPtr virDomainObjListFindByName(virDomainObjListPtr doms,
{ {
virDomainObjPtr obj; virDomainObjPtr obj;
virObjectLock(doms); virObjectLockRead(doms);
obj = virHashLookup(doms->objsName, name); obj = virHashLookup(doms->objsName, name);
virObjectRef(obj); virObjectRef(obj);
virObjectUnlock(doms); virObjectUnlock(doms);
@ -653,7 +653,7 @@ virDomainObjListNumOfDomains(virDomainObjListPtr doms,
virConnectPtr conn) virConnectPtr conn)
{ {
struct virDomainObjListData data = { filter, conn, active, 0 }; struct virDomainObjListData data = { filter, conn, active, 0 };
virObjectLock(doms); virObjectLockRead(doms);
virHashForEach(doms->objs, virDomainObjListCount, &data); virHashForEach(doms->objs, virDomainObjListCount, &data);
virObjectUnlock(doms); virObjectUnlock(doms);
return data.count; return data.count;
@ -697,7 +697,7 @@ virDomainObjListGetActiveIDs(virDomainObjListPtr doms,
{ {
struct virDomainIDData data = { filter, conn, struct virDomainIDData data = { filter, conn,
0, maxids, ids }; 0, maxids, ids };
virObjectLock(doms); virObjectLockRead(doms);
virHashForEach(doms->objs, virDomainObjListCopyActiveIDs, &data); virHashForEach(doms->objs, virDomainObjListCopyActiveIDs, &data);
virObjectUnlock(doms); virObjectUnlock(doms);
return data.numids; return data.numids;
@ -751,7 +751,7 @@ virDomainObjListGetInactiveNames(virDomainObjListPtr doms,
struct virDomainNameData data = { filter, conn, struct virDomainNameData data = { filter, conn,
0, 0, maxnames, names }; 0, 0, maxnames, names };
size_t i; size_t i;
virObjectLock(doms); virObjectLockRead(doms);
virHashForEach(doms->objs, virDomainObjListCopyInactiveNames, &data); virHashForEach(doms->objs, virDomainObjListCopyInactiveNames, &data);
virObjectUnlock(doms); virObjectUnlock(doms);
if (data.oom) { if (data.oom) {
@ -792,7 +792,7 @@ virDomainObjListForEach(virDomainObjListPtr doms,
struct virDomainListIterData data = { struct virDomainListIterData data = {
callback, opaque, 0, callback, opaque, 0,
}; };
virObjectLock(doms); virObjectLockRead(doms);
virHashForEach(doms->objs, virDomainObjListHelper, &data); virHashForEach(doms->objs, virDomainObjListHelper, &data);
virObjectUnlock(doms); virObjectUnlock(doms);
return data.ret; return data.ret;
@ -925,7 +925,7 @@ virDomainObjListCollect(virDomainObjListPtr domlist,
{ {
struct virDomainListData data = { NULL, 0 }; struct virDomainListData data = { NULL, 0 };
virObjectLock(domlist); virObjectLockRead(domlist);
sa_assert(domlist->objs); sa_assert(domlist->objs);
if (VIR_ALLOC_N(data.vms, virHashSize(domlist->objs)) < 0) { if (VIR_ALLOC_N(data.vms, virHashSize(domlist->objs)) < 0) {
virObjectUnlock(domlist); virObjectUnlock(domlist);
@ -962,7 +962,7 @@ virDomainObjListConvert(virDomainObjListPtr domlist,
*nvms = 0; *nvms = 0;
*vms = NULL; *vms = NULL;
virObjectLock(domlist); virObjectLockRead(domlist);
for (i = 0; i < ndoms; i++) { for (i = 0; i < ndoms; i++) {
virDomainPtr dom = doms[i]; virDomainPtr dom = doms[i];