External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-04 21:35:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: Refactor test driver event sending

Browse Source 
Make testObjectEventQueue tolerant to NULL @event and move it so that it
does not require a prototype. Additionally we are now able to remove
locking when accessing driver->eventState, since it's using self-locking
APIs and the pointer is immutable.
This commit is contained in:
Peter Krempa 2015-06-16 18:35:57 +02:00
parent c1a34c87ea
commit 678059c064
1 changed files with 31 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/test/test_driver.c
View File

@ -163,8 +163,6 @@ testDriverFree(testDriverPtr driver)
VIR_FREE(driver);
}
static void testObjectEventQueue(testDriverPtr driver,
virObjectEventPtr event);
static void testDriverLock(testDriverPtr driver)
{
@ -176,6 +174,15 @@ static void testDriverUnlock(testDriverPtr driver)
virMutexUnlock(&driver->lock);
}
static void testObjectEventQueue(testDriverPtr driver,
virObjectEventPtr event)
{
if (!event)
return;
virObjectEventStateQueue(driver->eventState, event);
}
static void *testDomainObjPrivateAlloc(void)
{
testDomainObjPrivatePtr priv;
@ -1769,7 +1776,6 @@ testDomainCreateXML(virConnectPtr conn, const char *xml,
cleanup:
if (dom)
virObjectUnlock(dom);
if (event)
testObjectEventQueue(privconn, event);
virDomainDefFree(def);
testDriverUnlock(privconn);
@ -1895,7 +1901,6 @@ static int testDomainDestroy(virDomainPtr domain)
ret = 0;
cleanup:
virDomainObjEndAPI(&privdom);
if (event)
testObjectEventQueue(privconn, event);
testDriverUnlock(privconn);
return ret;
@ -1933,11 +1938,7 @@ static int testDomainResume(virDomainPtr domain)
cleanup:
virDomainObjEndAPI(&privdom);
if (event) {
testDriverLock(privconn);
testObjectEventQueue(privconn, event);
testDriverUnlock(privconn);
}
return ret;
}
@ -1974,12 +1975,7 @@ static int testDomainSuspend(virDomainPtr domain)
cleanup:
virDomainObjEndAPI(&privdom);
if (event) {
testDriverLock(privconn);
testObjectEventQueue(privconn, event);
testDriverUnlock(privconn);
}
return ret;
}
@ -2019,7 +2015,6 @@ static int testDomainShutdownFlags(virDomainPtr domain,
ret = 0;
cleanup:
virDomainObjEndAPI(&privdom);
if (event)
testObjectEventQueue(privconn, event);
testDriverUnlock(privconn);
return ret;
@ -2091,7 +2086,6 @@ static int testDomainReboot(virDomainPtr domain,
ret = 0;
cleanup:
virDomainObjEndAPI(&privdom);
if (event)
testObjectEventQueue(privconn, event);
testDriverUnlock(privconn);
return ret;
@ -2257,7 +2251,6 @@ testDomainSaveFlags(virDomainPtr domain, const char *path,
unlink(path);
}
virDomainObjEndAPI(&privdom);
if (event)
testObjectEventQueue(privconn, event);
testDriverUnlock(privconn);
return ret;
@ -2362,7 +2355,6 @@ testDomainRestoreFlags(virConnectPtr conn,
VIR_FORCE_CLOSE(fd);
if (dom)
virObjectUnlock(dom);
if (event)
testObjectEventQueue(privconn, event);
testDriverUnlock(privconn);
return ret;
@ -2436,7 +2428,6 @@ static int testDomainCoreDumpWithFormat(virDomainPtr domain,
cleanup:
VIR_FORCE_CLOSE(fd);
virDomainObjEndAPI(&privdom);
if (event)
testObjectEventQueue(privconn, event);
testDriverUnlock(privconn);
return ret;
@ -2932,7 +2923,6 @@ static virDomainPtr testDomainDefineXMLFlags(virConnectPtr conn,
virDomainDefFree(oldDef);
if (dom)
virObjectUnlock(dom);
if (event)
testObjectEventQueue(privconn, event);
testDriverUnlock(privconn);
return ret;
@ -3073,7 +3063,6 @@ static int testDomainCreateWithFlags(virDomainPtr domain, unsigned int flags)
cleanup:
virDomainObjEndAPI(&privdom);
if (event)
testObjectEventQueue(privconn, event);
testDriverUnlock(privconn);
return ret;
@ -3145,7 +3134,6 @@ static int testDomainUndefineFlags(virDomainPtr domain,
cleanup:
virDomainObjEndAPI(&privdom);
if (event)
testObjectEventQueue(privconn, event);
testDriverUnlock(privconn);
return ret;
@ -3579,7 +3567,6 @@ static virNetworkPtr testNetworkCreateXML(virConnectPtr conn, const char *xml)
cleanup:
virNetworkDefFree(def);
if (event)
testObjectEventQueue(privconn, event);
virNetworkObjEndAPI(&net);
return ret;
@ -3609,7 +3596,6 @@ virNetworkPtr testNetworkDefineXML(virConnectPtr conn, const char *xml)
cleanup:
virNetworkDefFree(def);
if (event)
testObjectEventQueue(privconn, event);
virNetworkObjEndAPI(&net);
return ret;
@ -3643,7 +3629,6 @@ static int testNetworkUndefine(virNetworkPtr network)
ret = 0;
cleanup:
if (event)
testObjectEventQueue(privconn, event);
virNetworkObjEndAPI(&privnet);
return ret;
@ -3721,7 +3706,6 @@ static int testNetworkCreate(virNetworkPtr network)
ret = 0;
cleanup:
if (event)
testObjectEventQueue(privconn, event);
virNetworkObjEndAPI(&privnet);
return ret;
@ -3750,7 +3734,6 @@ static int testNetworkDestroy(virNetworkPtr network)
ret = 0;
cleanup:
if (event)
testObjectEventQueue(privconn, event);
virNetworkObjEndAPI(&privnet);
return ret;
@ -6034,15 +6017,6 @@ testConnectNetworkEventDeregisterAny(virConnectPtr conn,
return ret;
}
/* driver must be locked before calling */
static void testObjectEventQueue(testDriverPtr driver,
virObjectEventPtr event)
{
virObjectEventStateQueue(driver->eventState, event);
}
static int testConnectListAllDomains(virConnectPtr conn,
virDomainPtr **domains,
unsigned int flags)
@ -6159,11 +6133,7 @@ testDomainManagedSave(virDomainPtr dom, unsigned int flags)
ret = 0;
cleanup:
virDomainObjEndAPI(&vm);
if (event) {
testDriverLock(privconn);
testObjectEventQueue(privconn, event);
testDriverUnlock(privconn);
}
return ret;
}
@ -6692,11 +6662,7 @@ testDomainSnapshotCreateXML(virDomainPtr domain,
}
virDomainObjEndAPI(&vm);
}
if (event) {
testDriverLock(privconn);
testObjectEventQueue(privconn, event);
testDriverUnlock(privconn);
}
virDomainSnapshotDefFree(def);
return snapshot;
}
@ -6936,7 +6902,6 @@ testDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT);
if (event)
testObjectEventQueue(privconn, event);
goto load;
}
@ -7016,7 +6981,6 @@ testDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
/* Flush first event, now do transition 2 or 3 */
bool paused = (flags & VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED) != 0;
if (event)
testObjectEventQueue(privconn, event);
event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STARTED,
@ -7034,7 +6998,6 @@ testDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
cleanup:
if (event) {
testObjectEventQueue(privconn, event);
if (event2)
testObjectEventQueue(privconn, event2);
} else {
virObjectUnref(event2);