svn commit: r294644 - user/ngie/socket-tests/tools/regression/sockets/unix_cmsg

[Garrett Cooper]

Author: ngie
Date: Sat Jan 23 22:26:51 2016
New Revision: 294644
URL: https://svnweb.freebsd.org/changeset/base/294644

Log:
  Add some more debugging to help aid in figuring out what's going
  on in the test program
  
  Sponsored by: EMC / Isilon Storage Division

Modified:
  user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c

Modified: user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c
==============================================================================
--- user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c	Sat Jan 23 22:26:05 2016	(r294643)
+++ user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c	Sat Jan 23 22:26:51 2016	(r294644)
@@ -1233,6 +1233,10 @@ msghdr_init_client(struct msghdr *msghdr
 
 	msghdr_init_generic(msghdr, iov, cmsg_data);
 	if (cmsg_data != NULL) {
+		if (send_array_flag)
+			dbgmsg("sending an array");
+		else
+			dbgmsg("sending a scalar");
 		msghdr->msg_controllen = send_array_flag ?
 		    cmsg_size : CMSG_SPACE(0);
 		cmsghdr = CMSG_FIRSTHDR(msghdr);
@@ -1874,8 +1878,11 @@ t_cmsg_len_client(int fd)
 		    (u_int)msghdr.msg_controllen);
 		dbgmsg("send: cmsghdr.cmsg_len %u",
 		    (u_int)cmsghdr->cmsg_len);
-		if (sendmsg(fd, &msghdr, 0) < 0)
+		if (sendmsg(fd, &msghdr, 0) < 0) {
+			dbgmsg("sendmsg(2) failed: %s; retrying",
+			    strerror(errno));
 			continue;
+		}
 		logmsgx("sent message with cmsghdr.cmsg_len %u < %u",
 		    (u_int)cmsghdr->cmsg_len, (u_int)CMSG_LEN(0));
 		break;