Add context to both channel and event

[lttng-ust.git] / include / ust / lttng-ust-ctl.h

diff --git a/include/ust/lttng-ust-ctl.h b/include/ust/lttng-ust-ctl.h
index 52c954aa64e3faad8a6d92dfa17c9c6fd2cc923a..99478b946cd4276cd4b9f7b5006569b5344a7f1f 100644 (file)
--- a/include/ust/lttng-ust-ctl.h
+++ b/include/ust/lttng-ust-ctl.h
@@ -41,6 +41,7 @@ struct object_data {
        uint64_t memory_map_size;
 };
 
+int ustctl_register_done(int sock);
 int ustctl_create_session(int sock);
 int ustctl_open_metadata(int sock, int session_handle,
                struct lttng_ust_channel_attr *chops,
@@ -54,24 +55,25 @@ int ustctl_create_event(int sock, struct lttng_ust_event *ev,
                struct object_data *channel_data,
                struct object_data **event_data);
 int ustctl_add_context(int sock, struct lttng_ust_context *ctx,
-               struct object_data *channel_data,
+               struct object_data *obj_data,
                struct object_data **context_data);
 
 int ustctl_enable(int sock, struct object_data *object);
 int ustctl_disable(int sock, struct object_data *object);
-int ustctl_start_session(int sock, struct object_data *object);
-int ustctl_stop_session(int sock, struct 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 */
 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 object_data *channel_data);
+
 /* not implemented yet */
 struct lttng_ust_calibrate;
 int ustctl_calibrate(int sock, struct lttng_ust_calibrate *calibrate);
 
-/* TODO: object_data send/recv between sessiond and consumer */
-
 /*
  * Map channel shm_handle and add streams. Typically performed by the
  * consumer to map the objects into its memory space.
@@ -90,6 +92,9 @@ void ustctl_unmap_channel(struct shm_handle *shm_handle);
 struct shm_handle;
 struct lib_ring_buffer;
 
+void *ustctl_get_mmap_base(struct shm_handle *handle,
+               struct lib_ring_buffer *buf);
+
 /* Open/close stream buffers for read */
 struct lib_ring_buffer *ustctl_open_stream_read(struct shm_handle *handle,
                int cpu);
@@ -108,6 +113,8 @@ int ustctl_get_max_subbuf_size(struct shm_handle *handle,
  * For mmap mode, operate on the current packet (between get/put or
  * get_next/put_next).
  */
+void *ustctl_get_mmap_base(struct shm_handle *handle,
+               struct lib_ring_buffer *buf);
 int ustctl_get_mmap_read_offset(struct shm_handle *handle,
                struct lib_ring_buffer *buf, unsigned long *off);
 int ustctl_get_subbuf_size(struct shm_handle *handle,