Rename struct lttng_ust_channel_ops to struct lttng_ust_channel_buffer_ops

Likewise for private structure. This namespacing will allow smoother
integration of upcoming counter feature in the public API.

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

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 8568d4bd2723abef749d1a6433b0d87472b9a00d..ca3d19818b2bc6dd19134d950afc889dfa52395f 100644 (file)
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -428,7 +428,7 @@ struct lttng_ust_event_notifier {
 };
 
 struct lttng_ust_lib_ring_buffer_channel;
-struct lttng_ust_channel_ops_private;
+struct lttng_ust_channel_buffer_ops_private;
 
 /*
  * IMPORTANT: this structure is part of the ABI between the probe and
@@ -439,10 +439,10 @@ struct lttng_ust_channel_ops_private;
  * structure. It should be queried before using additional fields added
  * at the end of the structure.
  */
-struct lttng_ust_channel_ops {
+struct lttng_ust_channel_buffer_ops {
        uint32_t struct_size;
 
-       struct lttng_ust_channel_ops_private *priv;     /* Private channel ops interface */
+       struct lttng_ust_channel_buffer_ops_private *priv;      /* Private channel buffer ops interface */
 
        int (*event_reserve)(struct lttng_ust_lib_ring_buffer_ctx *ctx,
                             uint32_t event_id);
@@ -503,7 +503,7 @@ struct lttng_ust_channel_buffer {
        struct lttng_ust_channel_common *parent;        /* Inheritance by aggregation. */
        struct lttng_ust_channel_buffer_private *priv;  /* Private channel buffer interface */
 
-       struct lttng_ust_channel_ops *ops;
+       struct lttng_ust_channel_buffer_ops *ops;
        struct lttng_ust_lib_ring_buffer_channel *chan; /* Channel buffers */
        struct lttng_ust_shm_handle *handle;            /* shared-memory handle */
 

diff --git a/liblttng-ust/lttng-ring-buffer-client.h b/liblttng-ust/lttng-ring-buffer-client.h
index 32b812d5e08ccb9cddc8eec1290c6b53de9f7f3f..84457f0a04d97ee5c1e48873b3a1a07b45cc358c 100644 (file)
--- a/liblttng-ust/lttng-ring-buffer-client.h
+++ b/liblttng-ust/lttng-ring-buffer-client.h
@@ -819,8 +819,8 @@ int lttng_flush_buffer(struct lttng_ust_lib_ring_buffer_channel *chan,
 static struct lttng_transport lttng_relay_transport = {
        .name = "relay-" RING_BUFFER_MODE_TEMPLATE_STRING "-mmap",
        .ops = {
-               .struct_size = sizeof(struct lttng_ust_channel_ops),
-               .priv = __LTTNG_COMPOUND_LITERAL(struct lttng_ust_channel_ops_private, {
+               .struct_size = sizeof(struct lttng_ust_channel_buffer_ops),
+               .priv = __LTTNG_COMPOUND_LITERAL(struct lttng_ust_channel_buffer_ops_private, {
                        .pub = &lttng_relay_transport.ops,
                        .channel_create = _channel_create,
                        .channel_destroy = lttng_channel_destroy,

diff --git a/liblttng-ust/lttng-ring-buffer-metadata-client.h b/liblttng-ust/lttng-ring-buffer-metadata-client.h
index 8a5943972bbcc0e911047ae14fa740e2dae35262..40213e80dff33d7fd907aa1fadb463266938c49e 100644 (file)
--- a/liblttng-ust/lttng-ring-buffer-metadata-client.h
+++ b/liblttng-ust/lttng-ring-buffer-metadata-client.h
@@ -328,9 +328,9 @@ int lttng_flush_buffer(struct lttng_ust_lib_ring_buffer_channel *chan,
 static struct lttng_transport lttng_relay_transport = {
        .name = "relay-" RING_BUFFER_MODE_TEMPLATE_STRING "-mmap",
        .ops = {
-               .struct_size = sizeof(struct lttng_ust_channel_ops),
+               .struct_size = sizeof(struct lttng_ust_channel_buffer_ops),
 
-               .priv = __LTTNG_COMPOUND_LITERAL(struct lttng_ust_channel_ops_private, {
+               .priv = __LTTNG_COMPOUND_LITERAL(struct lttng_ust_channel_buffer_ops_private, {
                        .pub = &lttng_relay_transport.ops,
                        .channel_create = _channel_create,
                        .channel_destroy = lttng_channel_destroy,

diff --git a/liblttng-ust/ust-events-internal.h b/liblttng-ust/ust-events-internal.h
index f116c2e1a8f70cd3e11e861f97ddfb04932a9d2d..d0facc1e241ce18765a5796cd5e36d70fd741904 100644 (file)
--- a/liblttng-ust/ust-events-internal.h
+++ b/liblttng-ust/ust-events-internal.h
@@ -251,7 +251,7 @@ struct lttng_event_notifier_group {
 struct lttng_transport {
        char *name;
        struct cds_list_head node;
-       struct lttng_ust_channel_ops ops;
+       struct lttng_ust_channel_buffer_ops ops;
        const struct lttng_ust_lib_ring_buffer_config *client_config;
 };
 
@@ -347,8 +347,8 @@ struct lttng_enum {
 
 struct lttng_ust_shm_handle;
 
-struct lttng_ust_channel_ops_private {
-       struct lttng_ust_channel_ops *pub;      /* Public channels ops interface */
+struct lttng_ust_channel_buffer_ops_private {
+       struct lttng_ust_channel_buffer_ops *pub;       /* Public channel buffer ops interface */
 
        struct lttng_ust_channel_buffer *(*channel_create)(const char *name,
                        void *buf_addr,