X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust-comm%2Flttng-ust-comm.c;h=6edb395f18ca32498a6d5c9c96dc6b2a23cb2737;hb=549df04044855ca170838fe2f7d92b523445be65;hp=087424fe66626a6dd393315ccb3fa896c54322ff;hpb=bdd8ca83b1aee3f535c096ae01f2afc2073c1376;p=lttng-ust.git

diff --git a/liblttng-ust-comm/lttng-ust-comm.c b/liblttng-ust-comm/lttng-ust-comm.c
index 087424fe..6edb395f 100644
--- a/liblttng-ust-comm/lttng-ust-comm.c
+++ b/liblttng-ust-comm/lttng-ust-comm.c
@@ -265,7 +265,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 +276,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 +297,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;
 }
@@ -380,7 +390,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) {
 		/*
@@ -830,6 +840,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.
  */
@@ -915,6 +966,8 @@ int ustcomm_register_event(int sock,
 		if (len < 0) {
 			return len;
 		}
+	} else {
+		free(fields);
 	}
 
 	if (model_emf_uri_len) {
@@ -968,7 +1021,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) */
 {
@@ -982,7 +1035,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;
 
@@ -993,7 +1046,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;
@@ -1021,6 +1074,8 @@ int ustcomm_register_channel(int sock,
 		if (len < 0) {
 			return len;
 		}
+	} else {
+		free(fields);
 	}
 
 	len = ustcomm_recv_unix_sock(sock, &reply, sizeof(reply));