From e5ecae38fc043a6afcf65d1568c9b22ef0e035a7 Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 8 Aug 2012 19:15:01 +0000
Subject: [PATCH] Be more descriptive about poll error / timeout when
 transmitting.

---
 tools/tools/netmap/pkt-gen.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tools/tools/netmap/pkt-gen.c b/tools/tools/netmap/pkt-gen.c
index 4994e1df5a2e..4aa09d37de48 100644
--- a/tools/tools/netmap/pkt-gen.c
+++ b/tools/tools/netmap/pkt-gen.c
@@ -468,13 +468,14 @@ static void *
 sender_body(void *data)
 {
 	struct targ *targ = (struct targ *) data;
-
 	struct pollfd fds[1];
 	struct netmap_if *nifp = targ->nifp;
 	struct netmap_ring *txring;
 	int i, pkts_per_td = targ->g->npackets / targ->g->nthreads, sent = 0;
 	int continuous = 0;
 	int options = targ->g->options | OPT_COPY;
+	int retval;
+
 D("start");
 	if (pkts_per_td == 0) {
 		continuous = 1;
@@ -508,10 +509,14 @@ D("start");
 		/*
 		 * wait for available room in the send queue(s)
 		 */
-		if (poll(fds, 1, 2000) <= 0) {
+		if ((retval = poll(fds, 1, 2000)) <= 0) {
 			if (targ->cancel)
 				break;
-			D("poll error/timeout on queue %d\n", targ->me);
+			if (retval == 0)
+				D("poll timeout on queue %d\n", targ->me);
+			else
+				D("poll error on queue %d: %s\n", targ->me,
+				    strerror(errno));
 			goto quit;
 		}
 		/*