X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng-sessiond%2Fmain.c;h=75732a334c376cb5a0b5c7fd666c10ffc3cbccde;hp=ae994d7e551956200265e5450e494627a376105c;hb=8f69e5eb13ccfc939f1a014d7244c687e1a49450;hpb=b0a40d28e4498724b405cbcd5c468bfec3295eb0

diff --git a/lttng-sessiond/main.c b/lttng-sessiond/main.c
index ae994d7e5..75732a334 100644
--- a/lttng-sessiond/main.c
+++ b/lttng-sessiond/main.c
@@ -50,13 +50,15 @@
 #include "event.h"
 #include "futex.h"
 #include "hashtable.h"
-#include "kernel-ctl.h"
+#include "kernel.h"
 #include "lttng-sessiond.h"
 #include "shm.h"
 #include "ust-app.h"
 #include "ust-ctl.h"
 #include "utils.h"
 
+#define CONSUMERD_FILE	"lttng-consumerd"
+
 struct consumer_data {
 	enum lttng_consumer_type type;
 
@@ -169,31 +171,38 @@ static struct ltt_session_list *session_list_ptr;
 int ust_consumerd64_fd = -1;
 int ust_consumerd32_fd = -1;
 
-static const char *consumerd64_prog = "lttng-consumerd";
-static const char *consumerd32_prog = "lttng-consumerd";
-
-static const char *consumerd64_bindir =
-	__stringify(CONFIG_64BIT_BINDIR);
-static const char *consumerd32_bindir =
-	__stringify(CONFIG_32BIT_BINDIR);
+static const char *consumerd32_path =
+	__stringify(CONFIG_CONSUMERD32_PATH);
+static const char *consumerd64_path =
+	__stringify(CONFIG_CONSUMERD64_PATH);
+static const char *consumerd32_libdir =
+	__stringify(CONFIG_CONSUMERD32_LIBDIR);
+static const char *consumerd64_libdir =
+	__stringify(CONFIG_CONSUMERD64_LIBDIR);
 
 static
 void setup_consumerd_path(void)
 {
-	const char *bindir;
+	const char *path, *libdir;
 
 	/*
 	 * Allow INSTALL_BIN_PATH to be used as a target path for the
-	 * native architecture size consumer if CONFIG_NBIT_BINDIR as
-	 * not been defined.
+	 * native architecture size consumer if CONFIG_CONSUMER*_PATH
+	 * has not been defined.
 	 */
-#if (CAA_BITS_PER_LONG == 64)
-	if (!consumerd64_bindir[0]) {
-		consumerd64_bindir = INSTALL_BIN_PATH;
+#if (CAA_BITS_PER_LONG == 32)
+	if (!consumerd32_path[0]) {
+		consumerd32_path = INSTALL_BIN_PATH "/" CONSUMERD_FILE;
+	}
+	if (!consumerd32_libdir[0]) {
+		consumerd32_libdir = INSTALL_LIB_PATH;
+	}
+#elif (CAA_BITS_PER_LONG == 64)
+	if (!consumerd64_path[0]) {
+		consumerd64_path = INSTALL_BIN_PATH "/" CONSUMERD_FILE;
 	}
-#elif (CAA_BITS_PER_LONG == 32)
-	if (!consumerd32_bindir[0]) {
-		consumerd32_bindir = INSTALL_BIN_PATH;
+	if (!consumerd64_libdir[0]) {
+		consumerd64_libdir = INSTALL_LIB_PATH;
 	}
 #else
 #error "Unknown bitness"
@@ -202,13 +211,21 @@ void setup_consumerd_path(void)
 	/*
 	 * runtime env. var. overrides the build default.
 	 */
-	bindir = getenv("LTTNG_TOOLS_64BIT_BINDIR");
-	if (bindir) {
-		consumerd64_bindir = bindir;
+	path = getenv("LTTNG_CONSUMERD32_PATH");
+	if (path) {
+		consumerd32_path = path;
 	}
-	bindir = getenv("LTTNG_TOOLS_32BIT_BINDIR");
-	if (bindir) {
-		consumerd32_bindir = bindir;
+	path = getenv("LTTNG_CONSUMERD64_PATH");
+	if (path) {
+		consumerd64_path = path;
+	}
+	libdir = getenv("LTTNG_TOOLS_CONSUMERD32_LIBDIR");
+	if (libdir) {
+		consumerd32_libdir = libdir;
+	}
+	libdir = getenv("LTTNG_TOOLS_CONSUMERD64_LIBDIR");
+	if (libdir) {
+		consumerd64_libdir = libdir;
 	}
 }
 
@@ -1515,26 +1532,88 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
 			break;
 		case LTTNG_CONSUMER64_UST:
 		{
-			char path[PATH_MAX];
+			char *tmpnew = NULL;
+
+			if (consumerd64_libdir[0] != '\0') {
+				char *tmp;
+				size_t tmplen;
 
-			snprintf(path, PATH_MAX, "%s/%s",
-				consumerd64_bindir, consumerd64_prog);
-			execl(path, verbosity, "-u",
+				tmp = getenv("LD_LIBRARY_PATH");
+				if (!tmp) {
+					tmp = "";
+				}
+				tmplen = strlen("LD_LIBRARY_PATH=")
+					+ strlen(consumerd64_libdir) + 1 /* : */ + strlen(tmp);
+				tmpnew = zmalloc(tmplen + 1 /* \0 */);
+				if (!tmpnew) {
+					ret = -ENOMEM;
+					goto error;
+				}
+				strcpy(tmpnew, "LD_LIBRARY_PATH=");
+				strcat(tmpnew, consumerd64_libdir);
+				if (tmp[0] != '\0') {
+					strcat(tmpnew, ":");
+					strcat(tmpnew, tmp);
+				}
+				ret = putenv(tmpnew);
+				if (ret) {
+					ret = -errno;
+					goto error;
+				}
+			}
+			ret = execl(consumerd64_path, verbosity, "-u",
 					"--consumerd-cmd-sock", consumer_data->cmd_unix_sock_path,
 					"--consumerd-err-sock", consumer_data->err_unix_sock_path,
 					NULL);
+			if (consumerd64_libdir[0] != '\0') {
+				free(tmpnew);
+			}
+			if (ret) {
+				goto error;
+			}
 			break;
 		}
 		case LTTNG_CONSUMER32_UST:
 		{
-			char path[PATH_MAX];
+			char *tmpnew = NULL;
 
-			snprintf(path, PATH_MAX, "%s/%s",
-				consumerd32_bindir, consumerd32_prog);
-			execl(path, verbosity, "-u",
+			if (consumerd32_libdir[0] != '\0') {
+				char *tmp;
+				size_t tmplen;
+
+				tmp = getenv("LD_LIBRARY_PATH");
+				if (!tmp) {
+					tmp = "";
+				}
+				tmplen = strlen("LD_LIBRARY_PATH=")
+					+ strlen(consumerd32_libdir) + 1 /* : */ + strlen(tmp);
+				tmpnew = zmalloc(tmplen + 1 /* \0 */);
+				if (!tmpnew) {
+					ret = -ENOMEM;
+					goto error;
+				}
+				strcpy(tmpnew, "LD_LIBRARY_PATH=");
+				strcat(tmpnew, consumerd32_libdir);
+				if (tmp[0] != '\0') {
+					strcat(tmpnew, ":");
+					strcat(tmpnew, tmp);
+				}
+				ret = putenv(tmpnew);
+				if (ret) {
+					ret = -errno;
+					goto error;
+				}
+			}
+			ret = execl(consumerd32_path, verbosity, "-u",
 					"--consumerd-cmd-sock", consumer_data->cmd_unix_sock_path,
 					"--consumerd-err-sock", consumer_data->err_unix_sock_path,
 					NULL);
+			if (consumerd32_libdir[0] != '\0') {
+				free(tmpnew);
+			}
+			if (ret) {
+				goto error;
+			}
 			break;
 		}
 		default:
@@ -1551,6 +1630,7 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
 		perror("start consumer fork");
 		ret = -errno;
 	}
+error:
 	return ret;
 }
 
@@ -1993,6 +2073,11 @@ static int list_lttng_ust_global_events(char *channel_name,
 		case LTTNG_UST_FUNCTION:
 			tmp[i].type = LTTNG_EVENT_FUNCTION;
 			break;
+		case LTTNG_UST_TRACEPOINT_LOGLEVEL:
+			/* TODO */
+			ret = -LTTCOMM_NOT_IMPLEMENTED;
+			goto error;
+			break;
 		}
 		i++;
 	}
@@ -2111,7 +2196,13 @@ static int cmd_disable_channel(struct ltt_session *session,
 			goto error;
 		}
 
-		ret = ust_app_disable_channel_all(usess, uchan);
+		/* Already disabled */
+		if (!uchan->enabled) {
+			DBG2("UST channel %s already disabled", channel_name);
+			break;
+		}
+
+		ret = ust_app_disable_channel_glb(usess, uchan);
 		if (ret < 0) {
 			ret = LTTCOMM_UST_DISABLE_FAIL;
 			goto error;
@@ -2219,28 +2310,32 @@ static int cmd_enable_channel(struct ltt_session *session,
 				goto error;
 			}
 
-			rcu_read_lock();
-			hashtable_add_unique(usess->domain_global.channels, &uchan->node);
-			rcu_read_unlock();
-			DBG2("UST channel %s added to global domain HT", attr->name);
-
 			/* Add channel to all registered applications */
-			ret = ust_app_create_channel_all(usess, uchan);
+			ret = ust_app_create_channel_glb(usess, uchan);
 			if (ret != 0) {
 				ret = LTTCOMM_UST_CHAN_FAIL;
 				goto error;
 			}
+
+			rcu_read_lock();
+			hashtable_add_unique(usess->domain_global.channels, &uchan->node);
+			rcu_read_unlock();
+
+			DBG2("UST channel %s added to global domain HT", attr->name);
 		} else {
 			/* If already enabled, everything is OK */
 			if (uchan->enabled) {
-				ret = LTTCOMM_OK;
-				goto error;
+				break;
 			}
 
-			ret = ust_app_enable_channel_all(usess, uchan);
+			ret = ust_app_enable_channel_glb(usess, uchan);
 			if (ret < 0) {
-				ret = LTTCOMM_UST_ENABLE_FAIL;
-				goto error;
+				if (ret != -EEXIST) {
+					ret = LTTCOMM_UST_CHAN_ENABLE_FAIL;
+					goto error;
+				} else {
+					ret = LTTCOMM_OK;
+				}
 			}
 		}
 
@@ -2298,6 +2393,7 @@ static int cmd_disable_event(struct ltt_session *session, int domain,
 	{
 		struct ltt_ust_session *usess;
 		struct ltt_ust_channel *uchan;
+		struct ltt_ust_event *uevent;
 
 		usess = session->ust_session;
 
@@ -2308,12 +2404,20 @@ static int cmd_disable_event(struct ltt_session *session, int domain,
 			goto error;
 		}
 
-		ret = ust_app_disable_event(usess, uchan, event_name);
+		uevent = trace_ust_find_event_by_name(uchan->events, event_name);
+		if (uevent == NULL) {
+			ret = LTTCOMM_UST_EVENT_NOT_FOUND;
+			goto error;
+		}
+
+		ret = ust_app_disable_event_glb(usess, uchan, uevent);
 		if (ret < 0) {
 			ret = LTTCOMM_UST_DISABLE_FAIL;
 			goto error;
 		}
 
+		uevent->enabled = 0;
+
 		DBG2("Disable UST event %s in channel %s completed", event_name,
 				channel_name);
 
@@ -2377,7 +2481,7 @@ static int cmd_disable_event_all(struct ltt_session *session, int domain,
 			goto error;
 		}
 
-		ret = ust_app_disable_event_all(usess, uchan);
+		ret = ust_app_disable_all_event_glb(usess, uchan);
 		if (ret < 0) {
 			ret = LTTCOMM_UST_DISABLE_FAIL;
 			goto error;
@@ -2420,21 +2524,18 @@ static int cmd_add_context(struct ltt_session *session, int domain,
 		break;
 	case LTTNG_DOMAIN_UST:
 	{
-		/*
-		struct ltt_ust_session *usess;
+		struct ltt_ust_session *usess = session->ust_session;
 
-		cds_list_for_each_entry(usess, &session->ust_session_list.head, list) {
-			ret = context_ust_add(usess, ctx,
-					event_name, channel_name, domain);
-			if (ret != LTTCOMM_OK) {
-				goto error;
-			}
+		ret = context_ust_add(usess, domain, ctx, event_name, channel_name);
+		if (ret != LTTCOMM_OK) {
+			goto error;
 		}
 		break;
-		*/
 	}
+	case LTTNG_DOMAIN_UST_EXEC_NAME:
+	case LTTNG_DOMAIN_UST_PID:
+	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
 	default:
-		/* TODO: UST other domains */
 		ret = LTTCOMM_NOT_IMPLEMENTED;
 		goto error;
 	}
@@ -2474,8 +2575,10 @@ static int cmd_enable_event(struct ltt_session *session, int domain,
 			ret = channel_kernel_create(session->kernel_session,
 					attr, kernel_poll_pipe[1]);
 			if (ret != LTTCOMM_OK) {
+				free(attr);
 				goto error;
 			}
+			free(attr);
 		}
 
 		/* Get the newly created kernel channel pointer */
@@ -2498,10 +2601,10 @@ static int cmd_enable_event(struct ltt_session *session, int domain,
 	}
 	case LTTNG_DOMAIN_UST:
 	{
-		struct ltt_ust_channel *uchan;
-		struct ltt_ust_event *uevent;
 		struct lttng_channel *attr;
+		struct ltt_ust_channel *uchan;
 
+		/* Get channel from global UST domain */
 		uchan = trace_ust_find_channel_by_name(usess->domain_global.channels,
 				channel_name);
 		if (uchan == NULL) {
@@ -2512,13 +2615,14 @@ static int cmd_enable_event(struct ltt_session *session, int domain,
 				goto error;
 			}
 			snprintf(attr->name, NAME_MAX, "%s", channel_name);
+			attr->name[NAME_MAX - 1] = '\0';
 
 			/* Use the internal command enable channel */
 			ret = cmd_enable_channel(session, domain, attr);
-			if (ret < 0) {
+			if (ret != LTTCOMM_OK) {
+				free(attr);
 				goto error;
 			}
-
 			free(attr);
 
 			/* Get the newly created channel reference back */
@@ -2531,31 +2635,12 @@ static int cmd_enable_event(struct ltt_session *session, int domain,
 			}
 		}
 
-		uevent = trace_ust_find_event_by_name(uchan->events, event->name);
-		if (uevent == NULL) {
-			uevent = trace_ust_create_event(event);
-			if (uevent == NULL) {
-				ret = LTTCOMM_FATAL;
-				goto error;
-			}
-
-		}
+		/* At this point, the session and channel exist on the tracer */
 
-		ret = ust_app_create_event_all(usess, uchan, uevent);
-		if (ret < 0) {
-			ret = LTTCOMM_UST_ENABLE_FAIL;
+		ret = event_ust_enable_tracepoint(usess, domain, uchan, event);
+		if (ret != LTTCOMM_OK) {
 			goto error;
 		}
-
-		/* Add ltt ust event to channel */
-		rcu_read_lock();
-		hashtable_add_unique(uchan->events, &uevent->node);
-		rcu_read_unlock();
-
-		uevent->enabled = 1;
-
-		DBG3("UST ltt event %s added to channel %s", uevent->attr.name,
-				uchan->name);
 		break;
 	}
 	case LTTNG_DOMAIN_UST_EXEC_NAME:
@@ -2592,15 +2677,16 @@ static int cmd_enable_event_all(struct ltt_session *session, int domain,
 			if (ret != LTTCOMM_OK) {
 				goto error;
 			}
-		}
 
-		/* Get the newly created kernel channel pointer */
-		kchan = trace_kernel_get_channel_by_name(channel_name,
-				session->kernel_session);
-		if (kchan == NULL) {
-			/* This sould not happen... */
-			ret = LTTCOMM_FATAL;
-			goto error;
+			/* Get the newly created kernel channel pointer */
+			kchan = trace_kernel_get_channel_by_name(channel_name,
+					session->kernel_session);
+			if (kchan == NULL) {
+				/* This sould not happen... */
+				ret = LTTCOMM_FATAL;
+				goto error;
+			}
+
 		}
 
 		switch (event_type) {
@@ -2625,6 +2711,8 @@ static int cmd_enable_event_all(struct ltt_session *session, int domain,
 			ret = LTTCOMM_KERN_ENABLE_FAIL;
 			goto error;
 		}
+
+		/* Manage return value */
 		if (ret != LTTCOMM_OK) {
 			goto error;
 		}
@@ -3177,7 +3265,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 			/* Start the UST consumer daemons */
 			/* 64-bit */
 			pthread_mutex_lock(&ustconsumer64_data.pid_mutex);
-			if (consumerd64_bindir[0] != '\0' &&
+			if (consumerd64_path[0] != '\0' &&
 					ustconsumer64_data.pid == 0 &&
 					cmd_ctx->lsm->cmd_type != LTTNG_REGISTER_CONSUMER) {
 				pthread_mutex_unlock(&ustconsumer64_data.pid_mutex);
@@ -3193,7 +3281,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 				pthread_mutex_unlock(&ustconsumer64_data.pid_mutex);
 			}
 			/* 32-bit */
-			if (consumerd32_bindir[0] != '\0' &&
+			if (consumerd32_path[0] != '\0' &&
 					ustconsumer32_data.pid == 0 &&
 					cmd_ctx->lsm->cmd_type != LTTNG_REGISTER_CONSUMER) {
 				pthread_mutex_unlock(&ustconsumer32_data.pid_mutex);
@@ -3633,8 +3721,10 @@ static void usage(void)
 	fprintf(stderr, "      --ustconsumerd64-err-sock PATH Specify path for the 64-bit UST consumer error socket\n");
 	fprintf(stderr, "      --ustconsumerd32-cmd-sock PATH Specify path for the 32-bit UST consumer command socket\n");
 	fprintf(stderr, "      --ustconsumerd64-cmd-sock PATH Specify path for the 64-bit UST consumer command socket\n");
-	fprintf(stderr, "      --ustconsumerd32 PATH          Specify path for the 32-bit UST consumer daemon binary\n");
-	fprintf(stderr, "      --ustconsumerd64 PATH          Specify path for the 64-bit UST consumer daemon binary\n");
+	fprintf(stderr, "      --consumerd32-path PATH     Specify path for the 32-bit UST consumer daemon binary\n");
+	fprintf(stderr, "      --consumerd32-libdir PATH   Specify path for the 32-bit UST consumer daemon libraries\n");
+	fprintf(stderr, "      --consumerd64-path PATH     Specify path for the 64-bit UST consumer daemon binary\n");
+	fprintf(stderr, "      --consumerd64-libdir PATH   Specify path for the 64-bit UST consumer daemon libraries\n");
 	fprintf(stderr, "  -d, --daemonize                    Start as a daemon.\n");
 	fprintf(stderr, "  -g, --group NAME                   Specify the tracing group name. (default: tracing)\n");
 	fprintf(stderr, "  -V, --version                      Show version number.\n");
@@ -3656,12 +3746,14 @@ static int parse_args(int argc, char **argv)
 		{ "apps-sock", 1, 0, 'a' },
 		{ "kconsumerd-cmd-sock", 1, 0, 'C' },
 		{ "kconsumerd-err-sock", 1, 0, 'E' },
-		{ "ustconsumerd64", 1, 0, 't' },
-		{ "ustconsumerd64-cmd-sock", 1, 0, 'D' },
-		{ "ustconsumerd64-err-sock", 1, 0, 'F' },
-		{ "ustconsumerd32", 1, 0, 'u' },
 		{ "ustconsumerd32-cmd-sock", 1, 0, 'G' },
 		{ "ustconsumerd32-err-sock", 1, 0, 'H' },
+		{ "ustconsumerd64-cmd-sock", 1, 0, 'D' },
+		{ "ustconsumerd64-err-sock", 1, 0, 'F' },
+		{ "consumerd32-path", 1, 0, 'u' },
+		{ "consumerd32-libdir", 1, 0, 'U' },
+		{ "consumerd64-path", 1, 0, 't' },
+		{ "consumerd64-libdir", 1, 0, 'T' },
 		{ "daemonize", 0, 0, 'd' },
 		{ "sig-parent", 0, 0, 'S' },
 		{ "help", 0, 0, 'h' },
@@ -3738,10 +3830,16 @@ static int parse_args(int argc, char **argv)
 			opt_verbose_consumer += 1;
 			break;
 		case 'u':
-			consumerd32_bindir = optarg;
+			consumerd32_path= optarg;
+			break;
+		case 'U':
+			consumerd32_libdir = optarg;
 			break;
 		case 't':
-			consumerd64_bindir = optarg;
+			consumerd64_path = optarg;
+			break;
+		case 'T':
+			consumerd64_libdir = optarg;
 			break;
 		default:
 			/* Unknown option or other error.