X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt-events.h;h=31a50ca5f34968d0705e22885d30d54289d0db51;hb=7b745a9662e0552f2715391147bc994ad17ae29c;hp=10015ad6150cb7404b9bfe39797e3848c969d7a2;hpb=1d443b34028ae43e9c9ee48fd19ece3edb9ae074;p=lttng-modules.git

diff --git a/ltt-events.h b/ltt-events.h
index 10015ad6..31a50ca5 100644
--- a/ltt-events.h
+++ b/ltt-events.h
@@ -119,6 +119,17 @@ struct lttng_event_field {
 	struct lttng_type type;
 };
 
+/*
+ * We need to keep this perf counter field separately from struct
+ * lttng_ctx_field because cpu hotplug needs fixed-location addresses.
+ */
+struct lttng_perf_counter_field {
+	struct notifier_block nb;
+	int hp_enable;
+	struct perf_event_attr *attr;
+	struct perf_event **e;	/* per-cpu array */
+};
+
 struct lttng_ctx_field {
 	struct lttng_event_field event_field;
 	size_t (*get_size)(size_t offset);
@@ -126,12 +137,7 @@ struct lttng_ctx_field {
 		       struct lib_ring_buffer_ctx *ctx,
 		       struct ltt_channel *chan);
 	union {
-		struct {
-			struct perf_event **e;	/* per-cpu array */
-			struct notifier_block nb;
-			int hp_enable;
-			struct perf_event_attr *attr;
-		} perf_counter;
+		struct lttng_perf_counter_field *perf_counter;
 	} u;
 	void (*destroy)(struct lttng_ctx_field *field);
 };
@@ -191,6 +197,7 @@ struct ltt_channel_ops {
 				unsigned int read_timer_interval);
 	void (*channel_destroy)(struct channel *chan);
 	struct lib_ring_buffer *(*buffer_read_open)(struct channel *chan);
+	int (*buffer_has_read_closed_stream)(struct channel *chan);
 	void (*buffer_read_close)(struct lib_ring_buffer *buf);
 	int (*event_reserve)(struct lib_ring_buffer_ctx *ctx,
 			     uint32_t event_id);
@@ -209,6 +216,13 @@ struct ltt_channel_ops {
 	int (*is_disabled)(struct channel *chan);
 };
 
+struct ltt_transport {
+	char *name;
+	struct module *owner;
+	struct list_head node;
+	struct ltt_channel_ops ops;
+};
+
 struct ltt_channel {
 	unsigned int id;
 	struct channel *chan;		/* Channel buffers */
@@ -220,6 +234,7 @@ struct ltt_channel {
 	unsigned int free_event_id;	/* Next event ID to allocate */
 	struct list_head list;		/* Channel list */
 	struct ltt_channel_ops *ops;
+	struct ltt_transport *transport;
 	int header_type;		/* 0: unset, 1: compact, 2: large */
 	int metadata_dumped:1;
 };
@@ -237,13 +252,6 @@ struct ltt_session {
 	int metadata_dumped:1;
 };
 
-struct ltt_transport {
-	char *name;
-	struct module *owner;
-	struct list_head node;
-	struct ltt_channel_ops ops;
-};
-
 struct ltt_session *ltt_session_create(void);
 int ltt_session_enable(struct ltt_session *session);
 int ltt_session_disable(struct ltt_session *session);
@@ -284,6 +292,7 @@ void ltt_event_put(const struct lttng_event_desc *desc);
 int ltt_probes_init(void);
 void ltt_probes_exit(void);
 struct lttng_ctx_field *lttng_append_context(struct lttng_ctx **ctx);
+int lttng_find_context(struct lttng_ctx *ctx, const char *name);
 void lttng_remove_context_field(struct lttng_ctx **ctx,
 				struct lttng_ctx_field *field);
 void lttng_destroy_context(struct lttng_ctx *ctx);