X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-abi.c;h=4b8a8e71d9e5b4548f8e3e3d2c0e7e676e514c96;hb=51489cadd9c38c10261bdbab9b5e72803c95a732;hp=639165eb3b21ad6a8606d7f3c0e720945f652d04;hpb=a3f61e7f689a5fc60b833a773f462989dc6cc78f;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
index 639165eb..4b8a8e71 100644
--- a/liblttng-ust/lttng-ust-abi.c
+++ b/liblttng-ust/lttng-ust-abi.c
@@ -32,6 +32,9 @@
 #include "lttng/core.h"
 #include "ltt-tracer.h"
 
+static
+int lttng_abi_tracepoint_list(void);
+
 /*
  * Object descriptor table. Should be protected from concurrent access
  * by the caller.
@@ -197,6 +200,7 @@ static const struct lttng_ust_objd_ops lttng_channel_ops;
 static const struct lttng_ust_objd_ops lttng_metadata_ops;
 static const struct lttng_ust_objd_ops lttng_event_ops;
 static const struct lttng_ust_objd_ops lib_ring_buffer_objd_ops;
+static const struct lttng_ust_objd_ops lttng_tracepoint_list_ops;
 
 enum channel_type {
 	PER_CPU_CHANNEL,
@@ -233,26 +237,6 @@ objd_error:
 	return ret;
 }
 
-#if 0
-static
-int lttng_abi_tracepoint_list(void)
-{
-	int list_objd, ret;
-
-	/* TODO: Create list private data */
-	list_objd = objd_alloc(NULL, &lttng_tracepoint_list_ops);
-	if (list_objd < 0) {
-		ret = list_objd;
-		goto objd_error;
-	}
-
-	return list_objd;
-
-objd_error:
-	return ret;
-}
-#endif //0
-
 static
 long lttng_abi_tracer_version(int objd,
 	struct lttng_ust_tracer_version *v)
@@ -314,8 +298,7 @@ long lttng_cmd(int objd, unsigned int cmd, unsigned long arg)
 		return lttng_abi_tracer_version(objd,
 				(struct lttng_ust_tracer_version *) arg);
 	case LTTNG_UST_TRACEPOINT_LIST:
-		return -ENOSYS;	//TODO
-		//return lttng_abi_tracepoint_list();
+		return lttng_abi_tracepoint_list();
 	case LTTNG_UST_WAIT_QUIESCENT:
 		synchronize_trace();
 		return 0;
@@ -370,6 +353,7 @@ int lttng_abi_create_channel(int session_objd,
 	struct ltt_channel *chan;
 	int chan_objd;
 	int ret = 0;
+	struct ltt_channel chan_priv_init;
 
 	chan_objd = objd_alloc(NULL, &lttng_channel_ops);
 	if (chan_objd < 0) {
@@ -397,6 +381,10 @@ int lttng_abi_create_channel(int session_objd,
 		transport_name = "<unknown>";
 		break;
 	}
+	memset(&chan_priv_init, 0, sizeof(chan_priv_init));
+	/* Copy of session UUID for consumer (availability through shm) */
+	memcpy(chan_priv_init.uuid, session->uuid, sizeof(session->uuid));
+	
 	/*
 	 * We tolerate no failure path after channel creation. It will stay
 	 * invariant for the rest of the session.
@@ -408,7 +396,8 @@ int lttng_abi_create_channel(int session_objd,
 				  chan_param->read_timer_interval,
 				  &chan_param->shm_fd,
 				  &chan_param->wait_fd,
-				  &chan_param->memory_map_size);
+				  &chan_param->memory_map_size,
+				  &chan_priv_init);
 	if (!chan) {
 		ret = -EINVAL;
 		goto chan_error;
@@ -421,8 +410,6 @@ int lttng_abi_create_channel(int session_objd,
 	}
 	/* The channel created holds a reference on the session */
 	objd_ref(session_objd);
-	/* Copy of session UUID for consumer (availability through shm) */
-	memcpy(chan->uuid, session->uuid, sizeof(session->uuid));
 
 	return chan_objd;
 
@@ -507,6 +494,95 @@ static const struct lttng_ust_objd_ops lttng_session_ops = {
 	.cmd = lttng_session_cmd,
 };
 
+/*
+ * beware: we don't keep the mutex over the send, but we must walk the
+ * whole list each time we are called again. So sending one tracepoint
+ * at a time means this is O(n^2). TODO: do as in the kernel and send
+ * multiple tracepoints for each call to amortize this cost.
+ */
+static
+void ltt_tracepoint_list_get(struct ltt_tracepoint_list *list,
+		char *tp_list_entry)
+{
+	if (!list->got_first) {
+		tracepoint_iter_start(&list->iter);
+		list->got_first = 1;
+		goto copy;
+	}
+	tracepoint_iter_next(&list->iter);
+copy:
+	if (!list->iter.tracepoint) {
+		tp_list_entry[0] = '\0';	/* end of list */
+	} else {
+		memcpy(tp_list_entry, (*list->iter.tracepoint)->name,
+			LTTNG_UST_SYM_NAME_LEN);
+	}
+}
+
+static
+long lttng_tracepoint_list_cmd(int objd, unsigned int cmd, unsigned long arg)
+{
+	struct ltt_tracepoint_list *list = objd_private(objd);
+
+	switch (cmd) {
+	case LTTNG_UST_TRACEPOINT_LIST_GET:
+		ltt_tracepoint_list_get(list, (char *) arg);
+		return 0;
+	default:
+		return -EINVAL;
+	}
+}
+
+static
+int lttng_abi_tracepoint_list(void)
+{
+	int list_objd, ret;
+	struct ltt_tracepoint_list *list;
+
+	list_objd = objd_alloc(NULL, &lttng_tracepoint_list_ops);
+	if (list_objd < 0) {
+		ret = list_objd;
+		goto objd_error;
+	}
+	list = zmalloc(sizeof(*list));
+	if (!list) {
+		ret = -ENOMEM;
+		goto alloc_error;
+	}
+	objd_set_private(list_objd, list);
+
+	return list_objd;
+
+alloc_error:
+	{
+		int err;
+
+		err = lttng_ust_objd_unref(list_objd);
+		assert(!err);
+	}
+objd_error:
+	return ret;
+}
+
+static
+int lttng_release_tracepoint_list(int objd)
+{
+	struct ltt_tracepoint_list *list = objd_private(objd);
+
+	if (list) {
+		tracepoint_iter_stop(&list->iter);
+		free(list);
+		return 0;
+	} else {
+		return -EINVAL;
+	}
+}
+
+static const struct lttng_ust_objd_ops lttng_tracepoint_list_ops = {
+	.release = lttng_release_tracepoint_list,
+	.cmd = lttng_tracepoint_list_cmd,
+};
+
 struct stream_priv_data {
 	struct lttng_ust_lib_ring_buffer *buf;
 	struct ltt_channel *ltt_chan;