Rename `enum lttng_enabler_type` to `_format_type`

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

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 3fee93c435038acf3150759aa7d5c964bd38e448..49d864d8a9f668be6b59e5b8e440a5b5c9479a17 100644 (file)
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -380,9 +380,9 @@ struct lttng_probe_desc {
 
 /* Data structures used by the tracer. */
 
-enum lttng_enabler_type {
-       LTTNG_ENABLER_STAR_GLOB,
-       LTTNG_ENABLER_EVENT,
+enum lttng_enabler_format_type {
+       LTTNG_ENABLER_FORMAT_STAR_GLOB,
+       LTTNG_ENABLER_FORMAT_EVENT,
 };
 
 /*
@@ -390,7 +390,7 @@ enum lttng_enabler_type {
  * backward reference.
  */
 struct lttng_enabler {
-       enum lttng_enabler_type type;
+       enum lttng_enabler_format_type format_type;
 
        /* head list of struct lttng_ust_filter_bytecode_node */
        struct cds_list_head filter_bytecode_head;
@@ -471,7 +471,11 @@ struct lttng_bytecode_runtime {
        uint64_t (*filter)(void *filter_data, const char *filter_stack_data);
        int link_failed;
        struct cds_list_head node;      /* list of bytecode runtime in event */
-       struct lttng_session *session;
+       /*
+        * Pointer to a `struct lttng_session`-owned and URCU-protected
+        * pointer.
+        */
+       struct lttng_ctx **pctx;
 };
 
 /*
@@ -688,7 +692,7 @@ struct lttng_channel *lttng_channel_create(struct lttng_session *session,
 int lttng_channel_enable(struct lttng_channel *channel);
 int lttng_channel_disable(struct lttng_channel *channel);
 
-struct lttng_enabler *lttng_enabler_create(enum lttng_enabler_type type,
+struct lttng_enabler *lttng_enabler_create(enum lttng_enabler_format_type type,
                struct lttng_ust_event *event_param,
                struct lttng_channel *chan);
 int lttng_enabler_enable(struct lttng_enabler *enabler);