Update flush buffer: allow consumer to do it directly

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

diff --git a/include/lttng/ust-ctl.h b/include/lttng/ust-ctl.h
index fc6671d4a15da637b14380299363780f19f00f5a..9d0d35c8e32f2a3bd4ad0ad6008d7486b39cbd47 100644 (file)
--- a/include/lttng/ust-ctl.h
+++ b/include/lttng/ust-ctl.h
@@ -48,9 +48,6 @@ 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 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 +114,10 @@ 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);
 
+int ustctl_flush_buffer(struct lttng_ust_shm_handle *handle,
+               struct lttng_ust_lib_ring_buffer *buf);
+
 /* 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 */

diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c
index 6f3d1ed97c6c983b52a631ab95cbdc358cfd0497..886e8485bc8cf683736b52b788d04e9cfdc0f1cf 100644 (file)
--- a/liblttng-ust-ctl/ustctl.c
+++ b/liblttng-ust-ctl/ustctl.c
@@ -37,7 +37,7 @@ void init_object(struct lttng_ust_object_data *data)
        data->memory_map_size = 0;
 }
 
-void release_object(int sock, struct lttng_ust_object_data *data)
+void ustctl_release_object(int sock, struct lttng_ust_object_data *data)
 {
        struct ustcomm_ust_msg lum;
        struct ustcomm_ust_reply lur;
@@ -152,7 +152,7 @@ int ustctl_open_metadata(int sock, int session_handle,
        return 0;
 
 error:
-       release_object(sock, metadata_data);
+       ustctl_release_object(sock, metadata_data);
        return -EINVAL;
 }
 
@@ -205,7 +205,7 @@ int ustctl_create_channel(int sock, int session_handle,
        return 0;
 
 error:
-       release_object(sock, channel_data);
+       ustctl_release_object(sock, channel_data);
        return -EINVAL;
 }
 
@@ -256,7 +256,7 @@ int ustctl_create_stream(int sock, struct lttng_ust_object_data *channel_data,
        return ret;
 
 error:
-       release_object(sock, stream_data);
+       ustctl_release_object(sock, stream_data);
        return -EINVAL;
 }
 
@@ -407,17 +407,6 @@ int ustctl_wait_quiescent(int sock)
        return 0;
 }
 
-int ustctl_flush_buffer(int sock, struct lttng_ust_object_data *channel_data)
-{
-       struct ustcomm_ust_msg lum;
-       struct ustcomm_ust_reply lur;
-
-       memset(&lum, 0, sizeof(lum));
-       lum.handle = channel_data->handle;
-       lum.cmd = LTTNG_UST_FLUSH_BUFFER;
-       return ustcomm_send_app_cmd(sock, &lum, &lur);
-}
-
 int ustctl_calibrate(int sock, struct lttng_ust_calibrate *calibrate)
 {
        return -ENOSYS;
@@ -660,7 +649,7 @@ int ustctl_put_subbuf(struct lttng_ust_shm_handle *handle,
        return 0;
 }
 
-int ustctl_buffer_flush(struct lttng_ust_shm_handle *handle,
+int ustctl_flush_buffer(struct lttng_ust_shm_handle *handle,
                struct lttng_ust_lib_ring_buffer *buf)
 {
        lib_ring_buffer_switch_slow(buf, SWITCH_ACTIVE, handle);