Refactoring: introduce session private structure

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

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index b44fba59de9d9428f955eb4946205b62cd320c28..d75a73235b5218f93831a010c88b209eb6ae5e00 100644 (file)
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -361,16 +361,18 @@ enum lttng_bytecode_interpreter_ret {
 };
 
 struct lttng_interpreter_output;
+struct lttng_ust_bytecode_runtime_private;
 
 /*
- * This structure is used in the probes. More specifically, the `filter` and
- * `node` fields are explicity used in the probes. When modifying this
- * structure we must not change the layout of these two fields as it is
- * considered ABI.
+ * This structure is used in the probes. More specifically, the
+ * `interpreter_funcs` and `node` fields are explicity used in the
+ * probes. When modifying this structure we must not change the layout
+ * of these two fields as it is considered ABI.
  */
 struct lttng_bytecode_runtime {
+       struct lttng_ust_bytecode_runtime_private *priv;
+
        /* Associated bytecode */
-       struct lttng_ust_bytecode_node *bc;
        union {
                uint64_t (*filter)(void *interpreter_data,
                                const char *interpreter_stack_data);
@@ -378,13 +380,7 @@ struct lttng_bytecode_runtime {
                                const char *interpreter_stack_data,
                                struct lttng_interpreter_output *interpreter_output);
        } interpreter_funcs;
-       int link_failed;
        struct cds_list_head node;      /* list of bytecode runtime in event */
-       /*
-        * Pointer to a URCU-protected pointer owned by an `struct
-        * lttng_session`or `struct lttng_event_notifier_group`.
-        */
-       struct lttng_ctx **pctx;
 };
 
 /*
@@ -554,33 +550,17 @@ struct lttng_ust_enum_ht {
        struct cds_hlist_head table[LTTNG_UST_ENUM_HT_SIZE];
 };
 
+struct lttng_ust_session_private;
+
 /*
  * IMPORTANT: this structure is part of the ABI between the probe and
  * UST. Fields need to be only added at the end, never reordered, never
  * removed.
  */
 struct lttng_session {
+       struct lttng_ust_session_private *priv; /* Private session interface */
+
        int active;                             /* Is trace session active ? */
-       int been_active;                        /* Been active ? */
-       int objd;                               /* Object associated */
-       struct cds_list_head chan_head;         /* Channel list head */
-       struct cds_list_head events_head;       /* list of events */
-       struct cds_list_head node;              /* Session list */
-
-       /* New UST 2.1 */
-       /* List of enablers */
-       struct cds_list_head enablers_head;
-       struct lttng_ust_event_ht events_ht;    /* ht of events */
-       void *owner;                            /* object owner */
-       int tstate:1;                           /* Transient enable state */
-
-       /* New UST 2.4 */
-       int statedump_pending:1;
-
-       /* New UST 2.8 */
-       struct lttng_ust_enum_ht enums_ht;      /* ht of enumerations */
-       struct cds_list_head enums_head;
-       struct lttng_ctx *ctx;                  /* contexts for filters. */
 };
 
 int lttng_probe_register(struct lttng_probe_desc *desc);