X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Fust-events.h;h=aebe3b72373ab31aefe6f5fef508a14bb2b05bed;hb=80333dfa3049634097979b6504409b8bf8ba8178;hp=01617574eb95f9af1aa318e5772ebce23f097ab4;hpb=bd8c1787628a2703b49c239b0e46613ac6b41131;p=lttng-ust.git

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 01617574..aebe3b72 100644
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -43,7 +43,6 @@ extern "C" {
 struct lttng_channel;
 struct lttng_session;
 struct lttng_ust_lib_ring_buffer_ctx;
-struct lttng_ust_context_app;
 struct lttng_event_field;
 struct lttng_event_notifier;
 struct lttng_event_notifier_group;
@@ -53,31 +52,14 @@ struct lttng_event_notifier_group;
  * tracer. Those structures have padding for future extension.
  */
 
-/*
- * LTTng client type enumeration. Used by the consumer to map the
- * callbacks from its own address space.
- */
-enum lttng_client_types {
-	LTTNG_CLIENT_METADATA = 0,
-	LTTNG_CLIENT_DISCARD = 1,
-	LTTNG_CLIENT_OVERWRITE = 2,
-	LTTNG_CLIENT_DISCARD_RT = 3,
-	LTTNG_CLIENT_OVERWRITE_RT = 4,
-	LTTNG_NR_CLIENT_TYPES,
-};
-
 /* Type description */
 
 /* Update the astract_types name table in lttng-types.c along with this enum */
 enum lttng_abstract_types {
 	atype_integer,
-	atype_enum,	/* legacy */
-	atype_array,	/* legacy */
-	atype_sequence,	/* legacy */
 	atype_string,
 	atype_float,
 	atype_dynamic,
-	atype_struct,	/* legacy */
 	atype_enum_nestable,
 	atype_array_nestable,
 	atype_sequence_nestable,
@@ -176,29 +158,6 @@ struct lttng_float_type {
 	char padding[LTTNG_UST_FLOAT_TYPE_PADDING];
 };
 
-/* legacy */
-#define LTTNG_UST_BASIC_TYPE_PADDING	128
-union _lttng_basic_type {
-	struct lttng_integer_type integer;	/* legacy */
-	struct {
-		const struct lttng_enum_desc *desc;	/* Enumeration mapping */
-		struct lttng_integer_type container_type;
-	} enumeration;				/* legacy */
-	struct {
-		enum lttng_string_encodings encoding;
-	} string;				/* legacy */
-	struct lttng_float_type _float;		/* legacy */
-	char padding[LTTNG_UST_BASIC_TYPE_PADDING];
-};
-
-/* legacy */
-struct lttng_basic_type {
-	enum lttng_abstract_types atype;
-	union {
-		union _lttng_basic_type basic;
-	} u;
-};
-
 #define LTTNG_UST_TYPE_PADDING	128
 struct lttng_type {
 	enum lttng_abstract_types atype;
@@ -229,22 +188,6 @@ struct lttng_type {
 			unsigned int alignment;
 		} struct_nestable;
 
-		union {
-			/* legacy provider ABI 1.0 */
-			union _lttng_basic_type basic;	/* legacy */
-			struct {
-				struct lttng_basic_type elem_type;
-				unsigned int length;		/* Num. elems. */
-			} array;			/* legacy */
-			struct {
-				struct lttng_basic_type length_type;
-				struct lttng_basic_type elem_type;
-			} sequence;			/* legacy */
-			struct {
-				unsigned int nr_fields;
-				struct lttng_event_field *fields;	/* Array of fields. */
-			} _struct;			/* legacy */
-		} legacy;
 		char padding[LTTNG_UST_TYPE_PADDING];
 	} u;
 };
@@ -365,50 +308,6 @@ struct lttng_probe_desc {
 
 /* Data structures used by the tracer. */
 
-enum lttng_enabler_format_type {
-	LTTNG_ENABLER_FORMAT_STAR_GLOB,
-	LTTNG_ENABLER_FORMAT_EVENT,
-};
-
-/*
- * Enabler field, within whatever object is enabling an event. Target of
- * backward reference.
- */
-struct lttng_enabler {
-	enum lttng_enabler_format_type format_type;
-
-	/* head list of struct lttng_ust_filter_bytecode_node */
-	struct cds_list_head filter_bytecode_head;
-	/* head list of struct lttng_ust_excluder_node */
-	struct cds_list_head excluder_head;
-
-	struct lttng_ust_event event_param;
-	unsigned int enabled:1;
-};
-
-struct tp_list_entry {
-	struct lttng_ust_tracepoint_iter tp;
-	struct cds_list_head head;
-};
-
-struct lttng_ust_tracepoint_list {
-	struct tp_list_entry *iter;
-	struct cds_list_head head;
-};
-
-struct tp_field_list_entry {
-	struct lttng_ust_field_iter field;
-	struct cds_list_head head;
-};
-
-struct lttng_ust_field_list {
-	struct tp_field_list_entry *iter;
-	struct cds_list_head head;
-};
-
-struct ust_pending_probe;
-struct lttng_event;
-
 /*
  * Bytecode interpreter return value masks.
  */
@@ -419,16 +318,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);
@@ -436,27 +337,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;
-};
-
-/*
- * Objects in a linked-list of enablers, owned by an event or event_notifier.
- * This is used because an event (or a event_notifier) can be enabled by more
- * than one enabler and we want a quick way to iterate over all enablers of an
- * object.
- *
- * For example, event rules "my_app:a*" and "my_app:ab*" will both match the
- * event with the name "my_app:abc".
- */
-struct lttng_enabler_ref {
-	struct cds_list_head node;		/* enabler ref list */
-	struct lttng_enabler *ref;		/* backward ref */
 };
 
 /*
@@ -467,22 +348,29 @@ struct lttng_enabler_ref {
  * UST. Fields need to be only added at the end, never reordered, never
  * removed.
  */
+
+struct lttng_ust_event_common_private;
+
+struct lttng_event_common {
+	uint32_t struct_size;				/* Size of this structure. */
+	struct lttng_ust_event_common_private *priv;	/* Private event interface */
+
+	int enabled;
+	int has_enablers_without_bytecode;
+	/* list of struct lttng_bytecode_runtime, sorted by seqnum */
+	struct cds_list_head filter_bytecode_runtime_head;
+};
+
+struct lttng_ust_event_private;
+
 struct lttng_event {
+	uint32_t struct_size;			/* Size of this structure. */
+	struct lttng_event_common *parent;
+	struct lttng_ust_event_private *priv;	/* Private event interface */
+
 	unsigned int id;
 	struct lttng_channel *chan;
-	int enabled;
-	const struct lttng_event_desc *desc;
 	struct lttng_ctx *ctx;
-	enum lttng_ust_instrumentation instrumentation;
-	struct cds_list_head node;		/* Event list in session */
-
-	/* list of struct lttng_bytecode_runtime, sorted by seqnum */
-	struct cds_list_head filter_bytecode_runtime_head;
-	int has_enablers_without_bytecode;
-	/* Backward references: list of lttng_enabler_ref (ref to enablers) */
-	struct cds_list_head enablers_ref_head;
-	struct cds_hlist_node hlist;	/* session ht of events */
-	int registered;			/* has reg'd tracepoint probe */
 };
 
 struct lttng_event_notifier {
@@ -579,15 +467,7 @@ struct lttng_channel {
 	int tstate:1;			/* Transient enable state */
 };
 
-#define LTTNG_COUNTER_DIMENSION_MAX	8
-
-struct lttng_counter_dimension {
-	uint64_t size;
-	uint64_t underflow_index;
-	uint64_t overflow_index;
-	uint8_t has_underflow;
-	uint8_t has_overflow;
-};
+struct lttng_counter_dimension;
 
 struct lttng_counter_ops {
 	struct lib_counter *(*counter_create)(size_t nr_dimensions,
@@ -637,176 +517,33 @@ 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 {
-	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. */
-};
-
-struct lttng_counter {
-	int objd;
-	struct lttng_event_notifier_group *event_notifier_group;    /* owner */
-	struct lttng_counter_transport *transport;
-	struct lib_counter *counter;
-	struct lttng_counter_ops *ops;
-};
-
-struct lttng_event_notifier_group {
-	int objd;
-	void *owner;
-	int notification_fd;
-	struct cds_list_head node;		/* Event notifier group handle list */
-	struct cds_list_head enablers_head;
-	struct cds_list_head event_notifiers_head;	/* list of event_notifiers */
-	struct lttng_ust_event_notifier_ht event_notifiers_ht; /* hashtable of event_notifiers */
-	struct lttng_ctx *ctx;			/* contexts for filters. */
-
-	struct lttng_counter *error_counter;
-	size_t error_counter_len;
-};
-
-struct lttng_transport {
-	char *name;
-	struct cds_list_head node;
-	struct lttng_channel_ops ops;
-	const struct lttng_ust_lib_ring_buffer_config *client_config;
-};
+	uint32_t struct_size;			/* Size of this structure */
+	struct lttng_ust_session_private *priv;	/* Private session interface */
 
-struct lttng_counter_transport {
-	char *name;
-	struct cds_list_head node;
-	struct lttng_counter_ops ops;
-	const struct lib_counter_config *client_config;
+	int active;				/* Is trace session active ? */
 };
 
-struct lttng_session *lttng_session_create(void);
-int lttng_session_enable(struct lttng_session *session);
-int lttng_session_disable(struct lttng_session *session);
-int lttng_session_statedump(struct lttng_session *session);
-void lttng_session_destroy(struct lttng_session *session);
-
-struct lttng_channel *lttng_channel_create(struct lttng_session *session,
-				       const char *transport_name,
-				       void *buf_addr,
-				       size_t subbuf_size, size_t num_subbuf,
-				       unsigned int switch_timer_interval,
-				       unsigned int read_timer_interval,
-				       int **shm_fd, int **wait_fd,
-				       uint64_t **memory_map_size,
-				       struct lttng_channel *chan_priv_init);
-
-int lttng_channel_enable(struct lttng_channel *channel);
-int lttng_channel_disable(struct lttng_channel *channel);
-
-int lttng_attach_context(struct lttng_ust_context *context_param,
-		union ust_args *uargs,
-		struct lttng_ctx **ctx, struct lttng_session *session);
-void lttng_transport_register(struct lttng_transport *transport);
-void lttng_transport_unregister(struct lttng_transport *transport);
-
 int lttng_probe_register(struct lttng_probe_desc *desc);
 void lttng_probe_unregister(struct lttng_probe_desc *desc);
-void lttng_probe_provider_unregister_events(struct lttng_probe_desc *desc);
-int lttng_fix_pending_events(void);
-int lttng_probes_init(void);
-void lttng_probes_exit(void);
-int lttng_find_context(struct lttng_ctx *ctx, const char *name);
-int lttng_get_context_index(struct lttng_ctx *ctx, const char *name);
-struct lttng_ctx_field *lttng_append_context(struct lttng_ctx **ctx_p);
-void lttng_context_update(struct lttng_ctx *ctx);
-void lttng_remove_context_field(struct lttng_ctx **ctx_p,
-				struct lttng_ctx_field *field);
-void lttng_destroy_context(struct lttng_ctx *ctx);
-int lttng_add_vtid_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_vpid_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_pthread_id_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_procname_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_ip_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_cpu_id_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_dyntest_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_cgroup_ns_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_ipc_ns_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_mnt_ns_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_net_ns_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_pid_ns_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_user_ns_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_uts_ns_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_vuid_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_veuid_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_vsuid_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_vgid_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_vegid_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_vsgid_to_ctx(struct lttng_ctx **ctx);
-void lttng_context_vtid_reset(void);
-void lttng_context_vpid_reset(void);
+
+/*
+ * Can be used by applications that change their procname to clear the ust cached value.
+ */
 void lttng_context_procname_reset(void);
-void lttng_context_cgroup_ns_reset(void);
-void lttng_context_ipc_ns_reset(void);
-void lttng_context_mnt_ns_reset(void);
-void lttng_context_net_ns_reset(void);
-void lttng_context_pid_ns_reset(void);
-void lttng_context_user_ns_reset(void);
-void lttng_context_uts_ns_reset(void);
-void lttng_context_vuid_reset(void);
-void lttng_context_veuid_reset(void);
-void lttng_context_vsuid_reset(void);
-void lttng_context_vgid_reset(void);
-void lttng_context_vegid_reset(void);
-void lttng_context_vsgid_reset(void);
-
-
-extern const struct lttng_ust_client_lib_ring_buffer_client_cb *lttng_client_callbacks_metadata;
-extern const struct lttng_ust_client_lib_ring_buffer_client_cb *lttng_client_callbacks_discard;
-extern const struct lttng_ust_client_lib_ring_buffer_client_cb *lttng_client_callbacks_overwrite;
 
 struct lttng_transport *lttng_transport_find(const char *name);
 
-int lttng_probes_get_event_list(struct lttng_ust_tracepoint_list *list);
-void lttng_probes_prune_event_list(struct lttng_ust_tracepoint_list *list);
-struct lttng_ust_tracepoint_iter *
-	lttng_ust_tracepoint_list_get_iter_next(struct lttng_ust_tracepoint_list *list);
-int lttng_probes_get_field_list(struct lttng_ust_field_list *list);
-void lttng_probes_prune_field_list(struct lttng_ust_field_list *list);
-struct lttng_ust_field_iter *
-	lttng_ust_field_list_get_iter_next(struct lttng_ust_field_list *list);
-
-void lttng_free_event_filter_runtime(struct lttng_event *event);
-
-struct cds_list_head *lttng_get_probe_list_head(void);
 int lttng_session_active(void);
 
-typedef int (*t_statedump_func_ptr)(struct lttng_session *session);
-void lttng_handle_pending_statedump(void *owner);
-struct cds_list_head *_lttng_get_sessions(void);
-
-struct lttng_enum *lttng_ust_enum_get_from_desc(struct lttng_session *session,
-		const struct lttng_enum_desc *enum_desc);
-
 void lttng_ust_dl_update(void *ip);
-void lttng_ust_fixup_fd_tracker_tls(void);
 
 #ifdef __cplusplus
 }