External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-28 16:45:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify some redundant locking while unref'ing objects

Browse Source 
There is no need to hold the mutex when unref'ing
virObject instances

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
(cherry picked from commit 7307c3c00c)
This commit is contained in:
Daniel P. Berrange 2012-09-24 15:19:34 +01:00 committed by Cole Robinson
parent c9791620a0
commit f4e3a2afa5
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/conf/domain_conf.c
View File

@ -741,9 +741,7 @@ static void
virDomainObjListDataFree(void *payload, const void *name ATTRIBUTE_UNUSED) virDomainObjListDataFree(void *payload, const void *name ATTRIBUTE_UNUSED)
{ {
virDomainObjPtr obj = payload; virDomainObjPtr obj = payload;
virDomainObjLock(obj); virObjectUnref(obj);
if (virObjectUnref(obj))
virDomainObjUnlock(obj);
} }
int virDomainObjListInit(virDomainObjListPtr doms) int virDomainObjListInit(virDomainObjListPtr doms)

4
src/qemu/qemu_driver.c
View File

@ -3499,8 +3499,8 @@ endjob:
ignore_value(qemuDomainObjEndAsyncJob(driver, wdEvent->vm)); ignore_value(qemuDomainObjEndAsyncJob(driver, wdEvent->vm));
unlock: unlock:
if (virObjectUnref(wdEvent->vm)) virDomainObjUnlock(wdEvent->vm);
virDomainObjUnlock(wdEvent->vm); virObjectUnref(wdEvent->vm);
qemuDriverUnlock(driver); qemuDriverUnlock(driver);
VIR_FREE(wdEvent); VIR_FREE(wdEvent);
} }

3
src/rpc/virnetserver.c
View File

@ -191,10 +191,7 @@ static void virNetServerHandleJob(void *jobOpaque, void *opaque)
if (virNetServerProcessMsg(srv, job->client, job->prog, job->msg) < 0) if (virNetServerProcessMsg(srv, job->client, job->prog, job->msg) < 0)
goto error; goto error;
virNetServerLock(srv);
virObjectUnref(job->prog); virObjectUnref(job->prog);
virNetServerUnlock(srv);
virObjectUnref(job->client); virObjectUnref(job->client);
VIR_FREE(job); VIR_FREE(job);
return; return;