X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=liblttng-ust-comm%2Flttng-ust-comm.c;h=9786abe7cb1b2767da8aa3a9535c178ac9a02774;hb=d8d2416dab454962b90222ba46c82cdce0c666a4;hp=f9398e0d9891311ef2cdb3837905a4a67944c9ca;hpb=cf22367fec17f2b2650e637de84fc2f614e4d2ac;p=deliverable%2Flttng-ust.git

diff --git a/liblttng-ust-comm/lttng-ust-comm.c b/liblttng-ust-comm/lttng-ust-comm.c
index f9398e0d..9786abe7 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>
@@ -669,6 +668,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)
@@ -755,7 +794,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));