X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=liblttng-ust-comm%2Flttng-ust-comm.c;h=c01eb9dec37cc3d76b3dc32308c87519f401753c;hb=451d66b27efb332bd16f79dcee374b6a2c85186f;hp=129ad8f259aaa3eea7fea766a567c207fd98797e;hpb=c362addf1c50e1d3202a26ff96738b71b4f9a531;p=deliverable%2Flttng-ust.git

diff --git a/liblttng-ust-comm/lttng-ust-comm.c b/liblttng-ust-comm/lttng-ust-comm.c
index 129ad8f2..c01eb9de 100644
--- a/liblttng-ust-comm/lttng-ust-comm.c
+++ b/liblttng-ust-comm/lttng-ust-comm.c
@@ -95,7 +95,7 @@ const char *lttng_ust_strerror(int code)
  *
  * Connect to unix socket using the path name.
  */
-int ustcomm_connect_unix_sock(const char *pathname)
+int ustcomm_connect_unix_sock(const char *pathname, long timeout)
 {
 	struct sockaddr_un sun;
 	int fd, ret;
@@ -110,6 +110,15 @@ int ustcomm_connect_unix_sock(const char *pathname)
 		ret = -errno;
 		goto error;
 	}
+	if (timeout >= 0) {
+		/* Give at least 10ms. */
+		if (timeout < 10)
+			timeout = 10;
+		ret = ustcomm_setsockopt_snd_timeout(fd, timeout);
+		if (ret < 0) {
+			WARN("Error setting connect socket send timeout");
+		}
+	}
 	ret = fcntl(fd, F_SETFD, FD_CLOEXEC);
 	if (ret < 0) {
 		PERROR("fcntl");