X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Funix.c;h=3945eae4c3c9a2bdbf11ddd21b543587734ca610;hb=a4eb26f0f09cd6d031166329a7d5d7b5d40408a6;hp=d37313c5aed87ee6600b1953ce6ba84a97d6f660;hpb=ba49ae8cc1f9d51c2ef1a60b113fda2e58dc2a7c;p=lttng-tools.git

diff --git a/src/common/unix.c b/src/common/unix.c
index d37313c5a..3945eae4c 100644
--- a/src/common/unix.c
+++ b/src/common/unix.c
@@ -1,19 +1,9 @@
 /*
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
- *                      Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2011 EfficiOS Inc.
+ * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _LGPL_SOURCE
@@ -220,6 +210,9 @@ ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len)
  * Receive data of size len in put that data into the buf param. Using recvmsg
  * API. Only use with sockets set in non-blocking mode.
  *
+ * NOTE: EPIPE errors are NOT reported. This call expects the socket to be in a
+ * poll set. The poll loop will handle the EPIPE original cause.
+ *
  * Return the size of received data.
  */
 LTTNG_HIDDEN
@@ -243,17 +236,24 @@ retry:
 			goto retry;
 		} else {
 			/*
-			 * Only warn about EPIPE when quiet mode is
-			 * deactivated.
-			 * We consider EPIPE as expected.
+			 * We consider EPIPE and EAGAIN/EWOULDBLOCK as expected.
 			 */
-			if (errno != EPIPE || !lttng_opt_quiet) {
-				PERROR("recvmsg");
+			if (errno == EAGAIN || errno == EWOULDBLOCK ||
+					errno == EPIPE) {
+				/*
+				 * Nothing was recv.
+				 */
+				ret = 0;
+				goto end;
 			}
+
+			/* Unexpected error */
+			PERROR("recvmsg");
+			ret = -1;
 			goto end;
 		}
 	}
-	ret = len;
+
 end:
 	return ret;
 }
@@ -308,6 +308,9 @@ end:
  * of the function is that this one does not retry to send on partial sends,
  * except if the interruption was caused by a signal (EINTR).
  *
+ * NOTE: EPIPE errors are NOT reported. This call expects the socket to be in a
+ * poll set. The poll loop will handle the EPIPE original cause.
+ *
  * Return the size of sent data.
  */
 LTTNG_HIDDEN
@@ -331,17 +334,24 @@ retry:
 			goto retry;
 		} else {
 			/*
-			 * Only warn about EPIPE when quiet mode is
-			 * deactivated.
-			 * We consider EPIPE as expected.
+			 * We consider EPIPE and EAGAIN/EWOULDBLOCK as expected.
 			 */
-			if (errno != EPIPE || !lttng_opt_quiet) {
-				PERROR("sendmsg");
+			if (errno == EAGAIN || errno == EWOULDBLOCK ||
+					errno == EPIPE) {
+				/*
+				 * This can happen in non blocking mode.
+				 * Nothing was sent.
+				 */
+				ret = 0;
+				goto end;
 			}
+
+			/* Unexpected error */
+			PERROR("sendmsg");
+			ret = -1;
 			goto end;
 		}
 	}
-	ret = len;
 end:
 	return ret;
 }