NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

lock_daemon: Switch to wrapper locking functions

Browse Source 
Lets use wrapper functions virLockDaemonLock and
virLockDaemonUnlock instead of virMutexLock and virMutexUnlock.
This has no functional impact, but it's easier to read (at least
for me).

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2015-10-07 13:36:43 +02:00
parent 66f319aec0
commit 4f3d15479a
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/locking/lock_daemon.c
View File

@ -125,6 +125,17 @@ virLockDaemonFree(virLockDaemonPtr lockd)
VIR_FREE(lockd); VIR_FREE(lockd);
} }
static inline void
virLockDaemonLock(virLockDaemonPtr lockd)
{
virMutexLock(&lockd->lock);
}
static inline void
virLockDaemonUnlock(virLockDaemonPtr lockd)
{
virMutexUnlock(&lockd->lock);
}
static void virLockDaemonLockSpaceDataFree(void *data, static void virLockDaemonLockSpaceDataFree(void *data,
const void *key ATTRIBUTE_UNUSED) const void *key ATTRIBUTE_UNUSED)
@ -275,9 +286,9 @@ int virLockDaemonAddLockSpace(virLockDaemonPtr lockd,
virLockSpacePtr lockspace) virLockSpacePtr lockspace)
{ {
int ret; int ret;
virMutexLock(&lockd->lock); virLockDaemonLock(lockd);
ret = virHashAddEntry(lockd->lockspaces, path, lockspace); ret = virHashAddEntry(lockd->lockspaces, path, lockspace);
virMutexUnlock(&lockd->lock); virLockDaemonUnlock(lockd);
return ret; return ret;
} }
@ -285,12 +296,12 @@ virLockSpacePtr virLockDaemonFindLockSpace(virLockDaemonPtr lockd,
const char *path) const char *path)
{ {
virLockSpacePtr lockspace; virLockSpacePtr lockspace;
virMutexLock(&lockd->lock); virLockDaemonLock(lockd);
if (path && STRNEQ(path, "")) if (path && STRNEQ(path, ""))
lockspace = virHashLookup(lockd->lockspaces, path); lockspace = virHashLookup(lockd->lockspaces, path);
else else
lockspace = lockd->defaultLockspace; lockspace = lockd->defaultLockspace;
virMutexUnlock(&lockd->lock); virLockDaemonUnlock(lockd);
return lockspace; return lockspace;
} }
@ -675,14 +686,14 @@ virLockDaemonClientFree(void *opaque)
/* Release all locks associated with this /* Release all locks associated with this
* owner in all lockspaces */ * owner in all lockspaces */
virMutexLock(&lockDaemon->lock); virLockDaemonLock(lockDaemon);
virHashForEach(lockDaemon->lockspaces, virHashForEach(lockDaemon->lockspaces,
virLockDaemonClientReleaseLockspace, virLockDaemonClientReleaseLockspace,
&data); &data);
virLockDaemonClientReleaseLockspace(lockDaemon->defaultLockspace, virLockDaemonClientReleaseLockspace(lockDaemon->defaultLockspace,
"", "",
&data); &data);
virMutexUnlock(&lockDaemon->lock); virLockDaemonUnlock(lockDaemon);
/* If the client had some active leases when it /* If the client had some active leases when it
* closed the connection, we must kill it off * closed the connection, we must kill it off