X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=958aa0d04f0830385b9ad215fb38219489ce0847;hp=6d3ae1b5806fdb2c818cec136b826abdb7c24000;hb=dcabc1905756b2999886313ec33705f7571a3fb9;hpb=dbc478f3152cf3b4c695eb5c5c28930d03d78f69

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 6d3ae1b58..958aa0d04 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -49,6 +49,8 @@
 #include <common/utils.h>
 #include <common/daemonize.h>
 #include <common/config/session-config.h>
+#include <common/dynamic-buffer.h>
+#include <lttng/userspace-probe-internal.h>
 
 #include "lttng-sessiond.h"
 #include "buffer-registry.h"
@@ -2930,6 +2932,112 @@ static unsigned int lttng_sessions_count(uid_t uid, gid_t gid)
 	return i;
 }
 
+static int receive_userspace_probe(struct command_ctx *cmd_ctx, int sock,
+		int *sock_error, struct lttng_event *event)
+{
+	int fd, ret;
+	struct lttng_userspace_probe_location *probe_location;
+	struct lttng_userspace_probe_location_lookup_method *lookup = NULL;
+	struct lttng_dynamic_buffer probe_location_buffer;
+	struct lttng_buffer_view buffer_view;
+
+	/*
+	 * Create a buffer to store the serialized version of the probe
+	 * location.
+	 */
+	lttng_dynamic_buffer_init(&probe_location_buffer);
+	ret = lttng_dynamic_buffer_set_size(&probe_location_buffer,
+			cmd_ctx->lsm->u.enable.userspace_probe_location_len);
+	if (ret) {
+		ret = LTTNG_ERR_NOMEM;
+		goto error;
+	}
+
+	/*
+	 * Receive the probe location.
+	 */
+	ret = lttcomm_recv_unix_sock(sock, probe_location_buffer.data,
+			probe_location_buffer.size);
+	if (ret <= 0) {
+		DBG("Nothing recv() from client var len data... continuing");
+		*sock_error = 1;
+		lttng_dynamic_buffer_reset(&probe_location_buffer);
+		ret = LTTNG_ERR_PROBE_LOCATION_INVAL;
+		goto error;
+	}
+
+	buffer_view = lttng_buffer_view_from_dynamic_buffer(
+			&probe_location_buffer, 0, probe_location_buffer.size);
+
+	/*
+	 * Extract the probe location from the serialized version.
+	 */
+	ret = lttng_userspace_probe_location_create_from_buffer(
+				&buffer_view, &probe_location);
+	if (ret < 0) {
+		WARN("Failed to create a userspace probe location from the received buffer");
+		lttng_dynamic_buffer_reset( &probe_location_buffer);
+		ret = LTTNG_ERR_PROBE_LOCATION_INVAL;
+		goto error;
+	}
+
+	/*
+	 * Receive the file descriptor to the target binary from the client.
+	 */
+	DBG("Receiving userspace probe target FD from client ...");
+	ret = lttcomm_recv_fds_unix_sock(sock, &fd, 1);
+	if (ret <= 0) {
+		DBG("Nothing recv() from client userspace probe fd... continuing");
+		*sock_error = 1;
+		ret = LTTNG_ERR_PROBE_LOCATION_INVAL;
+		goto error;
+	}
+
+	/*
+	 * Set the file descriptor received from the client through the unix
+	 * socket in the probe location.
+	 */
+	lookup = lttng_userspace_probe_location_get_lookup_method(probe_location);
+	if (!lookup) {
+		ret = LTTNG_ERR_PROBE_LOCATION_INVAL;
+		goto error;
+	}
+
+	/*
+	 * From the kernel tracer's perspective, all userspace probe event types
+	 * are all the same: a file and an offset.
+	 */
+	switch (lttng_userspace_probe_location_lookup_method_get_type(lookup)) {
+	case LTTNG_USERSPACE_PROBE_LOCATION_LOOKUP_METHOD_TYPE_FUNCTION_ELF:
+		ret = lttng_userspace_probe_location_function_set_binary_fd(
+				probe_location, fd);
+		break;
+	case LTTNG_USERSPACE_PROBE_LOCATION_LOOKUP_METHOD_TYPE_TRACEPOINT_SDT:
+		ret = lttng_userspace_probe_location_tracepoint_set_binary_fd(
+				probe_location, fd);
+		break;
+	default:
+		ret = LTTNG_ERR_PROBE_LOCATION_INVAL;
+		goto error;
+	}
+
+	if (ret) {
+		ret = LTTNG_ERR_PROBE_LOCATION_INVAL;
+		goto error;
+	}
+
+	/* Attach the probe location to the event. */
+	ret = lttng_event_set_userspace_probe_location(event, probe_location);
+	if (ret) {
+		ret = LTTNG_ERR_PROBE_LOCATION_INVAL;
+		goto error;
+	}
+
+	lttng_dynamic_buffer_reset(&probe_location_buffer);
+error:
+	return ret;
+}
+
 /*
  * Check if the current kernel tracer supports the session rotation feature.
  * Return 1 if it does, 0 otherwise.
@@ -3468,6 +3576,7 @@ error_add_context:
 	}
 	case LTTNG_ENABLE_EVENT:
 	{
+		struct lttng_event *ev = NULL;
 		struct lttng_event_exclusion *exclusion = NULL;
 		struct lttng_filter_bytecode *bytecode = NULL;
 		char *filter_expression = NULL;
@@ -3519,7 +3628,7 @@ error_add_context:
 			ret = lttcomm_recv_unix_sock(sock, filter_expression,
 				expression_len);
 			if (ret <= 0) {
-				DBG("Nothing recv() from client car len data... continuing");
+				DBG("Nothing recv() from client var len data... continuing");
 				*sock_error = 1;
 				free(filter_expression);
 				free(exclusion);
@@ -3551,7 +3660,7 @@ error_add_context:
 			DBG("Receiving var len filter's bytecode from client ...");
 			ret = lttcomm_recv_unix_sock(sock, bytecode, bytecode_len);
 			if (ret <= 0) {
-				DBG("Nothing recv() from client car len data... continuing");
+				DBG("Nothing recv() from client var len data... continuing");
 				*sock_error = 1;
 				free(filter_expression);
 				free(bytecode);
@@ -3569,11 +3678,30 @@ error_add_context:
 			}
 		}
 
+		ev = lttng_event_copy(&cmd_ctx->lsm->u.enable.event);
+		if (!ev) {
+			DBG("Failed to copy event: %s",
+					cmd_ctx->lsm->u.enable.event.name);
+			ret = LTTNG_ERR_NOMEM;
+			goto error;
+		}
+
+
+		if (cmd_ctx->lsm->u.enable.userspace_probe_location_len > 0) {
+			/* Expect a userspace probe description. */
+			ret = receive_userspace_probe(cmd_ctx, sock, sock_error, ev);
+			if (ret) {
+				lttng_event_destroy(ev);
+				goto error;
+			}
+		}
+
 		ret = cmd_enable_event(cmd_ctx->session, &cmd_ctx->lsm->domain,
 				cmd_ctx->lsm->u.enable.channel_name,
-				&cmd_ctx->lsm->u.enable.event,
+				ev,
 				filter_expression, bytecode, exclusion,
 				kernel_poll_pipe[1]);
+		lttng_event_destroy(ev);
 		break;
 	}
 	case LTTNG_LIST_TRACEPOINTS: