X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-comm%2Flttng-ust-comm.c;h=d2057daf95d9320b095e6a67c2d3b644c7b16f32;hb=a834901f2890deadb815d7f9e3ab79c3ba673994;hp=d7991f19b6098b97f1333f013e332df426c3bf0d;hpb=218deb69baab57ee2f6728eef18e84697f21197b;p=lttng-ust.git

diff --git a/liblttng-ust-comm/lttng-ust-comm.c b/liblttng-ust-comm/lttng-ust-comm.c
index d7991f19..d2057daf 100644
--- a/liblttng-ust-comm/lttng-ust-comm.c
+++ b/liblttng-ust-comm/lttng-ust-comm.c
@@ -17,7 +17,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #include <limits.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -77,6 +76,8 @@ static const char *ustcomm_readable_code[] = {
 	[ USTCOMM_CODE_OFFSET(LTTNG_UST_ERR_INVAL_MAGIC) ] = "Invalid magic number",
 	[ USTCOMM_CODE_OFFSET(LTTNG_UST_ERR_INVAL_SOCKET_TYPE) ] = "Invalid socket type",
 	[ USTCOMM_CODE_OFFSET(LTTNG_UST_ERR_UNSUP_MAJOR) ] = "Unsupported major version",
+	[ USTCOMM_CODE_OFFSET(LTTNG_UST_ERR_PEERCRED) ] = "Cannot get unix socket peer credentials",
+	[ USTCOMM_CODE_OFFSET(LTTNG_UST_ERR_PEERCRED_PID) ] = "Peer credentials PID is invalid. Socket appears to belong to a distinct, non-nested pid namespace.",
 };
 
 /*
@@ -669,6 +670,46 @@ error_check:
 	return len;
 }
 
+ssize_t ustcomm_recv_event_notifier_notif_fd_from_sessiond(int sock,
+		int *_event_notifier_notif_fd)
+{
+	ssize_t nr_fd;
+	int event_notifier_notif_fd, ret;
+
+	/* Receive event_notifier notification fd */
+	lttng_ust_lock_fd_tracker();
+	nr_fd = ustcomm_recv_fds_unix_sock(sock, &event_notifier_notif_fd, 1);
+	if (nr_fd <= 0) {
+		lttng_ust_unlock_fd_tracker();
+		if (nr_fd < 0) {
+			ret = nr_fd;
+			goto error;
+		} else {
+			ret = -EIO;
+			goto error;
+		}
+	}
+
+	ret = lttng_ust_add_fd_to_tracker(event_notifier_notif_fd);
+	if (ret < 0) {
+		ret = close(event_notifier_notif_fd);
+		if (ret) {
+			PERROR("close on event_notifier notif fd");
+		}
+		ret = -EIO;
+		lttng_ust_unlock_fd_tracker();
+		goto error;
+	}
+
+	*_event_notifier_notif_fd = ret;
+	lttng_ust_unlock_fd_tracker();
+
+	ret = nr_fd;
+
+error:
+	return ret;
+}
+
 int ustcomm_recv_stream_from_sessiond(int sock,
 		uint64_t *memory_map_size,
 		int *shm_fd, int *wakeup_fd)
@@ -726,6 +767,75 @@ error:
 	return ret;
 }
 
+ssize_t ustcomm_recv_counter_from_sessiond(int sock,
+		void **_counter_data, uint64_t var_len)
+{
+	void *counter_data;
+	ssize_t len;
+
+	if (var_len > LTTNG_UST_COUNTER_DATA_MAX_LEN) {
+		len = -EINVAL;
+		goto error_check;
+	}
+	/* Receive variable length data */
+	counter_data = zmalloc(var_len);
+	if (!counter_data) {
+		len = -ENOMEM;
+		goto error_alloc;
+	}
+	len = ustcomm_recv_unix_sock(sock, counter_data, var_len);
+	if (len != var_len) {
+		goto error_recv;
+	}
+	*_counter_data = counter_data;
+	return len;
+
+error_recv:
+	free(counter_data);
+error_alloc:
+error_check:
+	return len;
+}
+
+int ustcomm_recv_counter_shm_from_sessiond(int sock,
+		int *shm_fd)
+{
+	ssize_t len;
+	int ret;
+	int fds[1];
+
+	/* recv shm fd fd */
+	lttng_ust_lock_fd_tracker();
+	len = ustcomm_recv_fds_unix_sock(sock, fds, 1);
+	if (len <= 0) {
+		lttng_ust_unlock_fd_tracker();
+		if (len < 0) {
+			ret = len;
+			goto error;
+		} else {
+			ret = -EIO;
+			goto error;
+		}
+	}
+
+	ret = lttng_ust_add_fd_to_tracker(fds[0]);
+	if (ret < 0) {
+		ret = close(fds[0]);
+		if (ret) {
+			PERROR("close on received shm_fd");
+		}
+		ret = -EIO;
+		lttng_ust_unlock_fd_tracker();
+		goto error;
+	}
+	*shm_fd = ret;
+	lttng_ust_unlock_fd_tracker();
+	return 0;
+
+error:
+	return ret;
+}
+
 /*
  * Returns 0 on success, negative error value on error.
  */
@@ -755,7 +865,7 @@ int ustcomm_send_reg_msg(int sock,
 	reg_msg.uint64_t_alignment = uint64_t_alignment;
 	reg_msg.long_alignment = long_alignment;
 	reg_msg.socket_type = type;
-	lttng_ust_getprocname(reg_msg.name);
+	lttng_pthread_getname_np(reg_msg.name, LTTNG_UST_ABI_PROCNAME_LEN);
 	memset(reg_msg.padding, 0, sizeof(reg_msg.padding));
 
 	len = ustcomm_send_unix_sock(sock, &reg_msg, sizeof(reg_msg));
@@ -779,7 +889,7 @@ ssize_t count_one_type(const struct lttng_type *lt)
 		return 1;
 	case atype_struct:
 		return count_fields_recursive(lt->u.legacy._struct.nr_fields,
-				lt->u.legacy._struct.fields);
+				lt->u.legacy._struct.fields) + 1;
 	case atype_enum_nestable:
 		return count_one_type(lt->u.enum_nestable.container_type) + 1;
 	case atype_array_nestable:
@@ -788,7 +898,7 @@ ssize_t count_one_type(const struct lttng_type *lt)
 		return count_one_type(lt->u.sequence_nestable.elem_type) + 1;
 	case atype_struct_nestable:
 		return count_fields_recursive(lt->u.struct_nestable.nr_fields,
-				lt->u.struct_nestable.fields);
+				lt->u.struct_nestable.fields) + 1;
 
 	case atype_dynamic:
 	{
@@ -801,10 +911,10 @@ ssize_t count_one_type(const struct lttng_type *lt)
 		if (ret)
 			return ret;
 		/*
-		 * One field for enum, one field for variant, and
+		 * Two fields for enum, one field for variant, and
 		 * one field per choice.
 		 */
-		return count_fields_recursive(nr_choices, choices) + 2;
+		return count_fields_recursive(nr_choices, choices) + 3;
 	}
 
 	default: