X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=1cd77a4aed540f1b035c5292afd93b996acd901e;hb=943ab151e14506d4773796edb2a1c2401bc61974;hp=125a18769107269322813923d438e51f062694ae;hpb=70a71a41549999e60f879cc030726a154925fd16;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 125a18769..1cd77a4ae 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -49,6 +49,7 @@
 #include <common/utils.h>
 #include <common/daemonize.h>
 #include <common/config/session-config.h>
+#include <common/dynamic-buffer.h>
 
 #include "lttng-sessiond.h"
 #include "buffer-registry.h"
@@ -90,6 +91,7 @@ static pid_t ppid;          /* Parent PID for --sig-parent option */
 static pid_t child_ppid;    /* Internal parent PID use with daemonize. */
 static char *rundir;
 static int lockfile_fd = -1;
+static int opt_print_version;
 
 /* Set to 1 when a SIGUSR1 signal is received. */
 static int recv_child_signal;
@@ -3080,7 +3082,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
 	case LTTNG_LIST_CHANNELS:
 	case LTTNG_LIST_EVENTS:
 	case LTTNG_LIST_SYSCALLS:
-	case LTTNG_LIST_TRACKER_PIDS:
+	case LTTNG_LIST_TRACKER_IDS:
 	case LTTNG_DATA_PENDING:
 		break;
 	default:
@@ -3489,18 +3491,102 @@ error_add_context:
 				&cmd_ctx->lsm->u.channel.chan, kernel_poll_pipe[1]);
 		break;
 	}
-	case LTTNG_TRACK_PID:
+	case LTTNG_TRACK_ID:
 	{
-		ret = cmd_track_pid(cmd_ctx->session,
+		struct lttng_tracker_id id;
+
+		memset(&id, 0, sizeof(id));
+		id.type = cmd_ctx->lsm->u.id_tracker.id_type;
+		switch (id.type) {
+		case LTTNG_ID_ALL:
+			break;
+		case LTTNG_ID_VALUE:
+			id.value = cmd_ctx->lsm->u.id_tracker.u.value;
+			break;
+		case LTTNG_ID_STRING:
+		{
+			size_t var_len = cmd_ctx->lsm->u.id_tracker.u.var_len;
+
+			id.string = zmalloc(var_len);
+			if (!id.string) {
+				ret = LTTNG_ERR_NOMEM;
+				goto error;
+			}
+			DBG("Receiving var len tracker id string from client.");
+			ret = lttcomm_recv_unix_sock(sock, id.string, var_len);
+			if (ret <= 0) {
+				DBG("Nothing received.");
+				*sock_error = 1;
+				free(id.string);
+				ret = LTTNG_ERR_INVALID;
+				goto error;
+			}
+			if (strnlen(id.string, var_len) != var_len - 1) {
+				DBG("Corrupted string.");
+				free(id.string);
+				ret = LTTNG_ERR_INVALID;
+				goto error;
+			}
+			break;
+		}
+		default:
+			ret = LTTNG_ERR_INVALID;
+			goto error;
+		}
+		ret = cmd_track_id(cmd_ctx->session,
+				cmd_ctx->lsm->u.id_tracker.tracker_type,
 				cmd_ctx->lsm->domain.type,
-				cmd_ctx->lsm->u.pid_tracker.pid);
+				&id);
+		free(id.string);
 		break;
 	}
-	case LTTNG_UNTRACK_PID:
+	case LTTNG_UNTRACK_ID:
 	{
-		ret = cmd_untrack_pid(cmd_ctx->session,
+		struct lttng_tracker_id id;
+
+		memset(&id, 0, sizeof(id));
+		id.type = cmd_ctx->lsm->u.id_tracker.id_type;
+		switch (id.type) {
+		case LTTNG_ID_ALL:
+			break;
+		case LTTNG_ID_VALUE:
+			id.value = cmd_ctx->lsm->u.id_tracker.u.value;
+			break;
+		case LTTNG_ID_STRING:
+		{
+			size_t var_len = cmd_ctx->lsm->u.id_tracker.u.var_len;
+
+			id.string = zmalloc(var_len);
+			if (!id.string) {
+				ret = LTTNG_ERR_NOMEM;
+				goto error;
+			}
+			DBG("Receiving var len tracker id string from client.");
+			ret = lttcomm_recv_unix_sock(sock, id.string, var_len);
+			if (ret <= 0) {
+				DBG("Nothing received.");
+				*sock_error = 1;
+				free(id.string);
+				ret = LTTNG_ERR_INVALID;
+				goto error;
+			}
+			if (strnlen(id.string, var_len) != var_len - 1) {
+				DBG("Corrupted string.");
+				free(id.string);
+				ret = LTTNG_ERR_INVALID;
+				goto error;
+			}
+			break;
+		}
+		default:
+			ret = LTTNG_ERR_INVALID;
+			goto error;
+		}
+		ret = cmd_untrack_id(cmd_ctx->session,
+				cmd_ctx->lsm->u.id_tracker.tracker_type,
 				cmd_ctx->lsm->domain.type,
-				cmd_ctx->lsm->u.pid_tracker.pid);
+				&id);
+		free(id.string);
 		break;
 	}
 	case LTTNG_ENABLE_EVENT:
@@ -3699,27 +3785,61 @@ error_add_context:
 		ret = LTTNG_OK;
 		break;
 	}
-	case LTTNG_LIST_TRACKER_PIDS:
+	case LTTNG_LIST_TRACKER_IDS:
 	{
-		int32_t *pids = NULL;
-		ssize_t nr_pids;
-
-		nr_pids = cmd_list_tracker_pids(cmd_ctx->session,
-				cmd_ctx->lsm->domain.type, &pids);
-		if (nr_pids < 0) {
+		struct lttcomm_tracker_command_header cmd_header;
+		struct lttng_tracker_id *ids = NULL;
+		ssize_t nr_ids, i;
+		struct lttng_dynamic_buffer buf;
+
+		nr_ids = cmd_list_tracker_ids(cmd_ctx->lsm->u.id_tracker.tracker_type,
+				cmd_ctx->session,
+				cmd_ctx->lsm->domain.type, &ids);
+		if (nr_ids < 0) {
 			/* Return value is a negative lttng_error_code. */
-			ret = -nr_pids;
+			ret = -nr_ids;
 			goto error;
 		}
 
-		/*
-		 * Setup lttng message with payload size set to the event list size in
-		 * bytes and then copy list into the llm payload.
-		 */
-		ret = setup_lttng_msg_no_cmd_header(cmd_ctx, pids,
-			sizeof(int32_t) * nr_pids);
-		free(pids);
+		lttng_dynamic_buffer_init(&buf);
+		for (i = 0; i < nr_ids; i++) {
+			struct lttng_tracker_id *id = &ids[i];
+			struct lttcomm_tracker_id_header id_hdr;
+			size_t var_data_len = 0;
+
+			memset(&id_hdr, 0, sizeof(id_hdr));
+			id_hdr.type = id->type;
+			switch (id->type) {
+			case LTTNG_ID_ALL:
+				break;
+			case LTTNG_ID_VALUE:
+				id_hdr.u.value = id->value;
+				break;
+			case LTTNG_ID_STRING:
+				id_hdr.u.var_data_len = var_data_len = strlen(id->string) + 1;
+				break;
+			default:
+				ret = LTTNG_ERR_INVALID;
+				goto error;
+			}
+			ret = lttng_dynamic_buffer_append(&buf, &id_hdr, sizeof(id_hdr));
+			if (ret) {
+				ret = LTTNG_ERR_NOMEM;
+				goto error;
+			}
+			ret = lttng_dynamic_buffer_append(&buf, id->string, var_data_len);
+			if (ret) {
+				ret = LTTNG_ERR_NOMEM;
+				goto error;
+			}
+			free(id->string);
+		}
 
+		cmd_header.nb_tracker_id = nr_ids;
+		ret = setup_lttng_msg(cmd_ctx, buf.data, buf.size, &cmd_header,
+				sizeof(cmd_header));
+		free(ids);
+		lttng_dynamic_buffer_reset(&buf);
 		if (ret < 0) {
 			goto setup_error;
 		}
@@ -4760,8 +4880,7 @@ static int set_option(int opt, const char *arg, const char *optname)
 		}
 		exit(ret ? EXIT_FAILURE : EXIT_SUCCESS);
 	} else if (string_match(optname, "version") || opt == 'V') {
-		fprintf(stdout, "%s\n", VERSION);
-		exit(EXIT_SUCCESS);
+		opt_print_version = 1;
 	} else if (string_match(optname, "sig-parent") || opt == 'S') {
 		opt_sig_parent = 1;
 	} else if (string_match(optname, "kconsumerd-err-sock")) {
@@ -5101,6 +5220,23 @@ end:
 	return ret;
 }
 
+static void sessiond_config_log(void)
+{
+	DBG("LTTng-sessiond " VERSION " - " VERSION_NAME "%s%s",
+			GIT_VERSION[0] == '\0' ? "" : " - " GIT_VERSION,
+			EXTRA_VERSION_NAME[0] == '\0' ? "" : " - " EXTRA_VERSION_NAME);
+	if (EXTRA_VERSION_DESCRIPTION[0] != '\0') {
+		DBG("LTTng-sessiond extra version description:\n\t" EXTRA_VERSION_DESCRIPTION "\n");
+	}
+	if (EXTRA_VERSION_PATCHES[0] != '\0') {
+		DBG("LTTng-sessiond extra patches:\n\t" EXTRA_VERSION_PATCHES "\n");
+	}
+}
+
+static void print_version(void) {
+	fprintf(stdout, "%s\n", VERSION);
+}
+
 /*
  * daemon configuration loading and argument parsing
  */
@@ -5675,6 +5811,14 @@ int main(int argc, char **argv)
 		goto exit_options;
 	}
 
+	sessiond_config_log();
+
+	if (opt_print_version) {
+		print_version();
+		retval = 0;
+		goto exit_options;
+	}
+
 	ret = set_clock_plugin_env();
 	if (ret) {
 		retval = -1;