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

diff --git a/liblttngctl/liblttngctl.c b/liblttngctl/liblttngctl.c
index 6df82c483..aca8374a2 100644
--- a/liblttngctl/liblttngctl.c
+++ b/liblttngctl/liblttngctl.c
@@ -208,6 +208,14 @@ static int disconnect_sessiond(void)
 	return ret;
 }
 
+/*
+ * Reset the session message structure.
+ */
+static void reset_session_msg(void)
+{
+	memset(&lsm, 0, sizeof(struct lttcomm_session_msg));
+}
+
 /*
  *  ask_sessiond
  *
@@ -266,15 +274,50 @@ static int ask_sessiond(enum lttcomm_sessiond_command lct, void **buf)
 
 end:
 	disconnect_sessiond();
+	reset_session_msg();
 	return ret;
 }
 
+/*
+ * Copy domain to lttcomm_session_msg domain. If unknown domain, default domain
+ * will be the kernel.
+ */
+static void copy_lttng_domain(struct lttng_domain *dom)
+{
+	if (dom) {
+		switch (dom->type) {
+		case LTTNG_DOMAIN_KERNEL:
+		case LTTNG_DOMAIN_UST:
+		case LTTNG_DOMAIN_UST_EXEC_NAME:
+		case LTTNG_DOMAIN_UST_PID:
+		case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
+			memcpy(&lsm.domain, dom, sizeof(struct lttng_domain));
+			break;
+		default:
+			lsm.domain.type = LTTNG_DOMAIN_KERNEL;
+			break;
+		}
+	}
+}
+
+/*
+ * Copy string from src to dst and enforce null terminated byte.
+ */
+static void copy_string(char *dst, const char *src, size_t len)
+{
+	if (src && dst) {
+		strncpy(dst, src, len);
+		/* Enforce the NULL terminated byte */
+		dst[len - 1] = '\0';
+	}
+}
+
 /*
  *  Start tracing for all trace of the session.
  */
 int lttng_start_tracing(const char *session_name)
 {
-	strncpy(lsm.session_name, session_name, NAME_MAX);
+	copy_string(lsm.session_name, session_name, NAME_MAX);
 	return ask_sessiond(LTTNG_START_TRACE, NULL);
 }
 
@@ -283,7 +326,7 @@ int lttng_start_tracing(const char *session_name)
  */
 int lttng_stop_tracing(const char *session_name)
 {
-	strncpy(lsm.session_name, session_name, NAME_MAX);
+	copy_string(lsm.session_name, session_name, NAME_MAX);
 	return ask_sessiond(LTTNG_STOP_TRACE, NULL);
 }
 
@@ -294,31 +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;
-
-	if (channel_name != NULL) {
-		strncpy(lsm.u.context.channel_name, channel_name, NAME_MAX);
-	}
+	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 (event_name != NULL) {
-		strncpy(lsm.u.context.event_name, event_name, NAME_MAX);
+	if (ctx) {
+		memcpy(&lsm.u.context.ctx, ctx, sizeof(struct lttng_event_context));
 	}
 
-	memcpy(&lsm.u.context.ctx, ctx, sizeof(struct lttng_event_context));
-
-	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);
 }
 
 /*
@@ -327,30 +354,32 @@ 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;
+	int ret = -1;
 
 	if (channel_name == NULL) {
-		strncpy(lsm.u.enable.channel_name, DEFAULT_CHANNEL_NAME, NAME_MAX);
+		copy_string(lsm.u.enable.channel_name, DEFAULT_CHANNEL_NAME, NAME_MAX);
 	} else {
-		strncpy(lsm.u.enable.channel_name, channel_name, NAME_MAX);
+		copy_string(lsm.u.enable.channel_name, channel_name, NAME_MAX);
 	}
 
-	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;
-	};
+	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;
+		};
+	}
 
 	return ret;
 }
@@ -361,30 +390,32 @@ int lttng_enable_event(struct lttng_domain *domain,
 int lttng_disable_event(struct lttng_domain *domain, const char *name,
 		const char *channel_name)
 {
-	int ret;
+	int ret = -1;
 
 	if (channel_name == NULL) {
-		strncpy(lsm.u.disable.channel_name, DEFAULT_CHANNEL_NAME, NAME_MAX);
+		copy_string(lsm.u.disable.channel_name, DEFAULT_CHANNEL_NAME, NAME_MAX);
 	} else {
-		strncpy(lsm.u.disable.channel_name, channel_name, NAME_MAX);
+		copy_string(lsm.u.disable.channel_name, channel_name, NAME_MAX);
 	}
 
-	switch (domain->type) {
-		case LTTNG_DOMAIN_KERNEL:
-			if (name == NULL) {
-				ret = ask_sessiond(LTTNG_KERNEL_DISABLE_ALL_EVENT, NULL);
-			} else {
-				strncpy(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;
-	};
+	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;
+		};
+	}
 
 	return ret;
 }
@@ -395,21 +426,25 @@ int lttng_disable_event(struct lttng_domain *domain, const char *name,
 int lttng_enable_channel(struct lttng_domain *domain,
 		struct lttng_channel *chan)
 {
-	int ret;
+	int ret = -1;
 
-	memcpy(&lsm.u.channel.chan, chan, sizeof(struct lttng_channel));
+	if (chan) {
+		memcpy(&lsm.u.channel.chan, chan, sizeof(struct lttng_channel));
+	}
 
-	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;
-	};
+	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;
+		};
+	}
 
 	return ret;
 }
@@ -419,48 +454,46 @@ int lttng_enable_channel(struct lttng_domain *domain,
  */
 int lttng_disable_channel(struct lttng_domain *domain, const char *name)
 {
-	int ret;
-
-	strncpy(lsm.u.disable.channel_name, name, NAME_MAX);
+	int ret = -1;
 
-	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;
-	};
+	copy_string(lsm.u.disable.channel_name, name, NAME_MAX);
+
+	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;
 }
 
 /*
- * List all available events in the kernel.
+ * List all available tracepoints of domain.
  *
- * Return the size (bytes) of the list and set the event_list array.
+ * Return the size (bytes) of the list and set the events array.
  * On error, return negative value.
  */
-int lttng_list_events(struct lttng_domain *domain, char **event_list)
+int lttng_list_tracepoints(struct lttng_domain *domain,
+		struct lttng_event **events)
 {
 	int ret;
 
-	switch (domain->type) {
-		case LTTNG_DOMAIN_KERNEL:
-			ret = ask_sessiond(LTTNG_KERNEL_LIST_EVENTS, (void **) event_list);
-			break;
-		case LTTNG_DOMAIN_UST:
-			ret = LTTCOMM_NOT_IMPLEMENTED;
-			break;
-		default:
-			ret = LTTCOMM_UNKNOWN_DOMAIN;
-			break;
-	};
+	copy_lttng_domain(domain);
 
-	return ret;
+	ret = ask_sessiond(LTTNG_LIST_TRACEPOINTS, (void **) events);
+	if (ret < 0) {
+		return ret;
+	}
+
+	return ret / sizeof(struct lttng_event);
 }
 
 /*
@@ -480,8 +513,8 @@ const char *lttng_get_readable_code(int code)
  */
 int lttng_create_session(const char *name, const char *path)
 {
-	strncpy(lsm.session_name, name, NAME_MAX);
-	strncpy(lsm.path, path, PATH_MAX);
+	copy_string(lsm.session_name, name, NAME_MAX);
+	copy_string(lsm.path, path, PATH_MAX);
 	return ask_sessiond(LTTNG_CREATE_SESSION, NULL);
 }
 
@@ -490,7 +523,7 @@ int lttng_create_session(const char *name, const char *path)
  */
 int lttng_destroy_session(const char *name)
 {
-	strncpy(lsm.session_name, name, NAME_MAX);
+	copy_string(lsm.session_name, name, NAME_MAX);
 	return ask_sessiond(LTTNG_DESTROY_SESSION, NULL);
 }
 
@@ -512,12 +545,68 @@ int lttng_list_sessions(struct lttng_session **sessions)
 	return ret / sizeof(struct lttng_session);
 }
 
+/*
+ * List domain of a session.
+ */
+int lttng_list_domains(const char *session_name, struct lttng_domain **domains)
+{
+	int ret;
+
+	copy_string(lsm.session_name, session_name, NAME_MAX);
+	ret = ask_sessiond(LTTNG_LIST_DOMAINS, (void**) domains);
+	if (ret < 0) {
+		return ret;
+	}
+
+	return ret / sizeof(struct lttng_domain);
+}
+
+/*
+ * List channels of a session
+ */
+int lttng_list_channels(struct lttng_domain *domain,
+		const char *session_name, struct lttng_channel **channels)
+{
+	int ret;
+
+	copy_string(lsm.session_name, session_name, NAME_MAX);
+	copy_lttng_domain(domain);
+
+	ret = ask_sessiond(LTTNG_LIST_CHANNELS, (void**) channels);
+	if (ret < 0) {
+		return ret;
+	}
+
+	return ret / sizeof(struct lttng_channel);
+}
+
+/*
+ * List events of a session channel.
+ */
+int lttng_list_events(struct lttng_domain *domain,
+		const char *session_name, const char *channel_name,
+		struct lttng_event **events)
+{
+	int ret;
+
+	copy_string(lsm.session_name, session_name, NAME_MAX);
+	copy_string(lsm.u.list.channel_name, channel_name, NAME_MAX);
+	copy_lttng_domain(domain);
+
+	ret = ask_sessiond(LTTNG_LIST_EVENTS, (void**) events);
+	if (ret < 0) {
+		return ret;
+	}
+
+	return ret / sizeof(struct lttng_event);
+}
+
 /*
  * Set session name for the current lsm.
  */
 void lttng_set_session_name(const char *name)
 {
-	strncpy(lsm.session_name, name, NAME_MAX);
+	copy_string(lsm.session_name, name, NAME_MAX);
 }
 
 /*