X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=liblttngctl%2Fliblttngctl.c;h=17bb4105ae0f9045907ca492565c579962278d5b;hb=2a71efd5ae4e4bc9fe52154782d4a0a8f867d55a;hp=6df82c4833086c851d284254f446fbaef06954f7;hpb=82a3637f639486c07ff937ab03e1e9532379d26a;p=lttng-tools.git

diff --git a/liblttngctl/liblttngctl.c b/liblttngctl/liblttngctl.c
index 6df82c483..17bb4105a 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,9 +274,30 @@ 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.
+ *
+ * Return -1 if the domain is unkown.
+ */
+static int copy_lttng_domain(struct lttng_domain *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));
+		return 0;
+	default:
+		return -1;
+	}
+}
+
 /*
  *  Start tracing for all trace of the session.
  */
@@ -439,18 +468,24 @@ int lttng_disable_channel(struct lttng_domain *domain, const char *name)
 }
 
 /*
- * 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;
 
+	ret = copy_lttng_domain(domain);
+	if (ret < 0) {
+		return -LTTCOMM_UNKNOWN_DOMAIN;
+	}
+
 	switch (domain->type) {
 		case LTTNG_DOMAIN_KERNEL:
-			ret = ask_sessiond(LTTNG_KERNEL_LIST_EVENTS, (void **) event_list);
+			ret = ask_sessiond(LTTNG_KERNEL_LIST_EVENTS, (void **) events);
 			break;
 		case LTTNG_DOMAIN_UST:
 			ret = LTTCOMM_NOT_IMPLEMENTED;
@@ -460,7 +495,7 @@ int lttng_list_events(struct lttng_domain *domain, char **event_list)
 			break;
 	};
 
-	return ret;
+	return ret / sizeof(struct lttng_event);
 }
 
 /*
@@ -512,6 +547,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;
+
+	strncpy(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;
+
+	strncpy(lsm.session_name, session_name, NAME_MAX);
+	ret = copy_lttng_domain(domain);
+	if (ret < 0) {
+		return -LTTCOMM_UNKNOWN_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;
+
+	strncpy(lsm.session_name, session_name, NAME_MAX);
+	strncpy(lsm.u.list.channel_name, channel_name, NAME_MAX);
+	ret = copy_lttng_domain(domain);
+	if (ret < 0) {
+		return -LTTCOMM_UNKNOWN_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.
  */