X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng-sessiond%2Fmain.c;h=fcae0235c099751af1f4119466d26f3a382d15d4;hp=63d7f0e2d3e0ab48a68104183e5054454bde7db6;hb=ac3bd9c0d406b3230680d06ab189bcb95337b9cc;hpb=edb6738816b442fb81f12ea0079260c96c3a5759

diff --git a/lttng-sessiond/main.c b/lttng-sessiond/main.c
index 63d7f0e2d..fcae0235c 100644
--- a/lttng-sessiond/main.c
+++ b/lttng-sessiond/main.c
@@ -1532,7 +1532,7 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
 			break;
 		case LTTNG_CONSUMER64_UST:
 		{
-			char *tmpnew;
+			char *tmpnew = NULL;
 
 			if (consumerd64_libdir[0] != '\0') {
 				char *tmp;
@@ -2073,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++;
 	}
@@ -2191,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;
@@ -2299,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;
+				}
 			}
 		}
 
@@ -2378,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;
 
@@ -2388,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);
 
@@ -2457,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;
@@ -2500,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;
 	}