From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 9 Nov 2011 15:37:41 +0000 (-0500)
Subject: Update ust-abi/ust-ctl header copies
X-Git-Tag: v2.0-pre15~141
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=8ec2d32a968ba72982a6f4a3a46813fad5c2f2dc

Update ust-abi/ust-ctl header copies

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/lttng-sessiond/lttng-ust-abi.h b/lttng-sessiond/lttng-ust-abi.h
index ced2929a2..90a0822f6 100644
--- a/lttng-sessiond/lttng-ust-abi.h
+++ b/lttng-sessiond/lttng-ust-abi.h
@@ -137,6 +137,9 @@ struct lttng_ust_object_data {
 #define LTTNG_UST_ENABLE			_UST_CMD(0x80)
 #define LTTNG_UST_DISABLE			_UST_CMD(0x81)
 
+/* Tracepoint list commands */
+#define LTTNG_UST_TRACEPOINT_LIST_GET		_UST_CMD(0x90)
+
 #define LTTNG_UST_ROOT_HANDLE	0
 
 struct lttng_ust_obj;
diff --git a/lttng-sessiond/lttng-ust-ctl.h b/lttng-sessiond/lttng-ust-ctl.h
index 225237a6c..114cc73c5 100644
--- a/lttng-sessiond/lttng-ust-ctl.h
+++ b/lttng-sessiond/lttng-ust-ctl.h
@@ -44,13 +44,21 @@ int ustctl_disable(int sock, struct lttng_ust_object_data *object);
 int ustctl_start_session(int sock, int handle);
 int ustctl_stop_session(int sock, int handle);
 
-int ustctl_tracepoint_list(int sock);	/* not implemented yet */
+/*
+ * ustctl_tracepoint_list returns a tracepoint list handle, or negative
+ * error value.
+ */
+int ustctl_tracepoint_list(int sock);
+/*
+ * ustctl_tracepoint_list_get is used to iterate on the tp list
+ * handle. End is iteration is reached when -ENOENT is returned.
+ */
+int ustctl_tracepoint_list_get(int sock, int tp_list_handle,
+		char iter[LTTNG_UST_SYM_NAME_LEN]);
+
 int ustctl_tracer_version(int sock, struct lttng_ust_tracer_version *v);
 int ustctl_wait_quiescent(int sock);
 
-/* Flush each buffers in this channel */
-int ustctl_flush_buffer(int sock, struct lttng_ust_object_data *channel_data);
-
 /* not implemented yet */
 struct lttng_ust_calibrate;
 int ustctl_calibrate(int sock, struct lttng_ust_calibrate *calibrate);
@@ -117,7 +125,11 @@ int ustctl_get_subbuf(struct lttng_ust_shm_handle *handle,
 int ustctl_put_subbuf(struct lttng_ust_shm_handle *handle,
 		struct lttng_ust_lib_ring_buffer *buf);
 
+void ustctl_flush_buffer(struct lttng_ust_shm_handle *handle,
+		struct lttng_ust_lib_ring_buffer *buf,
+		int producer_active);
+
 /* Release object created by members of this API */
-void release_object(int sock, struct lttng_ust_object_data *data);
+void ustctl_release_object(int sock, struct lttng_ust_object_data *data);
 
 #endif /* _LTTNG_UST_CTL_H */