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

close callback API: remove unnecessary locks

Browse Source 
closeCallback pointer is immutable (set on connection object creation)
and self-locking.
This commit is contained in:
Nikolay Shirokovskiy 2016-02-17 15:14:58 +03:00 committed by Daniel P. Berrange
parent baf47a1f5a
commit fa8c164501
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libvirt-host.c
View File

@ -1214,10 +1214,7 @@ virConnectRegisterCloseCallback(virConnectPtr conn,
VIR_DEBUG("conn=%p", conn); VIR_DEBUG("conn=%p", conn);
virResetLastError(); virResetLastError();
virCheckConnectReturn(conn, -1); virCheckConnectReturn(conn, -1);
virObjectLock(conn);
virCheckNonNullArgGoto(cb, error); virCheckNonNullArgGoto(cb, error);
if (virConnectCloseCallbackDataGetCallback(conn->closeCallback) != NULL) { if (virConnectCloseCallbackDataGetCallback(conn->closeCallback) != NULL) {
@ -1229,11 +1226,9 @@ virConnectRegisterCloseCallback(virConnectPtr conn,
virConnectCloseCallbackDataRegister(conn->closeCallback, conn, cb, virConnectCloseCallbackDataRegister(conn->closeCallback, conn, cb,
opaque, freecb); opaque, freecb);
virObjectUnlock(conn);
return 0; return 0;
error: error:
virObjectUnlock(conn);
virDispatchError(conn); virDispatchError(conn);
return -1; return -1;
} }
@ -1259,10 +1254,7 @@ virConnectUnregisterCloseCallback(virConnectPtr conn,
VIR_DEBUG("conn=%p", conn); VIR_DEBUG("conn=%p", conn);
virResetLastError(); virResetLastError();
virCheckConnectReturn(conn, -1); virCheckConnectReturn(conn, -1);
virObjectLock(conn);
virCheckNonNullArgGoto(cb, error); virCheckNonNullArgGoto(cb, error);
if (virConnectCloseCallbackDataGetCallback(conn->closeCallback) != cb) { if (virConnectCloseCallbackDataGetCallback(conn->closeCallback) != cb) {
@ -1273,11 +1265,9 @@ virConnectUnregisterCloseCallback(virConnectPtr conn,
virConnectCloseCallbackDataUnregister(conn->closeCallback, cb); virConnectCloseCallbackDataUnregister(conn->closeCallback, cb);
virObjectUnlock(conn);
return 0; return 0;
error: error:
virObjectUnlock(conn);
virDispatchError(conn); virDispatchError(conn);
return -1; return -1;
} }