X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-ctl%2Fustctl.c;h=f7e13a1a06e8618823899e8a49286278d8f4ce5a;hb=ef9ff354212ff4b038e1a5b6a7ed0ffe1b949663;hp=e285a2d24b7debc2159b760981c044e4663b7d24;hpb=44c72f10aa3cace72ffe40a0f9bb7aadb9c82dc8;p=lttng-ust.git

diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c
index e285a2d2..f7e13a1a 100644
--- a/liblttng-ust-ctl/ustctl.c
+++ b/liblttng-ust-ctl/ustctl.c
@@ -40,28 +40,44 @@ 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)
+int ustctl_release_handle(int sock, int handle)
 {
 	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);
 	if (sock >= 0) {
 		memset(&lum, 0, sizeof(lum));
-		lum.handle = data->handle;
+		lum.handle = handle;
 		lum.cmd = LTTNG_UST_RELEASE;
 		ret = ustcomm_send_app_cmd(sock, &lum, &lur);
-		assert(!ret);
+		if (ret < 0) {
+			return ret;
+		}
+	}
+	return 0;
+}
+/*
+ * 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)
+{
+	int ret;
+
+	if (data->shm_fd >= 0) {
+		ret = close(data->shm_fd);
+		if (ret < 0) {
+			return ret;
+		}
 	}
-	free(data);
+	if (data->wait_fd >= 0) {
+		ret = close(data->wait_fd);
+		if (ret < 0) {
+			return ret;
+		}
+	}
+	return ustctl_release_handle(sock, data->handle);
 }
 
 /*
@@ -161,7 +177,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;
 }
 
@@ -214,7 +231,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;
 }
 
@@ -265,7 +283,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;
 }
 
@@ -395,7 +414,7 @@ int ustctl_tracepoint_list(int sock)
 }
 
 int ustctl_tracepoint_list_get(int sock, int tp_list_handle,
-		char iter[LTTNG_UST_SYM_NAME_LEN])
+		struct lttng_ust_tracepoint_iter *iter)
 {
 	struct ustcomm_ust_msg lum;
 	struct ustcomm_ust_reply lur;
@@ -407,8 +426,11 @@ int ustctl_tracepoint_list_get(int sock, int tp_list_handle,
 	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);
+	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;
 }
 
@@ -450,6 +472,22 @@ int ustctl_calibrate(int sock, struct lttng_ust_calibrate *calibrate)
 	return -ENOSYS;
 }
 
+int ustctl_sock_flush_buffer(int sock, struct lttng_ust_object_data *object)
+{
+	struct ustcomm_ust_msg lum;
+	struct ustcomm_ust_reply lur;
+	int ret;
+
+	memset(&lum, 0, sizeof(lum));
+	lum.handle = object->handle;
+	lum.cmd = LTTNG_UST_FLUSH_BUFFER;
+	ret = ustcomm_send_app_cmd(sock, &lum, &lur);
+	if (ret)
+		return ret;
+	DBG("flushed buffer handle %u", object->handle);
+	return 0;
+}
+
 /* Buffer operations */
 
 /* Map channel shm into process memory */
@@ -562,8 +600,8 @@ struct lttng_ust_lib_ring_buffer *ustctl_open_stream_read(struct lttng_ust_shm_h
 	int cpu)
 {
 	struct channel *chan = handle->shadow_chan;
-	int shm_fd, wait_fd;
-	uint64_t memory_map_size;
+	int *shm_fd, *wait_fd;
+	uint64_t *memory_map_size;
 	struct lttng_ust_lib_ring_buffer *buf;
 	int ret;