Rename struct lttng_event_common to struct lttng_ust_event_common

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

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 4cc4e1e431f9442fc8625d15a3c25a614c69d33f..18102c1df504dfb07e9cea10bc0009322279689a 100644 (file)
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -351,7 +351,7 @@ struct lttng_bytecode_runtime {
 
 struct lttng_ust_event_common_private;
 
-struct lttng_event_common {
+struct lttng_ust_event_common {
        uint32_t struct_size;                           /* Size of this structure. */
        struct lttng_ust_event_common_private *priv;    /* Private event interface */
 
@@ -365,7 +365,7 @@ struct lttng_ust_event_recorder_private;
 
 struct lttng_ust_event_recorder {
        uint32_t struct_size;                           /* Size of this structure. */
-       struct lttng_event_common *parent;
+       struct lttng_ust_event_common *parent;
        struct lttng_ust_event_recorder_private *priv;  /* Private event record interface */
 
        unsigned int id;

diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c
index 0971f9eb2a7cb0bb03d72d2006a983cced5af7a2..cf6f4dad897cb86a413bb5bb6dbdb03ebfef8e61 100644 (file)
--- a/liblttng-ust/lttng-events.c
+++ b/liblttng-ust/lttng-events.c
@@ -774,12 +774,12 @@ int lttng_event_recorder_create(const struct lttng_event_desc *desc,
        }
        event_recorder->struct_size = sizeof(struct lttng_ust_event_recorder);
 
-       event_recorder->parent = zmalloc(sizeof(struct lttng_event_common));
+       event_recorder->parent = zmalloc(sizeof(struct lttng_ust_event_common));
        if (!event_recorder->parent) {
                ret = -ENOMEM;
                goto parent_error;
        }
-       event_recorder->parent->struct_size = sizeof(struct lttng_event_common);
+       event_recorder->parent->struct_size = sizeof(struct lttng_ust_event_common);
 
        event_recorder_priv = zmalloc(sizeof(struct lttng_ust_event_recorder_private));
        if (!event_recorder_priv) {

diff --git a/liblttng-ust/ust-events-internal.h b/liblttng-ust/ust-events-internal.h
index 45c581b178607c67bacebbcf770af7b4facfe355..f574be60c1317d5b631d6d30b175a3290a219da3 100644 (file)
--- a/liblttng-ust/ust-events-internal.h
+++ b/liblttng-ust/ust-events-internal.h
@@ -166,7 +166,7 @@ struct lttng_counter_transport {
 };
 
 struct lttng_ust_event_common_private {
-       struct lttng_event_common *pub; /* Public event interface */
+       struct lttng_ust_event_common *pub;     /* Public event interface */
 
        const struct lttng_event_desc *desc;
        /* Backward references: list of lttng_enabler_ref (ref to enablers) */