standardize on flush buffer (no plural)

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

diff --git a/include/ust/lttng-events.h b/include/ust/lttng-events.h
index 950604e4f620a243f0c9b227cb83216ca45e9d42..05140c5f903afbbceb2c94525a36fb320cec7a9b 100644 (file)
--- a/include/ust/lttng-events.h
+++ b/include/ust/lttng-events.h
@@ -235,7 +235,7 @@ struct ltt_channel_ops {
        //wait_queue_head_t *(*get_hp_wait_queue)(struct channel *chan);
        int (*is_finalized)(struct channel *chan);
        int (*is_disabled)(struct channel *chan);
-       int (*flush_buffers)(struct channel *chan, struct shm_handle *handle);
+       int (*flush_buffer)(struct channel *chan, struct shm_handle *handle);
 };
 
 struct ltt_channel {

diff --git a/include/ust/lttng-ust-abi.h b/include/ust/lttng-ust-abi.h
index 5eb131f8feae510410881964bab28d85dacf700a..da2bfb942a111844379bad1ff7d6b8b5eed55238 100644 (file)
--- a/include/ust/lttng-ust-abi.h
+++ b/include/ust/lttng-ust-abi.h
@@ -111,7 +111,7 @@ struct lttng_ust_context {
 /* Event and Channel FD commands */
 #define LTTNG_UST_CONTEXT                      \
        _UST_CMDW(0x70, struct lttng_ust_context)
-#define LTTNG_UST_FLUSH_BUFFERS                        \
+#define LTTNG_UST_FLUSH_BUFFER                 \
        _UST_CMD(0x71)
 
 /* Event, Channel and Session commands */

diff --git a/include/ust/lttng-ust-ctl.h b/include/ust/lttng-ust-ctl.h
index 0a0feae99c2906a062c553d8dd61fc0a6a4a3edf..681849041ebe487b3c403b273d21fa2ceb6c9837 100644 (file)
--- a/include/ust/lttng-ust-ctl.h
+++ b/include/ust/lttng-ust-ctl.h
@@ -68,7 +68,7 @@ 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_buffers(int sock, struct object_data *channel_data);
+int ustctl_flush_buffer(int sock, struct object_data *channel_data);
 
 /* not implemented yet */
 struct lttng_ust_calibrate;

diff --git a/libust/ltt-ring-buffer-client.h b/libust/ltt-ring-buffer-client.h
index abe405d0f949068ef7a9d4385d697c9db939d401..6392739b50160aa4ff76efd9c70fa4a00f8666a7 100644 (file)
--- a/libust/ltt-ring-buffer-client.h
+++ b/libust/ltt-ring-buffer-client.h
@@ -504,7 +504,7 @@ int ltt_is_disabled(struct channel *chan)
 }
 
 static
-int ltt_flush_buffers(struct channel *chan, struct shm_handle *handle)
+int ltt_flush_buffer(struct channel *chan, struct shm_handle *handle)
 {
        struct lib_ring_buffer *buf;
        int cpu;
@@ -537,7 +537,7 @@ static struct ltt_transport ltt_relay_transport = {
                //.get_hp_wait_queue = ltt_get_hp_wait_queue,
                .is_finalized = ltt_is_finalized,
                .is_disabled = ltt_is_disabled,
-               .flush_buffers = ltt_flush_buffers,
+               .flush_buffer = ltt_flush_buffer,
        },
 };
 

diff --git a/libust/ltt-ring-buffer-metadata-client.h b/libust/ltt-ring-buffer-metadata-client.h
index 4415ab667657a2153faad17156d4ec6ec962f507..477d6b955b9b8de731d1628b0d2f49c3b823068b 100644 (file)
--- a/libust/ltt-ring-buffer-metadata-client.h
+++ b/libust/ltt-ring-buffer-metadata-client.h
@@ -270,7 +270,7 @@ int ltt_is_disabled(struct channel *chan)
 }
 
 static
-int ltt_flush_buffers(struct channel *chan, struct shm_handle *handle)
+int ltt_flush_buffer(struct channel *chan, struct shm_handle *handle)
 {
        struct lib_ring_buffer *buf;
        int shm_fd, wait_fd;
@@ -299,7 +299,7 @@ static struct ltt_transport ltt_relay_transport = {
                //.get_hp_wait_queue = ltt_get_hp_wait_queue,
                .is_finalized = ltt_is_finalized,
                .is_disabled = ltt_is_disabled,
-               .flush_buffers = ltt_flush_buffers,
+               .flush_buffer = ltt_flush_buffer,
        },
 };
 

diff --git a/libust/lttng-ust-abi.c b/libust/lttng-ust-abi.c
index 6848c938e09673369a1b0a6be46d22f61a0da6eb..c9623713dcd211a9ec6dfef5073e8d46b2acccb9 100644 (file)
--- a/libust/lttng-ust-abi.c
+++ b/libust/lttng-ust-abi.c
@@ -632,8 +632,8 @@ long lttng_channel_cmd(int objd, unsigned int cmd, unsigned long arg)
                return ltt_channel_enable(channel);
        case LTTNG_UST_DISABLE:
                return ltt_channel_disable(channel);
-       case LTTNG_UST_FLUSH_BUFFERS:
-               return channel->ops->flush_buffers(channel->chan, channel->handle);
+       case LTTNG_UST_FLUSH_BUFFER:
+               return channel->ops->flush_buffer(channel->chan, channel->handle);
        default:
                return -EINVAL;
        }
@@ -666,8 +666,8 @@ long lttng_metadata_cmd(int objd, unsigned int cmd, unsigned long arg)
                /* stream used as output */
                return lttng_abi_open_stream(objd, stream);
        }
-       case LTTNG_UST_FLUSH_BUFFERS:
-               return channel->ops->flush_buffers(channel->chan, channel->handle);
+       case LTTNG_UST_FLUSH_BUFFER:
+               return channel->ops->flush_buffer(channel->chan, channel->handle);
        default:
                return -EINVAL;
        }

diff --git a/libustctl/ustctl.c b/libustctl/ustctl.c
index 51826c13fb0f2e31acd334dbb972499081a187b1..50357645dd18ca0153c3025360a1ad0c2c137e1a 100644 (file)
--- a/libustctl/ustctl.c
+++ b/libustctl/ustctl.c
@@ -401,14 +401,14 @@ int ustctl_wait_quiescent(int sock)
        return 0;
 }
 
-int ustctl_flush_buffers(int sock, struct object_data *channel_data)
+int ustctl_flush_buffer(int sock, struct 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_BUFFERS;
+       lum.cmd = LTTNG_UST_FLUSH_BUFFER;
        return ustcomm_send_app_cmd(sock, &lum, &lur);
 }