X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-comm%2Flttng-ust-comm.c;h=d065499a246320f9dc2e00c7403471d3a35123e1;hb=27d8df8abdd6b40203be18365146889d88a28e11;hp=a666ab274b5f3a25af9f77f5cea779938d2da986;hpb=0b9aa170535236b924c9b85ae19dfd2aa4ac9273;p=lttng-ust.git

diff --git a/liblttng-ust-comm/lttng-ust-comm.c b/liblttng-ust-comm/lttng-ust-comm.c
index a666ab27..d065499a 100644
--- a/liblttng-ust-comm/lttng-ust-comm.c
+++ b/liblttng-ust-comm/lttng-ust-comm.c
@@ -86,7 +86,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;
@@ -101,6 +101,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");
@@ -123,7 +132,7 @@ int ustcomm_connect_unix_sock(const char *pathname)
 		 * file exists but no sessiond is listening.
 		 */
 		if (errno != ECONNREFUSED && errno != ECONNRESET
-				&& errno != ENOENT)
+				&& errno != ENOENT && errno != EACCES)
 			PERROR("connect");
 		ret = -errno;
 		if (ret == -ECONNREFUSED || ret == -ECONNRESET)
@@ -265,7 +274,8 @@ ssize_t ustcomm_recv_unix_sock(int sock, void *buf, size_t len)
 {
 	struct msghdr msg;
 	struct iovec iov[1];
-	ssize_t ret;
+	ssize_t ret = -1;
+	size_t len_last;
 
 	memset(&msg, 0, sizeof(msg));
 
@@ -275,8 +285,14 @@ ssize_t ustcomm_recv_unix_sock(int sock, void *buf, size_t len)
 	msg.msg_iovlen = 1;
 
 	do {
+		len_last = iov[0].iov_len;
 		ret = recvmsg(sock, &msg, 0);
-	} while (ret < 0 && errno == EINTR);
+		if (ret > 0) {
+			iov[0].iov_base += ret;
+			iov[0].iov_len -= ret;
+			assert(ret <= len_last);
+		}
+	} while ((ret > 0 && ret < len_last) || (ret < 0 && errno == EINTR));
 
 	if (ret < 0) {
 		int shutret;
@@ -290,7 +306,10 @@ ssize_t ustcomm_recv_unix_sock(int sock, void *buf, size_t len)
 		shutret = shutdown(sock, SHUT_RDWR);
 		if (shutret)
 			ERR("Socket shutdown error");
+	} else if (ret > 0) {
+		ret = len;
 	}
+	/* ret = 0 means an orderly shutdown. */
 
 	return ret;
 }
@@ -367,6 +386,8 @@ ssize_t ustcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd)
 	msg.msg_controllen = CMSG_LEN(sizeof_fds);
 
 	cmptr = CMSG_FIRSTHDR(&msg);
+	if (!cmptr)
+		return -EINVAL;
 	cmptr->cmsg_level = SOL_SOCKET;
 	cmptr->cmsg_type = SCM_RIGHTS;
 	cmptr->cmsg_len = CMSG_LEN(sizeof_fds);
@@ -380,7 +401,7 @@ ssize_t ustcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd)
 	msg.msg_iovlen = 1;
 
 	do {
-		ret = sendmsg(sock, &msg, 0);
+		ret = sendmsg(sock, &msg, MSG_NOSIGNAL);
 	} while (ret < 0 && errno == EINTR);
 	if (ret < 0) {
 		/*
@@ -505,19 +526,27 @@ int ustcomm_recv_app_reply(int sock, struct ustcomm_ust_reply *lur,
 	case 0:	/* orderly shutdown */
 		return -EPIPE;
 	case sizeof(*lur):
+	{
+		int err = 0;
+
 		if (lur->handle != expected_handle) {
 			ERR("Unexpected result message handle: "
 				"expected: %u vs received: %u\n",
 				expected_handle, lur->handle);
-			return -EINVAL;
+			err = 1;
 		}
 		if (lur->cmd != expected_cmd) {
 			ERR("Unexpected result message command "
 				"expected: %u vs received: %u\n",
 				expected_cmd, lur->cmd);
+			err = 1;
+		}
+		if (err) {
 			return -EINVAL;
+		} else {
+			return lur->ret_code;
 		}
-		return lur->ret_code;
+	}
 	default:
 		if (len >= 0) {
 			ERR("incorrect message size: %zd\n", len);
@@ -546,10 +575,12 @@ int ustcomm_send_app_cmd(int sock,
  * expected var_len.
  */
 ssize_t ustcomm_recv_channel_from_sessiond(int sock,
-		void **_chan_data, uint64_t var_len)
+		void **_chan_data, uint64_t var_len,
+		int *_wakeup_fd)
 {
 	void *chan_data;
-	ssize_t len;
+	ssize_t len, nr_fd;
+	int wakeup_fd;
 
 	if (var_len > LTTNG_UST_CHANNEL_DATA_MAX_LEN) {
 		len = -EINVAL;
@@ -565,6 +596,18 @@ ssize_t ustcomm_recv_channel_from_sessiond(int sock,
 	if (len != var_len) {
 		goto error_recv;
 	}
+	/* recv wakeup fd */
+	nr_fd = ustcomm_recv_fds_unix_sock(sock, &wakeup_fd, 1);
+	if (nr_fd <= 0) {
+		if (nr_fd < 0) {
+			len = nr_fd;
+			goto error_recv;
+		} else {
+			len = -EIO;
+			goto error_recv;
+		}
+	}
+	*_wakeup_fd = wakeup_fd;
 	*_chan_data = chan_data;
 	return len;
 
@@ -642,6 +685,26 @@ int ustcomm_send_reg_msg(int sock,
 	return 0;
 }
 
+static
+int serialize_string_encoding(enum ustctl_string_encodings *ue,
+		enum lttng_string_encodings le)
+{
+	switch (le) {
+	case lttng_encode_none:
+		*ue = ustctl_encode_none;
+		break;
+	case lttng_encode_UTF8:
+		*ue = ustctl_encode_UTF8;
+		break;
+	case lttng_encode_ASCII:
+		*ue = ustctl_encode_ASCII;
+		break;
+	default:
+		return -EINVAL;
+	}
+	return 0;
+}
+
 static
 int serialize_basic_type(enum ustctl_abstract_types *uatype,
 		enum lttng_abstract_types atype,
@@ -660,14 +723,17 @@ int serialize_basic_type(enum ustctl_abstract_types *uatype,
 		uit->signedness = lit->signedness;
 		uit->reverse_byte_order = lit->reverse_byte_order;
 		uit->base = lit->base;
-		uit->encoding = lit->encoding;
+		if (serialize_string_encoding(&uit->encoding, lit->encoding))
+			return -EINVAL;
 		uit->alignment = lit->alignment;
 		*uatype = ustctl_atype_integer;
 		break;
 	}
 	case atype_string:
 	{
-		ubt->string.encoding = lbt->string.encoding;
+		if (serialize_string_encoding(&ubt->string.encoding,
+				lbt->string.encoding))
+			return -EINVAL;
 		*uatype = ustctl_atype_string;
 		break;
 	}
@@ -793,6 +859,47 @@ error_type:
 	return ret;
 }
 
+static
+int serialize_ctx_fields(size_t *_nr_write_fields,
+		struct ustctl_field **ustctl_fields,
+		size_t nr_fields,
+		const struct lttng_ctx_field *lttng_fields)
+{
+	struct ustctl_field *fields;
+	int i, ret;
+	size_t nr_write_fields = 0;
+
+	fields = zmalloc(nr_fields * sizeof(*fields));
+	if (!fields)
+		return -ENOMEM;
+
+	for (i = 0; i < nr_fields; i++) {
+		struct ustctl_field *f;
+		const struct lttng_event_field *lf;
+
+		f = &fields[nr_write_fields];
+		lf = &lttng_fields[i].event_field;
+
+		/* skip 'nowrite' fields */
+		if (lf->nowrite)
+			continue;
+		strncpy(f->name, lf->name, LTTNG_UST_SYM_NAME_LEN);
+		f->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
+		ret = serialize_one_type(&f->type, &lf->type);
+		if (ret)
+			goto error_type;
+		nr_write_fields++;
+	}
+
+	*_nr_write_fields = nr_write_fields;
+	*ustctl_fields = fields;
+	return 0;
+
+error_type:
+	free(fields);
+	return ret;
+}
+
 /*
  * Returns 0 on success, negative error value on error.
  */
@@ -817,7 +924,7 @@ int ustcomm_register_event(int sock,
 		struct ustcomm_notify_event_reply r;
 	} reply;
 	size_t signature_len, fields_len, model_emf_uri_len;
-	struct ustctl_field *fields;
+	struct ustctl_field *fields = NULL;
 	size_t nr_write_fields = 0;
 	int ret;
 
@@ -849,45 +956,49 @@ int ustcomm_register_event(int sock,
 	msg.m.model_emf_uri_len = model_emf_uri_len;
 	len = ustcomm_send_unix_sock(sock, &msg, sizeof(msg));
 	if (len > 0 && len != sizeof(msg)) {
-		free(fields);
-		return -EIO;
+		ret = -EIO;
+		goto error_fields;
 	}
 	if (len < 0) {
-		free(fields);
-		return len;
+		ret = len;
+		goto error_fields;
 	}
 
 	/* send signature */
 	len = ustcomm_send_unix_sock(sock, signature, signature_len);
 	if (len > 0 && len != signature_len) {
-		free(fields);
-		return -EIO;
+		ret = -EIO;
+		goto error_fields;
 	}
 	if (len < 0) {
-		free(fields);
-		return len;
+		ret = len;
+		goto error_fields;
 	}
 
 	/* send fields */
 	if (fields_len > 0) {
 		len = ustcomm_send_unix_sock(sock, fields, fields_len);
-		free(fields);
 		if (len > 0 && len != fields_len) {
-			return -EIO;
+			ret = -EIO;
+			goto error_fields;
 		}
 		if (len < 0) {
-			return len;
+			ret = len;
+			goto error_fields;
 		}
 	}
+	free(fields);
 
 	if (model_emf_uri_len) {
 		/* send model_emf_uri */
 		len = ustcomm_send_unix_sock(sock, model_emf_uri,
 				model_emf_uri_len);
-		if (len > 0 && len != model_emf_uri_len)
+		if (len > 0 && len != model_emf_uri_len) {
 			return -EIO;
-		if (len < 0)
+		}
+		if (len < 0) {
 			return len;
+		}
 	}
 
 	/* receive reply */
@@ -921,6 +1032,12 @@ int ustcomm_register_event(int sock,
 			return len;
 		}
 	}
+	/* Unreached. */
+
+	/* Error path only. */
+error_fields:
+	free(fields);
+	return ret;
 }
 
 /*
@@ -931,7 +1048,7 @@ int ustcomm_register_channel(int sock,
 	int session_objd,		/* session descriptor */
 	int channel_objd,		/* channel descriptor */
 	size_t nr_ctx_fields,
-	const struct lttng_event_field *ctx_fields,
+	const struct lttng_ctx_field *ctx_fields,
 	uint32_t *chan_id,		/* channel id (output) */
 	int *header_type) 		/* header type (output) */
 {
@@ -945,7 +1062,7 @@ int ustcomm_register_channel(int sock,
 		struct ustcomm_notify_channel_reply r;
 	} reply;
 	size_t fields_len;
-	struct ustctl_field *fields;
+	struct ustctl_field *fields = NULL;
 	int ret;
 	size_t nr_write_fields = 0;
 
@@ -956,7 +1073,7 @@ int ustcomm_register_channel(int sock,
 
 	/* Calculate fields len, serialize fields. */
 	if (nr_ctx_fields > 0) {
-		ret = serialize_fields(&nr_write_fields, &fields,
+		ret = serialize_ctx_fields(&nr_write_fields, &fields,
 				nr_ctx_fields, ctx_fields);
 		if (ret)
 			return ret;
@@ -984,6 +1101,8 @@ int ustcomm_register_channel(int sock,
 		if (len < 0) {
 			return len;
 		}
+	} else {
+		free(fields);
 	}
 
 	len = ustcomm_recv_unix_sock(sock, &reply, sizeof(reply));