提交 1fd1b766 编写于 作者: X xinhua.Cao 提交者: John Ferlan

remote: Move the call to remoteClientFreePrivateCallbacks from FreeFunc to CloseFunc

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.
上级 60e8bbc4
......@@ -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);
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册