X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=liblttngctl%2Fliblttngctl.c;h=2464bce3b2d1eb30ab0252a2fc4f224a5a85b0c0;hp=7c0546f6612dc88b76afbe0e73abff696d80e851;hb=7d8234d9e6f162ee642cdbec911f46c29b012c3d;hpb=052da9399865b26a0212c6668ab424bb3ba37f4b

diff --git a/liblttngctl/liblttngctl.c b/liblttngctl/liblttngctl.c
index 7c0546f66..2464bce3b 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);
 }
 
 /*
@@ -369,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);
@@ -377,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)
@@ -413,81 +388,42 @@ 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 recording for the channel for the kernel tracer.
+ * 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);
 }
 
 /*
@@ -528,8 +464,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);
 }
 
@@ -538,7 +474,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);
 }
 
@@ -567,7 +503,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;
@@ -584,7 +520,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);
@@ -604,7 +540,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);
 
@@ -621,7 +557,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);
 }
 
 /*
@@ -639,6 +575,22 @@ int lttng_set_tracing_group(const char *name)
 	return 0;
 }
 
+/*
+ *  lttng_calibrate
+ */
+int lttng_calibrate(struct lttng_domain *domain,
+		struct lttng_calibrate *calibrate)
+{
+	int ret;
+
+	copy_lttng_domain(domain);
+
+	memcpy(&lsm.u.calibrate, calibrate, sizeof(struct lttng_calibrate));
+	ret = ask_sessiond(LTTNG_CALIBRATE, NULL);
+
+	return ret;
+}
+
 /*
  *  lttng_check_session_daemon
  *
@@ -656,13 +608,22 @@ int lttng_session_daemon_alive(void)
 		return ret;
 	}
 
-	/* If socket exist, we consider the daemon started */
+	/* If socket exist, we check if the daemon listens to connect. */
 	ret = access(sessiond_sock_path, F_OK);
 	if (ret < 0) {
 		/* Not alive */
 		return 0;
 	}
 
+	ret = lttcomm_connect_unix_sock(sessiond_sock_path);
+	if (ret < 0) {
+		/* Not alive */
+		return 0;
+	}
+	ret = lttcomm_close_unix_sock(ret);
+	if (ret < 0)
+		perror("lttcomm_close_unix_sock");
+
 	/* Is alive */
 	return 1;
 }