X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=liblttngctl%2Fliblttngctl.c;h=37e202f2c35f7f1a099a50d7f9b4fa91524bf79d;hb=ab14718513c62c38a882d103b1dc727467271ff7;hp=fd5a552cf012d94e904b72f77cf7dc86d9635e72;hpb=42abccdb24a0b2a132c42e85e1343a007c0c9059;p=lttng-tools.git

diff --git a/liblttngctl/liblttngctl.c b/liblttngctl/liblttngctl.c
index fd5a552cf..37e202f2c 100644
--- a/liblttngctl/liblttngctl.c
+++ b/liblttngctl/liblttngctl.c
@@ -354,7 +354,7 @@ int lttng_add_context(struct lttng_domain *domain,
 int lttng_enable_event(struct lttng_domain *domain,
 		struct lttng_event *ev, const char *channel_name)
 {
-	int ret = -1;
+	int ret;
 
 	if (channel_name == NULL) {
 		copy_string(lsm.u.enable.channel_name, DEFAULT_CHANNEL_NAME, NAME_MAX);
@@ -362,30 +362,20 @@ int lttng_enable_event(struct lttng_domain *domain,
 		copy_string(lsm.u.enable.channel_name, channel_name, NAME_MAX);
 	}
 
-	if (domain) {
-		switch (domain->type) {
-			case LTTNG_DOMAIN_KERNEL:
-				if (ev == NULL) {
-					ret = ask_sessiond(LTTNG_KERNEL_ENABLE_ALL_EVENT, NULL);
-				} else {
-					memcpy(&lsm.u.enable.event, ev, sizeof(struct lttng_event));
-					ret = ask_sessiond(LTTNG_KERNEL_ENABLE_EVENT, NULL);
-				}
-				break;
-			case LTTNG_DOMAIN_UST:
-				ret = LTTCOMM_NOT_IMPLEMENTED;
-				break;
-			default:
-				ret = LTTCOMM_UNKNOWN_DOMAIN;
-				break;
-		};
+	copy_lttng_domain(domain);
+
+	if (ev == NULL) {
+		ret = ask_sessiond(LTTNG_ENABLE_ALL_EVENT, NULL);
+	} else {
+		memcpy(&lsm.u.enable.event, ev, sizeof(struct lttng_event));
+		ret = ask_sessiond(LTTNG_ENABLE_EVENT, NULL);
 	}
 
 	return ret;
 }
 
 /*
- * Disable an event in the kernel tracer.
+ * Disable event of a channel and domain.
  */
 int lttng_disable_event(struct lttng_domain *domain, const char *name,
 		const char *channel_name)
@@ -398,60 +388,34 @@ int lttng_disable_event(struct lttng_domain *domain, const char *name,
 		copy_string(lsm.u.disable.channel_name, channel_name, NAME_MAX);
 	}
 
-	if (domain) {
-		switch (domain->type) {
-			case LTTNG_DOMAIN_KERNEL:
-				if (name == NULL) {
-					ret = ask_sessiond(LTTNG_KERNEL_DISABLE_ALL_EVENT, NULL);
-				} else {
-					copy_string(lsm.u.disable.name, name, NAME_MAX);
-					ret = ask_sessiond(LTTNG_KERNEL_DISABLE_EVENT, NULL);
-				}
-				break;
-			case LTTNG_DOMAIN_UST:
-				ret = LTTCOMM_NOT_IMPLEMENTED;
-				break;
-			default:
-				ret = LTTCOMM_UNKNOWN_DOMAIN;
-				break;
-		};
+	copy_lttng_domain(domain);
+
+	if (name == NULL) {
+		ret = ask_sessiond(LTTNG_DISABLE_ALL_EVENT, NULL);
+	} else {
+		copy_string(lsm.u.disable.name, name, NAME_MAX);
+		ret = ask_sessiond(LTTNG_DISABLE_EVENT, NULL);
 	}
 
 	return ret;
 }
 
 /*
- * Enable recording for a channel for the kernel tracer.
+ * Enable channel per domain
  */
 int lttng_enable_channel(struct lttng_domain *domain,
 		struct lttng_channel *chan)
 {
-	int ret = -1;
-
 	if (chan) {
 		memcpy(&lsm.u.channel.chan, chan, sizeof(struct lttng_channel));
 	}
 
-	if (domain) {
-		switch (domain->type) {
-			case LTTNG_DOMAIN_KERNEL:
-				ret = ask_sessiond(LTTNG_KERNEL_ENABLE_CHANNEL, NULL);
-				break;
-			case LTTNG_DOMAIN_UST:
-				ret = LTTCOMM_NOT_IMPLEMENTED;
-				break;
-			default:
-				ret = LTTCOMM_UNKNOWN_DOMAIN;
-				break;
-		};
-	}
+	copy_lttng_domain(domain);
 
-	return ret;
+	return ask_sessiond(LTTNG_ENABLE_CHANNEL, NULL);
 }
 
 /*
- * Disable channel.
- *
  * All tracing will be stopped for registered events of the channel.
  */
 int lttng_disable_channel(struct lttng_domain *domain, const char *name)