X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=liblttngctl%2Fliblttngctl.c;h=37a0f8b8b257ca13026eedaf98d9dda88184bfc2;hb=f5177a38890d9d7f3324f9bc1d87c9cb77fcc2b3;hp=aca8374a2ebc7f55a22ce0ddceafa15eca8788eb;hpb=b579acd98eabe5875e3ee7975abe10d7ccf23e5c;p=lttng-tools.git

diff --git a/liblttngctl/liblttngctl.c b/liblttngctl/liblttngctl.c
index aca8374a2..37a0f8b8b 100644
--- a/liblttngctl/liblttngctl.c
+++ b/liblttngctl/liblttngctl.c
@@ -317,7 +317,7 @@ static void copy_string(char *dst, const char *src, size_t len)
  */
 int lttng_start_tracing(const char *session_name)
 {
-	copy_string(lsm.session_name, session_name, NAME_MAX);
+	copy_string(lsm.session.name, session_name, NAME_MAX);
 	return ask_sessiond(LTTNG_START_TRACE, NULL);
 }
 
@@ -326,7 +326,7 @@ int lttng_start_tracing(const char *session_name)
  */
 int lttng_stop_tracing(const char *session_name)
 {
-	copy_string(lsm.session_name, session_name, NAME_MAX);
+	copy_string(lsm.session.name, session_name, NAME_MAX);
 	return ask_sessiond(LTTNG_STOP_TRACE, NULL);
 }
 
@@ -385,7 +385,7 @@ int lttng_enable_event(struct lttng_domain *domain,
 }
 
 /*
- * 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,23 +398,13 @@ 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;
@@ -450,29 +440,16 @@ int lttng_enable_channel(struct lttng_domain *domain,
 }
 
 /*
- * Disable recording for the channel for the kernel tracer.
+ * Disable channel.
+ *
+ * All tracing will be stopped for registered events of the channel.
  */
 int lttng_disable_channel(struct lttng_domain *domain, const char *name)
 {
-	int ret = -1;
-
 	copy_string(lsm.u.disable.channel_name, name, NAME_MAX);
+	copy_lttng_domain(domain);
 
-	if (domain) {
-		switch (domain->type) {
-			case LTTNG_DOMAIN_KERNEL:
-				ret = ask_sessiond(LTTNG_KERNEL_DISABLE_CHANNEL, NULL);
-				break;
-			case LTTNG_DOMAIN_UST:
-				ret = LTTCOMM_NOT_IMPLEMENTED;
-				break;
-			default:
-				ret = LTTCOMM_UNKNOWN_DOMAIN;
-				break;
-		};
-	}
-
-	return ret;
+	return ask_sessiond(LTTNG_DISABLE_CHANNEL, NULL);
 }
 
 /*
@@ -513,8 +490,8 @@ const char *lttng_get_readable_code(int code)
  */
 int lttng_create_session(const char *name, const char *path)
 {
-	copy_string(lsm.session_name, name, NAME_MAX);
-	copy_string(lsm.path, path, PATH_MAX);
+	copy_string(lsm.session.name, name, NAME_MAX);
+	copy_string(lsm.session.path, path, PATH_MAX);
 	return ask_sessiond(LTTNG_CREATE_SESSION, NULL);
 }
 
@@ -523,7 +500,7 @@ int lttng_create_session(const char *name, const char *path)
  */
 int lttng_destroy_session(const char *name)
 {
-	copy_string(lsm.session_name, name, NAME_MAX);
+	copy_string(lsm.session.name, name, NAME_MAX);
 	return ask_sessiond(LTTNG_DESTROY_SESSION, NULL);
 }
 
@@ -552,7 +529,7 @@ int lttng_list_domains(const char *session_name, struct lttng_domain **domains)
 {
 	int ret;
 
-	copy_string(lsm.session_name, session_name, NAME_MAX);
+	copy_string(lsm.session.name, session_name, NAME_MAX);
 	ret = ask_sessiond(LTTNG_LIST_DOMAINS, (void**) domains);
 	if (ret < 0) {
 		return ret;
@@ -569,7 +546,7 @@ int lttng_list_channels(struct lttng_domain *domain,
 {
 	int ret;
 
-	copy_string(lsm.session_name, session_name, NAME_MAX);
+	copy_string(lsm.session.name, session_name, NAME_MAX);
 	copy_lttng_domain(domain);
 
 	ret = ask_sessiond(LTTNG_LIST_CHANNELS, (void**) channels);
@@ -589,7 +566,7 @@ int lttng_list_events(struct lttng_domain *domain,
 {
 	int ret;
 
-	copy_string(lsm.session_name, session_name, NAME_MAX);
+	copy_string(lsm.session.name, session_name, NAME_MAX);
 	copy_string(lsm.u.list.channel_name, channel_name, NAME_MAX);
 	copy_lttng_domain(domain);
 
@@ -606,7 +583,7 @@ int lttng_list_events(struct lttng_domain *domain,
  */
 void lttng_set_session_name(const char *name)
 {
-	copy_string(lsm.session_name, name, NAME_MAX);
+	copy_string(lsm.session.name, name, NAME_MAX);
 }
 
 /*