From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Sun, 23 Oct 2011 23:37:30 +0000 (-0400)
Subject: standardize on flush buffer (no plural)
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=43d330a4708732a69334f8e1439f1d0c64770a50;p=ust.git

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 950604e..05140c5 100644
--- 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 5eb131f..da2bfb9 100644
--- 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 0a0feae..6818490 100644
--- 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 abe405d..6392739 100644
--- 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 4415ab6..477d6b9 100644
--- 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 6848c93..c962371 100644
--- 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 51826c1..5035764 100644
--- 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);
 }