Refactoring: struct lttng_enum_desc and lttng_enum_entry

[lttng-ust.git] / include / ust-comm.h

diff --git a/include/ust-comm.h b/include/ust-comm.h
index 27743b2d8bf35ec39d12bb3cdaa2c85b65553b7b..aaf7c6ef76e7e0f51cbc2b798b2cee1276f5690f 100644 (file)
--- a/include/ust-comm.h
+++ b/include/ust-comm.h
@@ -42,9 +42,9 @@
 #define LTTNG_UST_COMM_MAX_LISTEN                      10
 #define LTTNG_UST_COMM_REG_MSG_PADDING                 64
 
-struct lttng_event_field;
+struct lttng_ust_event_field;
 struct lttng_ctx_field;
-struct lttng_enum_entry;
+struct lttng_ust_enum_entry;
 struct lttng_integer_type;
 struct lttng_session;
 
@@ -77,12 +77,12 @@ struct ustcomm_ust_msg {
        uint32_t cmd;
        char padding[USTCOMM_MSG_PADDING1];
        union {
-               struct lttng_ust_channel channel;
-               struct lttng_ust_stream stream;
-               struct lttng_ust_event event;
-               struct lttng_ust_context context;
-               struct lttng_ust_tracer_version version;
-               struct lttng_ust_tracepoint_iter tracepoint;
+               struct lttng_ust_abi_channel channel;
+               struct lttng_ust_abi_stream stream;
+               struct lttng_ust_abi_event event;
+               struct lttng_ust_abi_context context;
+               struct lttng_ust_abi_tracer_version version;
+               struct lttng_ust_abi_tracepoint_iter tracepoint;
                struct {
                        uint32_t data_size;     /* following filter data */
                        uint32_t reloc_offset;
@@ -96,16 +96,16 @@ struct ustcomm_ust_msg {
                        uint32_t reloc_offset;
                        uint64_t seqnum;
                } LTTNG_PACKED capture;
-               struct lttng_ust_counter counter;
-               struct lttng_ust_counter_global counter_global;
-               struct lttng_ust_counter_cpu counter_cpu;
+               struct lttng_ust_abi_counter counter;
+               struct lttng_ust_abi_counter_global counter_global;
+               struct lttng_ust_abi_counter_cpu counter_cpu;
                /*
-                * For LTTNG_UST_EVENT_NOTIFIER_CREATE, a struct
-                * lttng_ust_event_notifier implicitly follows struct
+                * For lttng_ust_abi_EVENT_NOTIFIER_CREATE, a struct
+                * lttng_ust_abi_event_notifier implicitly follows struct
                 * ustcomm_ust_msg.
                 */
                struct {
-                       /* Length of struct lttng_ust_event_notifier */
+                       /* Length of struct lttng_ust_abi_event_notifier */
                        uint32_t len;
                } event_notifier;
                char padding[USTCOMM_MSG_PADDING2];
@@ -131,8 +131,8 @@ struct ustcomm_ust_reply {
                struct {
                        uint64_t memory_map_size;
                } LTTNG_PACKED stream;
-               struct lttng_ust_tracer_version version;
-               struct lttng_ust_tracepoint_iter tracepoint;
+               struct lttng_ust_abi_tracer_version version;
+               struct lttng_ust_abi_tracepoint_iter tracepoint;
                char padding[USTCOMM_REPLY_PADDING2];
        } u;
 } LTTNG_PACKED;
@@ -145,7 +145,7 @@ struct ustcomm_notify_hdr {
 struct ustcomm_notify_event_msg {
        uint32_t session_objd;
        uint32_t channel_objd;
-       char event_name[LTTNG_UST_SYM_NAME_LEN];
+       char event_name[LTTNG_UST_ABI_SYM_NAME_LEN];
        int32_t loglevel;
        uint32_t signature_len;
        uint32_t fields_len;
@@ -164,7 +164,7 @@ struct ustcomm_notify_event_reply {
 #define USTCOMM_NOTIFY_ENUM_MSG_PADDING                32
 struct ustcomm_notify_enum_msg {
        uint32_t session_objd;
-       char enum_name[LTTNG_UST_SYM_NAME_LEN];
+       char enum_name[LTTNG_UST_ABI_SYM_NAME_LEN];
        uint32_t entries_len;
        char padding[USTCOMM_NOTIFY_ENUM_MSG_PADDING];
        /* followed by enum entries */
@@ -279,7 +279,7 @@ int ustcomm_register_event(int sock,
        int loglevel,
        const char *signature,          /* event signature (input) */
        size_t nr_fields,               /* fields */
-       const struct lttng_event_field *fields,
+       const struct lttng_ust_event_field **fields,
        const char *model_emf_uri,
        uint32_t *id);                  /* event id (output) */
 
@@ -292,7 +292,7 @@ int ustcomm_register_enum(int sock,
        int session_objd,               /* session descriptor */
        const char *enum_name,          /* enum name (input) */
        size_t nr_entries,              /* entries */
-       const struct lttng_enum_entry *entries,
+       const struct lttng_ust_enum_entry **entries,
        uint64_t *id);                  /* enum id (output) */
 
 /*