tracepoint probe refactoring: Move provider name to provider descriptor

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

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 8568d4bd2723abef749d1a6433b0d87472b9a00d..1f55c00a3758dc4b4cbff8005e3abb17654ebffd 100644 (file)
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -258,7 +258,8 @@ struct lttng_ust_event_field {
 struct lttng_ust_event_desc {
        uint32_t struct_size;                   /* Size of this structure. */
 
-       const char *name;
+       const char *event_name;
+       struct lttng_ust_probe_desc *probe_desc;
        void (*probe_callback)(void);
        struct lttng_event_ctx *ctx;            /* context */
        struct lttng_ust_event_field **fields;  /* event payload */
@@ -282,7 +283,7 @@ struct lttng_ust_event_desc {
 struct lttng_ust_probe_desc {
        uint32_t struct_size;                   /* Size of this structure. */
 
-       const char *provider;
+       const char *provider_name;
        struct lttng_ust_event_desc **event_desc;
        unsigned int nr_events;
        struct cds_list_head head;              /* chain registered probes */
@@ -428,7 +429,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 +440,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);
@@ -451,7 +452,7 @@ struct lttng_ust_channel_ops {
                        const void *src, size_t len);
        void (*event_strcpy)(struct lttng_ust_lib_ring_buffer_ctx *ctx,
                        const char *src, size_t len);
-       void (*event_strcpy_pad)(struct lttng_ust_lib_ring_buffer_ctx *ctx,
+       void (*event_pstrcpy_pad)(struct lttng_ust_lib_ring_buffer_ctx *ctx,
                        const char *src, size_t len);
 
        /* End of base ABI. Fields below should be used after checking struct_size. */
@@ -503,9 +504,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_lib_ring_buffer_channel *chan; /* Channel buffers */
-       struct lttng_ust_shm_handle *handle;            /* shared-memory handle */
+       struct lttng_ust_channel_buffer_ops *ops;
 
        /* End of base ABI. Fields below should be used after checking struct_size. */
 };