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

diff --git a/liblttngctl/liblttngctl.c b/liblttngctl/liblttngctl.c
index f8e8d9749..fd5a552cf 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);
 }
 
@@ -337,30 +337,15 @@ int lttng_add_context(struct lttng_domain *domain,
 		struct lttng_event_context *ctx, const char *event_name,
 		const char *channel_name)
 {
-	int ret = -1;
-
 	copy_string(lsm.u.context.channel_name, channel_name, NAME_MAX);
 	copy_string(lsm.u.context.event_name, event_name, NAME_MAX);
+	copy_lttng_domain(domain);
 
 	if (ctx) {
 		memcpy(&lsm.u.context.ctx, ctx, sizeof(struct lttng_event_context));
 	}
 
-	if (domain) {
-		switch (domain->type) {
-		case LTTNG_DOMAIN_KERNEL:
-			ret = ask_sessiond(LTTNG_KERNEL_ADD_CONTEXT, NULL);
-			break;
-		case LTTNG_DOMAIN_UST:
-			ret = LTTCOMM_NOT_IMPLEMENTED;
-			break;
-		default:
-			ret = LTTCOMM_UNKNOWN_DOMAIN;
-			break;
-		};
-	}
-
-	return ret;
+	return ask_sessiond(LTTNG_ADD_CONTEXT, NULL);
 }
 
 /*
@@ -465,29 +450,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);
 }
 
 /*
@@ -499,22 +471,13 @@ int lttng_disable_channel(struct lttng_domain *domain, const char *name)
 int lttng_list_tracepoints(struct lttng_domain *domain,
 		struct lttng_event **events)
 {
-	int ret = -1;
+	int ret;
 
 	copy_lttng_domain(domain);
 
-	if (domain) {
-		switch (domain->type) {
-			case LTTNG_DOMAIN_KERNEL:
-				ret = ask_sessiond(LTTNG_KERNEL_LIST_EVENTS, (void **) events);
-				break;
-			case LTTNG_DOMAIN_UST:
-				ret = LTTCOMM_NOT_IMPLEMENTED;
-				break;
-			default:
-				ret = LTTCOMM_UNKNOWN_DOMAIN;
-				break;
-		};
+	ret = ask_sessiond(LTTNG_LIST_TRACEPOINTS, (void **) events);
+	if (ret < 0) {
+		return ret;
 	}
 
 	return ret / sizeof(struct lttng_event);
@@ -537,8 +500,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);
 }
 
@@ -547,7 +510,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);
 }
 
@@ -576,7 +539,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;
@@ -593,7 +556,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);
@@ -613,7 +576,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);
 
@@ -630,7 +593,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);
 }
 
 /*