X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=lttng-sessiond%2Fmain.c;h=ae994d7e551956200265e5450e494627a376105c;hp=bc745487b97f0a690ccaadf2ec137a7851ca4ff0;hb=b0a40d28e4498724b405cbcd5c468bfec3295eb0;hpb=84ea9c994aacbb341f648acad5fa10edc520dde2

diff --git a/lttng-sessiond/main.c b/lttng-sessiond/main.c
index bc745487b..ae994d7e5 100644
--- a/lttng-sessiond/main.c
+++ b/lttng-sessiond/main.c
@@ -335,8 +335,11 @@ error:
  */
 static void teardown_kernel_session(struct ltt_session *session)
 {
-	if (!session->kernel_session)
+	if (!session->kernel_session) {
+		DBG3("No kernel session when tearingdown session");
 		return;
+	}
+
 	DBG("Tearing down kernel session");
 
 	/*
@@ -358,13 +361,18 @@ static void teardown_ust_session(struct ltt_session *session)
 {
 	int ret;
 
-	if (!session->ust_session)
+	if (!session->ust_session) {
+		DBG3("No UST session when tearingdown session");
 		return;
+	}
+
 	DBG("Tearing down UST session(s)");
+
 	ret = ust_app_destroy_trace_all(session->ust_session);
 	if (ret) {
 		ERR("Error in ust_app_destroy_trace_all");
 	}
+
 	trace_ust_destroy_session(session->ust_session);
 }
 
@@ -1913,7 +1921,13 @@ static void list_lttng_channels(int domain, struct ltt_session *session,
 				uchan->attr.switch_timer_interval;
 			channels[i].attr.read_timer_interval =
 				uchan->attr.read_timer_interval;
-			channels[i].attr.output = uchan->attr.output;
+			channels[i].enabled = uchan->enabled;
+			switch (uchan->attr.output) {
+			case LTTNG_UST_MMAP:
+			default:
+				channels[i].attr.output = LTTNG_EVENT_MMAP;
+				break;
+			}
 			i++;
 		}
 		break;
@@ -1932,6 +1946,7 @@ static int list_lttng_ust_global_events(char *channel_name,
 	int i = 0, ret = 0;
 	unsigned int nb_event = 0;
 	struct cds_lfht_iter iter;
+	struct cds_lfht_node *node;
 	struct ltt_ust_channel *uchan;
 	struct ltt_ust_event *uevent;
 	struct lttng_event *tmp;
@@ -1940,11 +1955,17 @@ static int list_lttng_ust_global_events(char *channel_name,
 
 	rcu_read_lock();
 
-	/* Count events in all channels */
-	cds_lfht_for_each_entry(ust_global->channels, &iter, uchan, node) {
-		nb_event += hashtable_get_count(uchan->events);
+	node = hashtable_lookup(ust_global->channels, (void *) channel_name,
+			strlen(channel_name), &iter);
+	if (node == NULL) {
+		ret = -LTTCOMM_UST_CHAN_NOT_FOUND;
+		goto error;
 	}
 
+	uchan = caa_container_of(node, struct ltt_ust_channel, node);
+
+	nb_event += hashtable_get_count(uchan->events);
+
 	if (nb_event == 0) {
 		ret = nb_event;
 		goto error;
@@ -1958,24 +1979,22 @@ static int list_lttng_ust_global_events(char *channel_name,
 		goto error;
 	}
 
-	cds_lfht_for_each_entry(ust_global->channels, &iter, uchan, node) {
-		cds_lfht_for_each_entry(uchan->events, &iter, uevent, node) {
-			strncpy(tmp[i].name, uevent->attr.name, LTTNG_SYMBOL_NAME_LEN);
-			tmp[i].name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
-			tmp[i].enabled = uevent->enabled;
-			switch (uevent->attr.instrumentation) {
-			case LTTNG_UST_TRACEPOINT:
-				tmp[i].type = LTTNG_EVENT_TRACEPOINT;
-				break;
-			case LTTNG_UST_PROBE:
-				tmp[i].type = LTTNG_EVENT_PROBE;
-				break;
-			case LTTNG_UST_FUNCTION:
-				tmp[i].type = LTTNG_EVENT_FUNCTION;
-				break;
-			}
-			i++;
+	cds_lfht_for_each_entry(uchan->events, &iter, uevent, node) {
+		strncpy(tmp[i].name, uevent->attr.name, LTTNG_SYMBOL_NAME_LEN);
+		tmp[i].name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
+		tmp[i].enabled = uevent->enabled;
+		switch (uevent->attr.instrumentation) {
+		case LTTNG_UST_TRACEPOINT:
+			tmp[i].type = LTTNG_EVENT_TRACEPOINT;
+			break;
+		case LTTNG_UST_PROBE:
+			tmp[i].type = LTTNG_EVENT_PROBE;
+			break;
+		case LTTNG_UST_FUNCTION:
+			tmp[i].type = LTTNG_EVENT_FUNCTION;
+			break;
 		}
+		i++;
 	}
 
 	ret = nb_event;
@@ -2064,22 +2083,52 @@ static int cmd_disable_channel(struct ltt_session *session,
 		int domain, char *channel_name)
 {
 	int ret;
+	struct ltt_ust_session *usess;
+
+	usess = session->ust_session;
 
 	switch (domain) {
-		case LTTNG_DOMAIN_KERNEL:
-			ret = channel_kernel_disable(session->kernel_session,
-					channel_name);
-			if (ret != LTTCOMM_OK) {
-				goto error;
-			}
+	case LTTNG_DOMAIN_KERNEL:
+	{
+		ret = channel_kernel_disable(session->kernel_session,
+				channel_name);
+		if (ret != LTTCOMM_OK) {
+			goto error;
+		}
 
-			kernel_wait_quiescent(kernel_tracer_fd);
-			break;
-		case LTTNG_DOMAIN_UST_PID:
-			break;
-		default:
-			ret = LTTCOMM_UNKNOWN_DOMAIN;
+		kernel_wait_quiescent(kernel_tracer_fd);
+		break;
+	}
+	case LTTNG_DOMAIN_UST:
+	{
+		struct ltt_ust_channel *uchan;
+
+		/* Get channel in global UST domain HT */
+		uchan = trace_ust_find_channel_by_name(usess->domain_global.channels,
+				channel_name);
+		if (uchan == NULL) {
+			ret = LTTCOMM_UST_CHAN_NOT_FOUND;
+			goto error;
+		}
+
+		ret = ust_app_disable_channel_all(usess, uchan);
+		if (ret < 0) {
+			ret = LTTCOMM_UST_DISABLE_FAIL;
 			goto error;
+		}
+
+		uchan->enabled = 0;
+
+		break;
+	}
+	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
+	case LTTNG_DOMAIN_UST_EXEC_NAME:
+	case LTTNG_DOMAIN_UST_PID:
+		ret = LTTCOMM_NOT_IMPLEMENTED;
+		goto error;
+	default:
+		ret = LTTCOMM_UNKNOWN_DOMAIN;
+		goto error;
 	}
 
 	ret = LTTCOMM_OK;
@@ -2126,14 +2175,14 @@ error:
  * Command LTTNG_ENABLE_CHANNEL processed by the client thread.
  */
 static int cmd_enable_channel(struct ltt_session *session,
-		struct lttng_domain *domain, struct lttng_channel *attr)
+		int domain, struct lttng_channel *attr)
 {
 	int ret;
 	struct ltt_ust_session *usess = session->ust_session;
 
 	DBG("Enabling channel %s for session %s", attr->name, session->name);
 
-	switch (domain->type) {
+	switch (domain) {
 	case LTTNG_DOMAIN_KERNEL:
 	{
 		struct ltt_kernel_channel *kchan;
@@ -2174,65 +2223,36 @@ static int cmd_enable_channel(struct ltt_session *session,
 			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);
+			if (ret != 0) {
+				ret = LTTCOMM_UST_CHAN_FAIL;
+				goto error;
+			}
 		} else {
-			ret = LTTCOMM_UST_CHAN_EXIST;
-			goto error;
-		}
+			/* If already enabled, everything is OK */
+			if (uchan->enabled) {
+				ret = LTTCOMM_OK;
+				goto error;
+			}
 
-		/* Add channel to all registered applications */
-		ret = ust_app_create_channel_all(usess, uchan);
-		if (ret != 0) {
-			goto error;
+			ret = ust_app_enable_channel_all(usess, uchan);
+			if (ret < 0) {
+				ret = LTTCOMM_UST_ENABLE_FAIL;
+				goto error;
+			}
 		}
 
 		uchan->enabled = 1;
 
 		break;
 	}
+	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
+	case LTTNG_DOMAIN_UST_EXEC_NAME:
 	case LTTNG_DOMAIN_UST_PID:
-	{
-		/*
-		int sock;
-		struct ltt_ust_channel *uchan;
-		struct ltt_ust_session *usess;
-		struct ust_app *app;
-
-		usess = trace_ust_get_session_by_pid(&session->ust_session_list,
-				domain->attr.pid);
-		if (usess == NULL) {
-			ret = LTTCOMM_UST_CHAN_NOT_FOUND;
-			goto error;
-		}
-
-		app = ust_app_get_by_pid(domain->attr.pid);
-		if (app == NULL) {
-			ret = LTTCOMM_APP_NOT_FOUND;
-			goto error;
-		}
-		sock = app->sock;
-
-		uchan = trace_ust_get_channel_by_name(attr->name, usess);
-		if (uchan == NULL) {
-			ret = channel_ust_create(usess, attr, sock);
-		} else {
-			ret = channel_ust_enable(usess, uchan, sock);
-		}
-
-		if (ret != LTTCOMM_OK) {
-			goto error;
-		}
-
-		ret = copy_ust_channel_to_app(usess, attr, app);
-		if (ret != LTTCOMM_OK) {
-			goto error;
-		}
-
-		DBG("UST channel %s created for app sock %d with pid %d",
-				attr->name, app->sock, domain->attr.pid);
-		*/
 		ret = LTTCOMM_NOT_IMPLEMENTED;
 		goto error;
-	}
 	default:
 		ret = LTTCOMM_UNKNOWN_DOMAIN;
 		goto error;
@@ -2256,15 +2276,17 @@ static int cmd_disable_event(struct ltt_session *session, int domain,
 	case LTTNG_DOMAIN_KERNEL:
 	{
 		struct ltt_kernel_channel *kchan;
+		struct ltt_kernel_session *ksess;
 
-		kchan = trace_kernel_get_channel_by_name(channel_name,
-				session->kernel_session);
+		ksess = session->kernel_session;
+
+		kchan = trace_kernel_get_channel_by_name(channel_name, ksess);
 		if (kchan == NULL) {
 			ret = LTTCOMM_KERN_CHAN_NOT_FOUND;
 			goto error;
 		}
 
-		ret = event_kernel_disable_tracepoint(session->kernel_session, kchan, event_name);
+		ret = event_kernel_disable_tracepoint(ksess, kchan, event_name);
 		if (ret != LTTCOMM_OK) {
 			goto error;
 		}
@@ -2273,11 +2295,34 @@ static int cmd_disable_event(struct ltt_session *session, int domain,
 		break;
 	}
 	case LTTNG_DOMAIN_UST:
+	{
+		struct ltt_ust_session *usess;
+		struct ltt_ust_channel *uchan;
+
+		usess = session->ust_session;
+
+		uchan = trace_ust_find_channel_by_name(usess->domain_global.channels,
+				channel_name);
+		if (uchan == NULL) {
+			ret = LTTCOMM_UST_CHAN_NOT_FOUND;
+			goto error;
+		}
+
+		ret = ust_app_disable_event(usess, uchan, event_name);
+		if (ret < 0) {
+			ret = LTTCOMM_UST_DISABLE_FAIL;
+			goto error;
+		}
+
+		DBG2("Disable UST event %s in channel %s completed", event_name,
+				channel_name);
+
+		break;
+	}
 	case LTTNG_DOMAIN_UST_EXEC_NAME:
 	case LTTNG_DOMAIN_UST_PID:
 	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
 	default:
-		/* TODO: Other UST domains */
 		ret = LTTCOMM_NOT_IMPLEMENTED;
 		goto error;
 	}
@@ -2295,26 +2340,57 @@ static int cmd_disable_event_all(struct ltt_session *session, int domain,
 		char *channel_name)
 {
 	int ret;
-	struct ltt_kernel_channel *kchan;
 
 	switch (domain) {
 	case LTTNG_DOMAIN_KERNEL:
-		kchan = trace_kernel_get_channel_by_name(channel_name,
-				session->kernel_session);
+	{
+		struct ltt_kernel_session *ksess;
+		struct ltt_kernel_channel *kchan;
+
+		ksess = session->kernel_session;
+
+		kchan = trace_kernel_get_channel_by_name(channel_name, ksess);
 		if (kchan == NULL) {
 			ret = LTTCOMM_KERN_CHAN_NOT_FOUND;
 			goto error;
 		}
 
-		ret = event_kernel_disable_all(session->kernel_session, kchan);
+		ret = event_kernel_disable_all(ksess, kchan);
 		if (ret != LTTCOMM_OK) {
 			goto error;
 		}
 
 		kernel_wait_quiescent(kernel_tracer_fd);
 		break;
+	}
+	case LTTNG_DOMAIN_UST:
+	{
+		struct ltt_ust_session *usess;
+		struct ltt_ust_channel *uchan;
+
+		usess = session->ust_session;
+
+		uchan = trace_ust_find_channel_by_name(usess->domain_global.channels,
+				channel_name);
+		if (uchan == NULL) {
+			ret = LTTCOMM_UST_CHAN_NOT_FOUND;
+			goto error;
+		}
+
+		ret = ust_app_disable_event_all(usess, uchan);
+		if (ret < 0) {
+			ret = LTTCOMM_UST_DISABLE_FAIL;
+			goto error;
+		}
+
+		DBG2("Disable all UST event in channel %s completed", channel_name);
+
+		break;
+	}
+	case LTTNG_DOMAIN_UST_EXEC_NAME:
+	case LTTNG_DOMAIN_UST_PID:
+	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
 	default:
-		/* TODO: Userspace tracing */
 		ret = LTTCOMM_NOT_IMPLEMENTED;
 		goto error;
 	}
@@ -2424,13 +2500,35 @@ static int cmd_enable_event(struct ltt_session *session, int domain,
 	{
 		struct ltt_ust_channel *uchan;
 		struct ltt_ust_event *uevent;
+		struct lttng_channel *attr;
 
 		uchan = trace_ust_find_channel_by_name(usess->domain_global.channels,
 				channel_name);
 		if (uchan == NULL) {
-			/* TODO: Create default channel */
-			ret = LTTCOMM_UST_CHAN_NOT_FOUND;
-			goto error;
+			/* Create default channel */
+			attr = channel_new_default_attr(domain);
+			if (attr == NULL) {
+				ret = LTTCOMM_FATAL;
+				goto error;
+			}
+			snprintf(attr->name, NAME_MAX, "%s", channel_name);
+
+			/* Use the internal command enable channel */
+			ret = cmd_enable_channel(session, domain, attr);
+			if (ret < 0) {
+				goto error;
+			}
+
+			free(attr);
+
+			/* Get the newly created channel reference back */
+			uchan = trace_ust_find_channel_by_name(
+					usess->domain_global.channels, channel_name);
+			if (uchan == NULL) {
+				/* Something is really wrong */
+				ret = LTTCOMM_FATAL;
+				goto error;
+			}
 		}
 
 		uevent = trace_ust_find_event_by_name(uchan->events, event->name);
@@ -2712,7 +2810,6 @@ static int cmd_stop_trace(struct ltt_session *session)
 		kernel_wait_quiescent(kernel_tracer_fd);
 	}
 
-	/* Flag session that trace should start automatically */
 	if (usess) {
 		usess->start_trace = 0;
 
@@ -3151,7 +3248,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 	}
 	case LTTNG_ENABLE_CHANNEL:
 	{
-		ret = cmd_enable_channel(cmd_ctx->session, &cmd_ctx->lsm->domain,
+		ret = cmd_enable_channel(cmd_ctx->session, cmd_ctx->lsm->domain.type,
 				&cmd_ctx->lsm->u.channel.chan);
 		break;
 	}