From: Andrew Cooper <andrew.cooper3@citrix.com>
To: Xen-devel <xen-devel@lists.xen.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>,
Ian Jackson <Ian.Jackson@eu.citrix.com>,
Ian Campbell <Ian.Campbell@citrix.com>,
Wei Liu <wei.liu2@citrix.com>
Subject: [PATCH 2/4] tools/libxl: Log the subject fd in datacopier messages
Date: Fri, 17 Jul 2015 17:51:16 +0100 [thread overview]
Message-ID: <1437151878-11792-3-git-send-email-andrew.cooper3@citrix.com> (raw)
In-Reply-To: <1437151878-11792-1-git-send-email-andrew.cooper3@citrix.com>
This is a substantial aid to debugging
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Ian Campbell <Ian.Campbell@citrix.com>
CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
CC: Wei Liu <wei.liu2@citrix.com>
---
tools/libxl/libxl_aoutils.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/tools/libxl/libxl_aoutils.c b/tools/libxl/libxl_aoutils.c
index 9087c23..d5fbc4d 100644
--- a/tools/libxl/libxl_aoutils.c
+++ b/tools/libxl/libxl_aoutils.c
@@ -188,14 +188,13 @@ void libxl__datacopier_prefixdata(libxl__egc *egc, libxl__datacopier_state *dc,
static int datacopier_pollhup_handled(libxl__egc *egc,
libxl__datacopier_state *dc,
- short revents, int onwrite)
+ int fd, short revents, int onwrite)
{
STATE_AO_GC(dc->ao);
if (dc->callback_pollhup && (revents & POLLHUP)) {
- LOG(DEBUG, "received POLLHUP on %s during copy of %s",
- onwrite ? dc->writewhat : dc->readwhat,
- dc->copywhat);
+ LOG(DEBUG, "received POLLHUP on fd %d: %s during copy of %s",
+ fd, onwrite ? dc->writewhat : dc->readwhat, dc->copywhat);
libxl__datacopier_kill(dc);
dc->callback_pollhup(egc, dc, ERROR_FAIL, onwrite, -1);
return 1;
@@ -217,13 +216,13 @@ static void datacopier_readable(libxl__egc *egc, libxl__ev_fd *ev,
libxl__datacopier_state *dc = CONTAINER_OF(ev, *dc, toread);
STATE_AO_GC(dc->ao);
- if (datacopier_pollhup_handled(egc, dc, revents, 0))
+ if (datacopier_pollhup_handled(egc, dc, fd, revents, 0))
return;
if (revents & ~(POLLIN|POLLHUP)) {
- LOG(ERROR,
- "unexpected poll event 0x%x (expected POLLIN and/or POLLHUP)"
- " on %s during copy of %s", revents, dc->readwhat, dc->copywhat);
+ LOG(ERROR, "unexpected poll event 0x%x on fd %d (expected POLLIN "
+ "and/or POLLHUP) reading %s during copy of %s",
+ revents, fd, dc->readwhat, dc->copywhat);
datacopier_callback(egc, dc, ERROR_FAIL, -1, EIO);
return;
}
@@ -286,7 +285,7 @@ static void datacopier_readable(libxl__egc *egc, libxl__ev_fd *ev,
LIBXL__EVENT_DISASTER(egc,
"unexpected failure polling fd for datacopier eof hup check",
errno, 0);
- if (datacopier_pollhup_handled(egc, dc, hupchk.revents, 0))
+ if (datacopier_pollhup_handled(egc, dc, fd, hupchk.revents, 0))
return;
}
libxl__ev_fd_deregister(gc, &dc->toread);
@@ -320,12 +319,13 @@ static void datacopier_writable(libxl__egc *egc, libxl__ev_fd *ev,
libxl__datacopier_state *dc = CONTAINER_OF(ev, *dc, towrite);
STATE_AO_GC(dc->ao);
- if (datacopier_pollhup_handled(egc, dc, revents, 1))
+ if (datacopier_pollhup_handled(egc, dc, fd, revents, 1))
return;
if (revents & ~POLLOUT) {
- LOG(ERROR, "unexpected poll event 0x%x (should be POLLOUT)"
- " on %s during copy of %s", revents, dc->writewhat, dc->copywhat);
+ LOG(ERROR, "unexpected poll event 0x%x on fd %d (should be POLLOUT)"
+ " writing %s during copy of %s",
+ revents, fd, dc->writewhat, dc->copywhat);
datacopier_callback(egc, dc, ERROR_FAIL, -1, EIO);
return;
}
--
1.7.10.4
next prev parent reply other threads:[~2015-07-17 16:51 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-17 16:51 [PATCH 0/4] Fix to libxl migration v2 issue blocking OSSTest Andrew Cooper
2015-07-17 16:51 ` [PATCH 1/4] tools/libxc: Identify the path of the kernel image which cannot be found Andrew Cooper
2015-07-17 16:53 ` Ian Campbell
2015-07-17 16:55 ` Wei Liu
2015-07-17 16:51 ` Andrew Cooper [this message]
2015-07-20 9:54 ` [PATCH 2/4] tools/libxl: Log the subject fd in datacopier messages Wei Liu
2015-07-17 16:51 ` [PATCH 3/4] tools/libxl: Identify copywhat in stream v2 datacopiers Andrew Cooper
2015-07-20 9:55 ` Wei Liu
2015-07-17 16:51 ` [PATCH 4/4] tools/libxl: Initialise the fd of the unused half of a datacopier Andrew Cooper
2015-07-17 16:55 ` Ian Campbell
2015-07-17 16:55 ` Wei Liu
2015-07-17 16:56 ` Andrew Cooper
2015-07-17 16:59 ` [PATCH v2 " Andrew Cooper
2015-07-17 17:01 ` Wei Liu
2015-07-17 17:11 ` Ian Campbell
2015-07-17 17:11 ` Andrew Cooper
2015-07-20 9:56 ` [PATCH 0/4] Fix to libxl migration v2 issue blocking OSSTest Wei Liu
2015-07-20 10:11 ` Andrew Cooper
2015-07-21 12:49 ` Wei Liu
2015-07-21 14:51 ` Ian Campbell
2015-07-21 15:05 ` Ian Campbell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1437151878-11792-3-git-send-email-andrew.cooper3@citrix.com \
--to=andrew.cooper3@citrix.com \
--cc=Ian.Campbell@citrix.com \
--cc=Ian.Jackson@eu.citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).