X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=lttng-sessiond%2Fmain.c;h=63d7f0e2d3e0ab48a68104183e5054454bde7db6;hb=edb6738816b442fb81f12ea0079260c96c3a5759;hp=7e58ff781ee86d481458657ddba725f30c102d49;hpb=ebaeda9495ef97ec81d9f7dd66eccdb32f116cee;p=lttng-tools.git

diff --git a/lttng-sessiond/main.c b/lttng-sessiond/main.c
index 7e58ff781..63d7f0e2d 100644
--- a/lttng-sessiond/main.c
+++ b/lttng-sessiond/main.c
@@ -50,7 +50,7 @@
 #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"
@@ -192,7 +192,7 @@ void setup_consumerd_path(void)
 	 */
 #if (CAA_BITS_PER_LONG == 32)
 	if (!consumerd32_path[0]) {
-		consumerd32_bindir = INSTALL_BIN_PATH "/" CONSUMERD_FILE;
+		consumerd32_path = INSTALL_BIN_PATH "/" CONSUMERD_FILE;
 	}
 	if (!consumerd32_libdir[0]) {
 		consumerd32_libdir = INSTALL_LIB_PATH;
@@ -1532,18 +1532,88 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
 			break;
 		case LTTNG_CONSUMER64_UST:
 		{
-			execl(consumerd64_path, verbosity, "-u",
+			char *tmpnew;
+
+			if (consumerd64_libdir[0] != '\0') {
+				char *tmp;
+				size_t tmplen;
+
+				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:
 		{
-			execl(consumerd32_path, verbosity, "-u",
+			char *tmpnew = NULL;
+
+			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:
@@ -1560,6 +1630,7 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
 		perror("start consumer fork");
 		ret = -errno;
 	}
+error:
 	return ret;
 }
 
@@ -2509,10 +2580,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) {
@@ -2523,14 +2594,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 */
@@ -2543,31 +2614,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: