Move context types to private header

This is an API change but the major SONAME bump to '1' gives us the
opportunity to hide symbols that should have been private from the
start.

Change-Id: Iad136e690b420e497b6b8d39155608278f537f7b
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 809c056d660662b5ac537e6798811a85c939e940..de7d322a5a6d36b1206a9b236b4ef3b29cd50b65 100644 (file)
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -246,59 +246,6 @@ struct lttng_ust_event_field {
        /* End of base ABI. Fields below should be used after checking struct_size. */
 };
 
-enum lttng_ust_dynamic_type {
-       LTTNG_UST_DYNAMIC_TYPE_NONE,
-       LTTNG_UST_DYNAMIC_TYPE_S8,
-       LTTNG_UST_DYNAMIC_TYPE_S16,
-       LTTNG_UST_DYNAMIC_TYPE_S32,
-       LTTNG_UST_DYNAMIC_TYPE_S64,
-       LTTNG_UST_DYNAMIC_TYPE_U8,
-       LTTNG_UST_DYNAMIC_TYPE_U16,
-       LTTNG_UST_DYNAMIC_TYPE_U32,
-       LTTNG_UST_DYNAMIC_TYPE_U64,
-       LTTNG_UST_DYNAMIC_TYPE_FLOAT,
-       LTTNG_UST_DYNAMIC_TYPE_DOUBLE,
-       LTTNG_UST_DYNAMIC_TYPE_STRING,
-       _NR_LTTNG_UST_DYNAMIC_TYPES,
-};
-
-struct lttng_ctx_value {
-       enum lttng_ust_dynamic_type sel;
-       union {
-               int64_t s64;
-               uint64_t u64;
-               const char *str;
-               double d;
-       } u;
-};
-
-struct lttng_perf_counter_field;
-
-#define LTTNG_UST_CTX_FIELD_PADDING    40
-struct lttng_ctx_field {
-       struct lttng_ust_event_field event_field;
-       size_t (*get_size)(struct lttng_ctx_field *field, size_t offset);
-       void (*record)(struct lttng_ctx_field *field,
-                      struct lttng_ust_lib_ring_buffer_ctx *ctx,
-                      struct lttng_channel *chan);
-       void (*get_value)(struct lttng_ctx_field *field,
-                        struct lttng_ctx_value *value);
-       union {
-               struct lttng_perf_counter_field *perf_counter;
-               char padding[LTTNG_UST_CTX_FIELD_PADDING];
-       } u;
-       void (*destroy)(struct lttng_ctx_field *field);
-       char *field_name;       /* Has ownership, dynamically allocated. */
-};
-
-#define LTTNG_UST_CTX_PADDING  20
-struct lttng_ctx {
-       struct lttng_ctx_field *fields;
-       unsigned int nr_fields;
-       unsigned int allocated_fields;
-       unsigned int largest_align;
-       char padding[LTTNG_UST_CTX_PADDING];
-};
 
 /*
  * IMPORTANT: this structure is part of the ABI between the probe and
@@ -396,6 +343,7 @@ struct lttng_ust_bytecode_runtime {
  * removed.
  */
 
+struct lttng_ctx;
 struct lttng_ust_event_common_private;
 
 enum lttng_ust_event_type {

diff --git a/include/ust-context-provider.h b/include/ust-context-provider.h
index cd845583b90484dfbfa818424d6e4c94a8e535d6..670c38633b18120d746382610053c9c26af90462 100644 (file)
--- a/include/ust-context-provider.h
+++ b/include/ust-context-provider.h
@@ -15,6 +15,46 @@
 #include <lttng/ust-events.h>
 #include <urcu/hlist.h>
 
+#include "ust-dynamic-type.h"
+
+struct lttng_ctx_value {
+       enum lttng_ust_dynamic_type sel;
+       union {
+               int64_t s64;
+               uint64_t u64;
+               const char *str;
+               double d;
+       } u;
+};
+
+struct lttng_perf_counter_field;
+
+#define LTTNG_UST_CTX_FIELD_PADDING    40
+struct lttng_ctx_field {
+       struct lttng_ust_event_field event_field;
+       size_t (*get_size)(struct lttng_ctx_field *field, size_t offset);
+       void (*record)(struct lttng_ctx_field *field,
+                      struct lttng_ust_lib_ring_buffer_ctx *ctx,
+                      struct lttng_channel *chan);
+       void (*get_value)(struct lttng_ctx_field *field,
+                        struct lttng_ctx_value *value);
+       union {
+               struct lttng_perf_counter_field *perf_counter;
+               char padding[LTTNG_UST_CTX_FIELD_PADDING];
+       } u;
+       void (*destroy)(struct lttng_ctx_field *field);
+       char *field_name;       /* Has ownership, dynamically allocated. */
+};
+
+#define LTTNG_UST_CTX_PADDING  20
+struct lttng_ctx {
+       struct lttng_ctx_field *fields;
+       unsigned int nr_fields;
+       unsigned int allocated_fields;
+       unsigned int largest_align;
+       char padding[LTTNG_UST_CTX_PADDING];
+};
+
 struct lttng_ust_context_provider {
        char *name;
        size_t (*get_size)(struct lttng_ctx_field *field, size_t offset);

diff --git a/include/ust-dynamic-type.h b/include/ust-dynamic-type.h
index 7a6b1b15290b04f643ca7a5af5e3c2e4dc3f4083..cb628ad8a9e90b7b9ddfc9a178800de5e0f6fe49 100644 (file)
--- a/include/ust-dynamic-type.h
+++ b/include/ust-dynamic-type.h
@@ -9,6 +9,22 @@
 
 #include <lttng/ust-events.h>
 
+enum lttng_ust_dynamic_type {
+       LTTNG_UST_DYNAMIC_TYPE_NONE,
+       LTTNG_UST_DYNAMIC_TYPE_S8,
+       LTTNG_UST_DYNAMIC_TYPE_S16,
+       LTTNG_UST_DYNAMIC_TYPE_S32,
+       LTTNG_UST_DYNAMIC_TYPE_S64,
+       LTTNG_UST_DYNAMIC_TYPE_U8,
+       LTTNG_UST_DYNAMIC_TYPE_U16,
+       LTTNG_UST_DYNAMIC_TYPE_U32,
+       LTTNG_UST_DYNAMIC_TYPE_U64,
+       LTTNG_UST_DYNAMIC_TYPE_FLOAT,
+       LTTNG_UST_DYNAMIC_TYPE_DOUBLE,
+       LTTNG_UST_DYNAMIC_TYPE_STRING,
+       _NR_LTTNG_UST_DYNAMIC_TYPES,
+};
+
 __attribute__((visibility("hidden")))
 int lttng_ust_dynamic_type_choices(size_t *nr_choices,
                const struct lttng_ust_event_field ***choices);

diff --git a/liblttng-ust/context-internal.h b/liblttng-ust/context-internal.h
index 2a3cb317b5312da8a9f1c63bd1764679c379bdfc..f31d8a245ab7941a6efce07c7e67b20ede9696bd 100644 (file)
--- a/liblttng-ust/context-internal.h
+++ b/liblttng-ust/context-internal.h
@@ -9,6 +9,7 @@
 
 #include <lttng/ust-events.h>
 #include "ust-events-internal.h"
+#include "ust-context-provider.h"
 
 __attribute__((visibility("hidden")))
 int lttng_context_init_all(struct lttng_ctx **ctx);

diff --git a/liblttng-ust/ust-events-internal.h b/liblttng-ust/ust-events-internal.h
index 51411defe98830c7b2ed0f32cd0c67257d873798..505db0b131bba830b9a55343719c7e4962798bde 100644 (file)
--- a/liblttng-ust/ust-events-internal.h
+++ b/liblttng-ust/ust-events-internal.h
@@ -14,6 +14,7 @@
 
 #include <lttng/ust-events.h>
 
+#include "ust-context-provider.h"
 
 struct lttng_ust_abi_obj;