X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2Flttng-ust-comm.c;h=1246c654c34f5d83f65dc2425a9f0a4728179292;hb=4318ae1be57eb7983ab4857a7a8eeb4a030a8216;hp=c5a3064ae216f222771e7acd99199ea12a520085;hpb=56cd7e2fe3fd32cb212d0e7976a6bae09ff4948c;p=lttng-ust.git

diff --git a/libust/lttng-ust-comm.c b/libust/lttng-ust-comm.c
index c5a3064a..1246c654 100644
--- a/libust/lttng-ust-comm.c
+++ b/libust/lttng-ust-comm.c
@@ -38,12 +38,13 @@
 #include <urcu/uatomic.h>
 #include <urcu/futex.h>
 
-#include <lttng-ust-comm.h>
-#include <ust/usterr-signal-safe.h>
-#include <ust/lttng-ust-abi.h>
-#include <ust/tracepoint.h>
-#include <ust/tracepoint-internal.h>
-#include <ust/ust.h>
+#include <lttng/ust-comm.h>
+#include <lttng/ust-events.h>
+#include <lttng/usterr-signal-safe.h>
+#include <lttng/ust-abi.h>
+#include <lttng/tracepoint.h>
+#include <lttng/tracepoint-internal.h>
+#include <lttng/ust.h>
 #include "ltt-tracer-core.h"
 
 /*
@@ -181,18 +182,18 @@ int register_app_to_sessiond(int socket)
 		return -errno;
 	}
 
-	ret = lttcomm_send_unix_sock(socket, &reg_msg, sizeof(reg_msg));
+	ret = ustcomm_send_unix_sock(socket, &reg_msg, sizeof(reg_msg));
 	if (ret >= 0 && ret != sizeof(reg_msg))
 		return -EIO;
 	return ret;
 }
 
 static
-int send_reply(int sock, struct lttcomm_ust_reply *lur)
+int send_reply(int sock, struct ustcomm_ust_reply *lur)
 {
 	ssize_t len;
 
-	len = lttcomm_send_unix_sock(sock, lur, sizeof(*lur));
+	len = ustcomm_send_unix_sock(sock, lur, sizeof(*lur));
 	switch (len) {
 	case sizeof(*lur):
 		DBG("message successfully sent");
@@ -230,11 +231,12 @@ int handle_register_done(struct sock_info *sock_info)
 
 static
 int handle_message(struct sock_info *sock_info,
-		int sock, struct lttcomm_ust_msg *lum)
+		int sock, struct ustcomm_ust_msg *lum)
 {
 	int ret = 0;
-	const struct objd_ops *ops;
-	struct lttcomm_ust_reply lur;
+	const struct lttng_ust_objd_ops *ops;
+	struct ustcomm_ust_reply lur;
+	int shm_fd, wait_fd;
 
 	ust_lock();
 
@@ -262,7 +264,7 @@ int handle_message(struct sock_info *sock_info,
 		if (lum->handle == LTTNG_UST_ROOT_HANDLE)
 			ret = -EPERM;
 		else
-			ret = objd_unref(lum->handle);
+			ret = lttng_ust_objd_unref(lum->handle);
 		break;
 	default:
 		if (ops->cmd)
@@ -278,12 +280,58 @@ end:
 	lur.cmd = lum->cmd;
 	lur.ret_val = ret;
 	if (ret >= 0) {
-		lur.ret_code = LTTCOMM_OK;
+		lur.ret_code = USTCOMM_OK;
 	} else {
-		lur.ret_code = LTTCOMM_SESSION_FAIL;
+		//lur.ret_code = USTCOMM_SESSION_FAIL;
+		lur.ret_code = ret;
+	}
+	switch (lum->cmd) {
+	case LTTNG_UST_STREAM:
+		/*
+		 * Special-case reply to send stream info.
+		 * Use lum.u output.
+		 */
+		lur.u.stream.memory_map_size = lum->u.stream.memory_map_size;
+		shm_fd = lum->u.stream.shm_fd;
+		wait_fd = lum->u.stream.wait_fd;
+		break;
+	case LTTNG_UST_METADATA:
+	case LTTNG_UST_CHANNEL:
+		lur.u.channel.memory_map_size = lum->u.channel.memory_map_size;
+		shm_fd = lum->u.channel.shm_fd;
+		wait_fd = lum->u.channel.wait_fd;
+		break;
+	case LTTNG_UST_VERSION:
+		lur.u.version = lum->u.version;
+		break;
 	}
 	ret = send_reply(sock, &lur);
+	if (ret < 0) {
+		perror("error sending reply");
+		goto error;
+	}
 
+	if ((lum->cmd == LTTNG_UST_STREAM
+	     || lum->cmd == LTTNG_UST_CHANNEL
+	     || lum->cmd == LTTNG_UST_METADATA)
+			&& lur.ret_code == USTCOMM_OK) {
+		/* we also need to send the file descriptors. */
+		ret = ustcomm_send_fds_unix_sock(sock,
+			&shm_fd, &shm_fd,
+			1, sizeof(int));
+		if (ret < 0) {
+			perror("send shm_fd");
+			goto error;
+		}
+		ret = ustcomm_send_fds_unix_sock(sock,
+			&wait_fd, &wait_fd,
+			1, sizeof(int));
+		if (ret < 0) {
+			perror("send wait_fd");
+			goto error;
+		}
+	}
+error:
 	ust_unlock();
 	return ret;
 }
@@ -301,7 +349,7 @@ void cleanup_sock_info(struct sock_info *sock_info)
 		sock_info->socket = -1;
 	}
 	if (sock_info->root_handle != -1) {
-		ret = objd_unref(sock_info->root_handle);
+		ret = lttng_ust_objd_unref(sock_info->root_handle);
 		if (ret) {
 			ERR("Error unref root handle");
 		}
@@ -508,7 +556,7 @@ void wait_for_sessiond(struct sock_info *sock_info)
 		if (ret < 0) {
 			if (errno == EFAULT) {
 				wait_poll_fallback = 1;
-				ERR(
+				WARN(
 "Linux kernels 2.6.33 to 3.0 (with the exception of stable versions) "
 "do not support FUTEX_WAKE on read-only memory mappings correctly. "
 "Please upgrade your kernel "
@@ -575,7 +623,7 @@ restart:
 	}
 
 	/* Register */
-	ret = lttcomm_connect_unix_sock(sock_info->sock_path);
+	ret = ustcomm_connect_unix_sock(sock_info->sock_path);
 	if (ret < 0) {
 		ERR("Error connecting to %s apps socket", sock_info->name);
 		prev_connect_failed = 1;
@@ -597,7 +645,7 @@ restart:
 	 */
 	if (sock_info->root_handle == -1) {
 		ret = lttng_abi_create_root_handle();
-		if (ret) {
+		if (ret < 0) {
 			ERR("Error creating root handle");
 			ust_unlock();
 			goto quit;
@@ -622,9 +670,9 @@ restart:
 
 	for (;;) {
 		ssize_t len;
-		struct lttcomm_ust_msg lum;
+		struct ustcomm_ust_msg lum;
 
-		len = lttcomm_recv_unix_sock(sock, &lum, sizeof(lum));
+		len = ustcomm_recv_unix_sock(sock, &lum, sizeof(lum));
 		switch (len) {
 		case 0:	/* orderly shutdown */
 			DBG("%s ltt-sessiond has performed an orderly shutdown\n", sock_info->name);
@@ -771,7 +819,7 @@ void lttng_ust_cleanup(int exiting)
 		cleanup_sock_info(&local_apps);
 	}
 	lttng_ust_abi_exit();
-	ltt_events_exit();
+	lttng_ust_events_exit();
 	ltt_ring_buffer_client_discard_exit();
 	ltt_ring_buffer_client_overwrite_exit();
 	ltt_ring_buffer_metadata_client_exit();
@@ -880,6 +928,7 @@ void ust_after_fork_child(ust_fork_info_t *fork_info)
 	/* Release urcu mutexes */
 	rcu_bp_after_fork_child();
 	lttng_ust_cleanup(0);
+	lttng_context_vtid_reset();
 	/* Release mutexes and reenable signals */
 	ust_after_fork_common(fork_info);
 	lttng_ust_init();