提交 c5d1a995 编写于 作者: D Daniel P. Berrange

Fix busy-wait loop on closed file descriptor

When closing open streams after a client quits, the event
callback was not removed. This mean that poll() was using
a closed FD and returning POLLNVAL in a busy-wait loop.

* daemon/stream.c: Disconnect stream callbacks
上级 dad4b5d4
......@@ -108,6 +108,7 @@ remoteStreamEvent(virStreamPtr st, int events, void *opaque)
remote_error rerr;
memset(&rerr, 0, sizeof rerr);
stream->closed = 1;
virStreamEventRemoveCallback(stream->st);
virStreamAbort(stream->st);
if (events & VIR_STREAM_EVENT_HANGUP)
remoteDispatchFormatError(&rerr, "%s", _("stream had unexpected termination"));
......@@ -345,8 +346,10 @@ remoteRemoveClientStream(struct qemud_client *client,
}
}
if (!stream->closed)
if (!stream->closed) {
virStreamEventRemoveCallback(stream->st);
virStreamAbort(stream->st);
}
while (curr) {
if (curr == stream) {
......@@ -429,6 +432,7 @@ remoteStreamHandleFinish(struct qemud_client *client,
memset(&rerr, 0, sizeof rerr);
stream->closed = 1;
virStreamEventRemoveCallback(stream->st);
ret = virStreamFinish(stream->st);
if (ret < 0) {
......@@ -462,6 +466,7 @@ remoteStreamHandleAbort(struct qemud_client *client,
memset(&rerr, 0, sizeof rerr);
stream->closed = 1;
virStreamEventRemoveCallback(stream->st);
virStreamAbort(stream->st);
if (msg->hdr.status == REMOTE_ERROR)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册