External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 01:45:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

remote: Move the call to remoteClientFreePrivateCallbacks from FreeFunc to CloseFunc

Browse Source 
Still because of commit id 'fe8f1c8b' where we generate a REF for the
Register and that's transparent to the consumer (e.g. how would they
know they need to ensure that Deregister is called), thus the purpose of
this patch is to find a way to Deregister if it's determined that the
consumer hasn't by the time of the "last" REF we'd have.

This solution to this problem is to alter the processing to have the
remoteClientCloseFunc handle performing the Deregister calls instead of
the remoteClientFreeFunc because there's no way FreeFunc would be called
unless the Deregister was already called.
This commit is contained in:
xinhua.Cao 2017-11-13 21:07:58 +08:00 committed by John Ferlan
parent 60e8bbc4c5
commit 1fd1b76610
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
daemon/remote.c
View File

@ -1738,11 +1738,9 @@ void remoteClientFreeFunc(void *data)
{
struct daemonClientPrivate *priv = data;
/* Deregister event delivery callback */
if (priv->conn) {
remoteClientFreePrivateCallbacks(priv);
if (priv->conn)
virConnectClose(priv->conn);
}
VIR_FREE(priv);
}
@ -1752,6 +1750,10 @@ static void remoteClientCloseFunc(virNetServerClientPtr client)
struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client);
daemonRemoveAllClientStreams(priv->streams);
/* Deregister event delivery callback */
if (priv->conn)
remoteClientFreePrivateCallbacks(priv);
}