#ifndef _LTTNG_UST_CTL_H
#define _LTTNG_UST_CTL_H
-#include <ust/lttng-ust-abi.h>
+#include "lttng-ust-abi.h"
int ustctl_register_done(int sock);
int ustctl_create_session(int sock);
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,
+ struct lttng_ust_tracepoint_iter *iter);
+
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);
+int ustctl_sock_flush_buffer(int sock, struct lttng_ust_object_data *object);
/* not implemented yet */
struct lttng_ust_calibrate;
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);
+int ustctl_release_object(int sock, struct lttng_ust_object_data *data);
#endif /* _LTTNG_UST_CTL_H */