X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-ctl%2Fustctl.c;h=b612d2ce6e5819c4160bd4022cd20c366c082e4d;hb=3431ca3eea9bfaab6ced44922beb9e6bb7a2abc1;hp=b4234effc01212bb43f4150716429364a4f340e4;hpb=7a7849896a95db678d916ccb7c5d91371828e3f8;p=lttng-ust.git

diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c
index b4234eff..b612d2ce 100644
--- a/liblttng-ust-ctl/ustctl.c
+++ b/liblttng-ust-ctl/ustctl.c
@@ -20,11 +20,12 @@
 #include <string.h>
 #include <lttng/ust-ctl.h>
 #include <lttng/ust-abi.h>
-#include <lttng/usterr-signal-safe.h>
-#include <lttng/ust-comm.h>
 #include <lttng/ust-events.h>
 #include <sys/mman.h>
 
+#include <usterr-signal-safe.h>
+#include <ust-comm.h>
+
 #include "../libringbuffer/backend.h"
 #include "../libringbuffer/frontend.h"
 
@@ -39,22 +40,38 @@ void init_object(struct lttng_ust_object_data *data)
 	data->memory_map_size = 0;
 }
 
-void ustctl_release_object(int sock, struct lttng_ust_object_data *data)
+/*
+ * If sock is negative, it means we don't have to notify the other side
+ * (e.g. application has already vanished).
+ */
+int ustctl_release_object(int sock, struct lttng_ust_object_data *data)
 {
 	struct ustcomm_ust_msg lum;
 	struct ustcomm_ust_reply lur;
 	int ret;
 
-	if (data->shm_fd >= 0)
-		close(data->shm_fd);
-	if (data->wait_fd >= 0)
-		close(data->wait_fd);
-	memset(&lum, 0, sizeof(lum));
-	lum.handle = data->handle;
-	lum.cmd = LTTNG_UST_RELEASE;
-	ret = ustcomm_send_app_cmd(sock, &lum, &lur);
-	assert(!ret);
-	free(data);
+	if (data->shm_fd >= 0) {
+		ret = close(data->shm_fd);
+		if (ret < 0) {
+			return ret;
+		}
+	}
+	if (data->wait_fd >= 0) {
+		ret = close(data->wait_fd);
+		if (ret < 0) {
+			return ret;
+		}
+	}
+	if (sock >= 0) {
+		memset(&lum, 0, sizeof(lum));
+		lum.handle = data->handle;
+		lum.cmd = LTTNG_UST_RELEASE;
+		ret = ustcomm_send_app_cmd(sock, &lum, &lur);
+		if (ret < 0) {
+			return ret;
+		}
+	}
+	return 0;
 }
 
 /*
@@ -154,7 +171,8 @@ int ustctl_open_metadata(int sock, int session_handle,
 	return 0;
 
 error:
-	ustctl_release_object(sock, metadata_data);
+	(void) ustctl_release_object(sock, metadata_data);
+	free(metadata_data);
 	return -EINVAL;
 }
 
@@ -207,7 +225,8 @@ int ustctl_create_channel(int sock, int session_handle,
 	return 0;
 
 error:
-	ustctl_release_object(sock, channel_data);
+	(void) ustctl_release_object(sock, channel_data);
+	free(channel_data);
 	return -EINVAL;
 }
 
@@ -258,7 +277,8 @@ int ustctl_create_stream(int sock, struct lttng_ust_object_data *channel_data,
 	return ret;
 
 error:
-	ustctl_release_object(sock, stream_data);
+	(void) ustctl_release_object(sock, stream_data);
+	free(stream_data);
 	return -EINVAL;
 }
 
@@ -370,10 +390,42 @@ int ustctl_stop_session(int sock, int handle)
 	return ustctl_disable(sock, &obj);
 }
 
-
 int ustctl_tracepoint_list(int sock)
 {
-	return -ENOSYS;	/* not implemented */
+	struct ustcomm_ust_msg lum;
+	struct ustcomm_ust_reply lur;
+	int ret, tp_list_handle;
+
+	memset(&lum, 0, sizeof(lum));
+	lum.handle = LTTNG_UST_ROOT_HANDLE;
+	lum.cmd = LTTNG_UST_TRACEPOINT_LIST;
+	ret = ustcomm_send_app_cmd(sock, &lum, &lur);
+	if (ret)
+		return ret;
+	tp_list_handle = lur.ret_val;
+	DBG("received tracepoint list handle %u", tp_list_handle);
+	return tp_list_handle;
+}
+
+int ustctl_tracepoint_list_get(int sock, int tp_list_handle,
+		struct lttng_ust_tracepoint_iter *iter)
+{
+	struct ustcomm_ust_msg lum;
+	struct ustcomm_ust_reply lur;
+	int ret;
+
+	memset(&lum, 0, sizeof(lum));
+	lum.handle = tp_list_handle;
+	lum.cmd = LTTNG_UST_TRACEPOINT_LIST_GET;
+	ret = ustcomm_send_app_cmd(sock, &lum, &lur);
+	if (ret)
+		return ret;
+	DBG("received tracepoint list entry name %s loglevel %s loglevel_value %lld",
+		lur.u.tracepoint.name,
+		lur.u.tracepoint.loglevel,
+		(unsigned long long) lur.u.tracepoint.loglevel_value);
+	memcpy(iter, &lur.u.tracepoint, sizeof(*iter));
+	return 0;
 }
 
 int ustctl_tracer_version(int sock, struct lttng_ust_tracer_version *v)