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

diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c
index b4234eff..ed814b29 100644
--- a/liblttng-ust-ctl/ustctl.c
+++ b/liblttng-ust-ctl/ustctl.c
@@ -39,6 +39,10 @@ void init_object(struct lttng_ust_object_data *data)
 	data->memory_map_size = 0;
 }
 
+/*
+ * If sock is negative, it means we don't have to notify the other side
+ * (e.g. application has already vanished).
+ */
 void ustctl_release_object(int sock, struct lttng_ust_object_data *data)
 {
 	struct ustcomm_ust_msg lum;
@@ -49,11 +53,13 @@ void ustctl_release_object(int sock, struct lttng_ust_object_data *data)
 		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);
+	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);
+		assert(!ret);
+	}
 	free(data);
 }
 
@@ -370,10 +376,39 @@ 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,
+		char iter[LTTNG_UST_SYM_NAME_LEN])
+{
+	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 %s", lur.u.tracepoint_list_entry);
+	memcpy(iter, lur.u.tracepoint_list_entry, LTTNG_UST_SYM_NAME_LEN);
+	return 0;
 }
 
 int ustctl_tracer_version(int sock, struct lttng_ust_tracer_version *v)