One big downside of using the pipe to transfer the data is that
we can really transfer just bare data. No metadata can be carried
through unless some formatted messages are introduced. That would
be quite painful to achieve so let's use a message queue. It's
fairly easy to exchange info between threads now that iohelper is
no longer used.
Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx>
---
src/util/virfdstream.c | 392 ++++++++++++++++++++++++++++++++++++++++---------
1 file changed, 321 insertions(+), 71 deletions(-)
diff --git a/src/util/virfdstream.c b/src/util/virfdstream.c
index 4efc65d..efd9199 100644
--- a/src/util/virfdstream.c
+++ b/src/util/virfdstream.c
@@ -49,6 +49,27 @@
VIR_LOG_INIT("fdstream");
+typedef enum {
+ VIR_FDSTREAM_MSG_TYPE_DATA,
+} virFDStreamMsgType;
+
+typedef struct _virFDStreamMsg virFDStreamMsg;
+typedef virFDStreamMsg *virFDStreamMsgPtr;
+struct _virFDStreamMsg {
+ virFDStreamMsgPtr next;
+
+ virFDStreamMsgType type;
+
+ union {
+ struct {
+ char *buf;
+ size_t len;
+ size_t offset;
+ } data;
+ } stream;
+};
+
+
/* Tunnelled migration stream support */
typedef struct virFDStreamData virFDStreamData;
typedef virFDStreamData *virFDStreamDataPtr;
@@ -80,18 +101,25 @@ struct virFDStreamData {
/* Thread data */
virThreadPtr thread;
+ virCond threadCond;
int threadErr;
bool threadQuit;
+ bool threadAbort;
+ bool threadDoRead;
+ virFDStreamMsgPtr msg;
};
static virClassPtr virFDStreamDataClass;
+static void virFDStreamMsgQueueFree(virFDStreamMsgPtr *queue);
+
static void
virFDStreamDataDispose(void *obj)
{
virFDStreamDataPtr fdst = obj;
VIR_DEBUG("obj=%p", fdst);
+ virFDStreamMsgQueueFree(&fdst->msg);
}
static int virFDStreamDataOnceInit(void)
@@ -108,6 +136,66 @@ static int virFDStreamDataOnceInit(void)
VIR_ONCE_GLOBAL_INIT(virFDStreamData)
+static void
+virFDStreamMsgQueuePush(virFDStreamDataPtr fdst,
+ virFDStreamMsgPtr msg)
+{
+ virFDStreamMsgPtr *tmp = &fdst->msg;
+
+ while (*tmp)
+ tmp = &(*tmp)->next;
+
+ *tmp = msg;
+ virCondSignal(&fdst->threadCond);
+}
+
+
+static virFDStreamMsgPtr
+virFDStreamMsgQueuePop(virFDStreamDataPtr fdst)
+{
+ virFDStreamMsgPtr tmp = fdst->msg;
+
+ if (tmp) {
+ fdst->msg = tmp->next;
+ tmp->next = NULL;
+ }
+
+ virCondSignal(&fdst->threadCond);
+ return tmp;
+}
+
+
+static void
+virFDStreamMsgFree(virFDStreamMsgPtr msg)
+{
+ if (!msg)
+ return;
+
+ switch (msg->type) {
+ case VIR_FDSTREAM_MSG_TYPE_DATA:
+ VIR_FREE(msg->stream.data.buf);
+ break;
+ }
+
+ VIR_FREE(msg);
+}
+
+
+static void
+virFDStreamMsgQueueFree(virFDStreamMsgPtr *queue)
+{
+ virFDStreamMsgPtr tmp = *queue;
+
+ while (tmp) {
+ virFDStreamMsgPtr next = tmp->next;
+ virFDStreamMsgFree(tmp);
+ tmp = next;
+ }
+
+ *queue = NULL;
+}
+
+
static int virFDStreamRemoveCallback(virStreamPtr stream)
{
virFDStreamDataPtr fdst = stream->privateData;
@@ -289,12 +377,86 @@ virFDStreamThreadDataFree(virFDStreamThreadDataPtr data)
virObjectUnref(data->st);
VIR_FREE(data->fdinname);
VIR_FREE(data->fdoutname);
- VIR_FORCE_CLOSE(data->fdin);
- VIR_FORCE_CLOSE(data->fdout);
VIR_FREE(data);
}
+static ssize_t
+virFDStreamThreadDoRead(virFDStreamDataPtr fdst,
+ const int fdin,
+ const char *fdinname,
+ size_t buflen)
+{
+ virFDStreamMsgPtr msg = NULL;
+ char *buf = NULL;
+ ssize_t got;
+
+ if (VIR_ALLOC(msg) < 0)
+ goto error;
+
+ if (VIR_ALLOC_N(buf, buflen) < 0)
+ goto error;
+
+ if ((got = saferead(fdin, buf, buflen)) < 0) {
+ virReportSystemError(errno,
+ _("Unable to read %s"),
+ fdinname);
+ goto error;
+ }
+
+ msg->type = VIR_FDSTREAM_MSG_TYPE_DATA;
+ msg->stream.data.buf = buf;
+ msg->stream.data.len = got;
+ buf = NULL;
+
+ virFDStreamMsgQueuePush(fdst, msg);
+ msg = NULL;
+
+ return got;
+
+ error:
+ VIR_FREE(buf);
+ virFDStreamMsgFree(msg);
+ return -1;
+}
+
+
+static ssize_t
+virFDStreamThreadDoWrite(virFDStreamDataPtr fdst,
+ const int fdout,
+ const char *fdoutname)
+{
+ ssize_t got;
+ virFDStreamMsgPtr msg = fdst->msg;
+ bool pop = false;
+
+ switch (msg->type) {
+ case VIR_FDSTREAM_MSG_TYPE_DATA:
+ got = safewrite(fdout,
+ msg->stream.data.buf + msg->stream.data.offset,
+ msg->stream.data.len - msg->stream.data.offset);
+ if (got < 0) {
+ virReportSystemError(errno,
+ _("Unable to write %s"),
+ fdoutname);
+ return -1;
+ }
+
+ msg->stream.data.offset += got;
+
+ pop = msg->stream.data.offset == msg->stream.data.len;
+ break;
+ }
+
+ if (pop) {
+ virFDStreamMsgQueuePop(fdst);
+ virFDStreamMsgFree(msg);
+ }
+
+ return got;
+}
+
+
static void
virFDStreamThread(void *opaque)
{
@@ -306,14 +468,12 @@ virFDStreamThread(void *opaque)
int fdout = data->fdout;
char *fdoutname = data->fdoutname;
virFDStreamDataPtr fdst = st->privateData;
- char *buf = NULL;
+ bool doRead = fdst->threadDoRead;
size_t buflen = 256 * 1024;
size_t total = 0;
virObjectRef(fdst);
-
- if (VIR_ALLOC_N(buf, buflen) < 0)
- goto error;
+ virObjectLock(fdst);
while (1) {
ssize_t got;
@@ -325,37 +485,49 @@ virFDStreamThread(void *opaque)
if (buflen == 0)
break; /* End of requested data from client */
- if ((got = saferead(fdin, buf, buflen)) < 0) {
- virReportSystemError(errno,
- _("Unable to read %s"),
- fdinname);
+ while (doRead == (fdst->msg != NULL) &&
+ !fdst->threadQuit) {
+ if (virCondWait(&fdst->threadCond, &fdst->parent.lock)) {
+ virReportSystemError(errno, "%s",
+ _("failed to wait on condition"));
+ goto error;
+ }
+ }
+
+ if (fdst->threadQuit) {
+ /* If stream abort was requested, quit early. */
+ if (fdst->threadAbort)
+ goto cleanup;
+
+ /* Otherwise flush buffers and quit gracefully. */
+ if (doRead == (fdst->msg != NULL))
+ break;
+ }
+
+ if (doRead)
+ got = virFDStreamThreadDoRead(fdst, fdin, fdinname, buflen);
+ else
+ got = virFDStreamThreadDoWrite(fdst, fdout, fdoutname);
+
+ if (got < 0)
goto error;
- }
if (got == 0)
break;
total += got;
-
- if (safewrite(fdout, buf, got) < 0) {
- virReportSystemError(errno,
- _("Unable to write %s"),
- fdoutname);
- goto error;
- }
}
cleanup:
+ fdst->threadQuit = true;
+ virObjectUnlock(fdst);
if (!virObjectUnref(fdst))
st->privateData = NULL;
virFDStreamThreadDataFree(data);
- VIR_FREE(buf);
return;
error:
- virObjectLock(fdst);
fdst->threadErr = errno;
- virObjectUnlock(fdst);
goto cleanup;
}
@@ -367,6 +539,10 @@ virFDStreamJoinWorker(virFDStreamDataPtr fdst, bool streamAbort)
if (!fdst->thread)
return 0;
+ fdst->threadAbort = streamAbort;
+ fdst->threadQuit = true;
+ virCondSignal(&fdst->threadCond);
+
/* Give the thread a chance to lock the FD stream object. */
virObjectUnlock(fdst);
virThreadJoin(fdst->thread);
@@ -380,6 +556,7 @@ virFDStreamJoinWorker(virFDStreamDataPtr fdst, bool streamAbort)
ret = 0;
cleanup:
VIR_FREE(fdst->thread);
+ virCondDestroy(&fdst->threadCond);
return ret;
}
@@ -426,11 +603,14 @@ virFDStreamCloseInt(virStreamPtr st, bool streamAbort)
fdst->abortCallbackDispatching = false;
}
- /* mutex locked */
- ret = VIR_CLOSE(fdst->fd);
if (virFDStreamJoinWorker(fdst, streamAbort) < 0)
ret = -1;
+ /* mutex locked */
+ if ((ret = VIR_CLOSE(fdst->fd)) < 0)
+ virReportSystemError(errno, "%s",
+ _("Unable to close"));
+
st->privateData = NULL;
/* call the internal stream closing callback */
@@ -467,7 +647,8 @@ virFDStreamAbort(virStreamPtr st)
static int virFDStreamWrite(virStreamPtr st, const char *bytes, size_t nbytes)
{
virFDStreamDataPtr fdst = st->privateData;
- int ret;
+ virFDStreamMsgPtr msg = NULL;
+ int ret = -1;
if (nbytes > INT_MAX) {
virReportSystemError(ERANGE, "%s",
@@ -495,25 +676,51 @@ static int virFDStreamWrite(virStreamPtr st, const char *bytes, size_t nbytes)
nbytes = fdst->length - fdst->offset;
}
- retry:
- ret = write(fdst->fd, bytes, nbytes);
- if (ret < 0) {
- VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR
- if (errno == EAGAIN || errno == EWOULDBLOCK) {
- VIR_WARNINGS_RESET
- ret = -2;
- } else if (errno == EINTR) {
- goto retry;
- } else {
- ret = -1;
- virReportSystemError(errno, "%s",
+ if (fdst->thread) {
+ char *buf;
+
+ if (fdst->threadQuit) {
+ virReportSystemError(EBADF, "%s",
_("cannot write to stream"));
+ return -1;
+ }
+
+ if (VIR_ALLOC(msg) < 0 ||
+ VIR_ALLOC_N(buf, nbytes) < 0)
+ goto cleanup;
+
+ memcpy(buf, bytes, nbytes);
+ msg->type = VIR_FDSTREAM_MSG_TYPE_DATA;
+ msg->stream.data.buf = buf;
+ msg->stream.data.len = nbytes;
+
+ virFDStreamMsgQueuePush(fdst, msg);
+ msg = NULL;
+ ret = nbytes;
+ } else {
+ retry:
+ ret = write(fdst->fd, bytes, nbytes);
+ if (ret < 0) {
+ VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR
+ if (errno == EAGAIN || errno == EWOULDBLOCK) {
+ VIR_WARNINGS_RESET
+ ret = -2;
+ } else if (errno == EINTR) {
+ goto retry;
+ } else {
+ ret = -1;
+ virReportSystemError(errno, "%s",
+ _("cannot write to stream"));
+ }
}
- } else if (fdst->length) {
- fdst->offset += ret;
}
+ if (fdst->length)
+ fdst->offset += ret;
+
+ cleanup:
virObjectUnlock(fdst);
+ virFDStreamMsgFree(msg);
return ret;
}
@@ -521,7 +728,7 @@ static int virFDStreamWrite(virStreamPtr st, const char *bytes, size_t nbytes)
static int virFDStreamRead(virStreamPtr st, char *bytes, size_t nbytes)
{
virFDStreamDataPtr fdst = st->privateData;
- int ret;
+ int ret = -1;
if (nbytes > INT_MAX) {
virReportSystemError(ERANGE, "%s",
@@ -547,24 +754,70 @@ static int virFDStreamRead(virStreamPtr st, char *bytes, size_t nbytes)
nbytes = fdst->length - fdst->offset;
}
- retry:
- ret = read(fdst->fd, bytes, nbytes);
- if (ret < 0) {
- VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR
- if (errno == EAGAIN || errno == EWOULDBLOCK) {
- VIR_WARNINGS_RESET
- ret = -2;
- } else if (errno == EINTR) {
- goto retry;
- } else {
- ret = -1;
- virReportSystemError(errno, "%s",
- _("cannot read from stream"));
+ if (fdst->thread) {
+ virFDStreamMsgPtr msg = NULL;
+
+ while (!(msg = fdst->msg)) {
+ if (fdst->threadQuit) {
+ if (nbytes) {
+ virReportSystemError(EBADF, "%s",
+ _("stream is not open"));
+ } else {
+ ret = 0;
+ }
+ goto cleanup;
+ } else {
+ virObjectUnlock(fdst);
+ virCondSignal(&fdst->threadCond);
+ virObjectLock(fdst);
+ }
+ }
+
+ if (msg->type != VIR_FDSTREAM_MSG_TYPE_DATA) {
+ /* Nope, nope, I'm outta here */
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("unexpected message type"));
+ goto cleanup;
+ }
+
+ if (nbytes > msg->stream.data.len - msg->stream.data.offset)
+ nbytes = msg->stream.data.len - msg->stream.data.offset;
+
+ memcpy(bytes,
+ msg->stream.data.buf + msg->stream.data.offset,
+ nbytes);
+
+ msg->stream.data.offset += nbytes;
+ if (msg->stream.data.offset == msg->stream.data.len) {
+ virFDStreamMsgQueuePop(fdst);
+ virFDStreamMsgFree(msg);
+ }
+
+ ret = nbytes;
+
+ } else {
+ retry:
+ ret = read(fdst->fd, bytes, nbytes);
+ if (ret < 0) {
+ VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR
+ if (errno == EAGAIN || errno == EWOULDBLOCK) {
+ VIR_WARNINGS_RESET
+ ret = -2;
+ } else if (errno == EINTR) {
+ goto retry;
+ } else {
+ ret = -1;
+ virReportSystemError(errno, "%s",
+ _("cannot read from stream"));
+ }
+ goto cleanup;
}
- } else if (fdst->length) {
- fdst->offset += ret;
}
+ if (fdst->length)
+ fdst->offset += ret;
+
+ cleanup:
virObjectUnlock(fdst);
return ret;
}
@@ -593,7 +846,7 @@ static int virFDStreamOpenInternal(virStreamPtr st,
if (virFDStreamDataInitialize() < 0)
return -1;
- if ((st->flags & VIR_STREAM_NONBLOCK) &&
+ if ((st->flags & VIR_STREAM_NONBLOCK) && !threadData &&
virSetNonBlock(fd) < 0) {
virReportSystemError(errno, "%s", _("Unable to set non-blocking mode"));
return -1;
@@ -609,11 +862,20 @@ static int virFDStreamOpenInternal(virStreamPtr st,
st->privateData = fdst;
if (threadData) {
+ /* The thread is going to do reads if fdin is set and fdout is not. */
+ fdst->threadDoRead = threadData->fdout == -1;
+
/* Create the thread after fdst and st were initialized.
* The thread worker expects them to be that way. */
if (VIR_ALLOC(fdst->thread) < 0)
goto error;
+ if (virCondInit(&fdst->threadCond) < 0) {
+ virReportSystemError(errno, "%s",
+ _("cannot initialize condition variable"));
+ goto error;
+ }
+
if (virThreadCreate(fdst->thread,
true,
virFDStreamThread,
@@ -752,8 +1014,6 @@ virFDStreamOpenFileInternal(virStreamPtr st,
if ((st->flags & VIR_STREAM_NONBLOCK) &&
((!S_ISCHR(sb.st_mode) &&
!S_ISFIFO(sb.st_mode)) || forceIOHelper)) {
- int fds[2] = { -1, -1 };
-
if ((oflags & O_ACCMODE) == O_RDWR) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("%s: Cannot request read and write flags together"),
@@ -761,12 +1021,6 @@ virFDStreamOpenFileInternal(virStreamPtr st,
goto error;
}
- if (pipe(fds) < 0) {
- virReportSystemError(errno, "%s",
- _("Unable to create pipe"));
- goto error;
- }
-
if (VIR_ALLOC(threadData) < 0)
goto error;
@@ -775,18 +1029,14 @@ virFDStreamOpenFileInternal(virStreamPtr st,
if ((oflags & O_ACCMODE) == O_RDONLY) {
threadData->fdin = fd;
- threadData->fdout = fds[1];
- if (VIR_STRDUP(threadData->fdinname, path) < 0 ||
- VIR_STRDUP(threadData->fdoutname, "pipe") < 0)
+ threadData->fdout = -1;
+ if (VIR_STRDUP(threadData->fdinname, path) < 0)
goto error;
- fd = fds[0];
} else {
- threadData->fdin = fds[0];
+ threadData->fdin = -1;
threadData->fdout = fd;
- if (VIR_STRDUP(threadData->fdinname, "pipe") < 0 ||
- VIR_STRDUP(threadData->fdoutname, path) < 0)
+ if (VIR_STRDUP(threadData->fdoutname, path) < 0)
goto error;
- fd = fds[1];
}
}
--
2.10.2
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
