X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=inline;f=liblttng-ust%2Fust-events-internal.h;h=e632050434c83a2fa06ab790c7570f90a0b5db6d;hb=5b4c6da4aa59719b613c612afc05aee91f4343a4;hp=f6ab27a2572bd2e2e923cce77501d34f7869c8f1;hpb=9daacd1a32798bcef31f13cf45a3aab25bdc67af;p=lttng-ust.git

diff --git a/liblttng-ust/ust-events-internal.h b/liblttng-ust/ust-events-internal.h
index f6ab27a2..e6320504 100644
--- a/liblttng-ust/ust-events-internal.h
+++ b/liblttng-ust/ust-events-internal.h
@@ -251,7 +251,7 @@ struct lttng_event_notifier_group {
 struct lttng_transport {
 	char *name;
 	struct cds_list_head node;
-	struct lttng_ust_channel_ops ops;
+	struct lttng_ust_channel_buffer_ops ops;
 	const struct lttng_ust_lib_ring_buffer_config *client_config;
 };
 
@@ -347,8 +347,8 @@ struct lttng_enum {
 
 struct lttng_ust_shm_handle;
 
-struct lttng_ust_channel_ops_private {
-	struct lttng_ust_channel_ops *pub;	/* Public channels ops interface */
+struct lttng_ust_channel_buffer_ops_private {
+	struct lttng_ust_channel_buffer_ops *pub;	/* Public channel buffer ops interface */
 
 	struct lttng_ust_channel_buffer *(*channel_create)(const char *name,
 			void *buf_addr,
@@ -365,12 +365,10 @@ struct lttng_ust_channel_ops_private {
 	 * packet. Note that the size returned is only a hint, since it
 	 * may change due to concurrent writes.
 	 */
-	size_t (*packet_avail_size)(struct lttng_ust_lib_ring_buffer_channel *chan,
-				    struct lttng_ust_shm_handle *handle);
-	int (*is_finalized)(struct lttng_ust_lib_ring_buffer_channel *chan);
-	int (*is_disabled)(struct lttng_ust_lib_ring_buffer_channel *chan);
-	int (*flush_buffer)(struct lttng_ust_lib_ring_buffer_channel *chan,
-			    struct lttng_ust_shm_handle *handle);
+	size_t (*packet_avail_size)(struct lttng_ust_channel_buffer *chan);
+	int (*is_finalized)(struct lttng_ust_channel_buffer *chan);
+	int (*is_disabled)(struct lttng_ust_channel_buffer *chan);
+	int (*flush_buffer)(struct lttng_ust_channel_buffer *chan);
 };
 
 struct lttng_ust_channel_common_private {
@@ -389,6 +387,7 @@ struct lttng_ust_channel_buffer_private {
 	unsigned int id;			/* Channel ID */
 	enum lttng_ust_abi_chan_type type;
 	struct lttng_ust_ctx *ctx;
+	struct lttng_ust_lib_ring_buffer_channel *rb_chan;	/* Ring buffer channel */
 	unsigned char uuid[LTTNG_UST_UUID_LEN];	/* Trace session unique ID */
 };
 
@@ -754,7 +753,7 @@ struct lttng_counter *lttng_ust_counter_create(
 		const char *counter_transport_name,
 		size_t number_dimensions, const struct lttng_counter_dimension *dimensions);
 
-#ifdef HAVE_PERF_EVENT
+#ifdef HAVE_LINUX_PERF_EVENT_H
 
 __attribute__((visibility("hidden")))
 int lttng_add_perf_counter_to_ctx(uint32_t type,
@@ -768,7 +767,7 @@ int lttng_perf_counter_init(void);
 __attribute__((visibility("hidden")))
 void lttng_perf_counter_exit(void);
 
-#else /* #ifdef HAVE_PERF_EVENT */
+#else /* #ifdef HAVE_LINUX_PERF_EVENT_H */
 
 static inline
 int lttng_add_perf_counter_to_ctx(uint32_t type,
@@ -787,7 +786,7 @@ static inline
 void lttng_perf_counter_exit(void)
 {
 }
-#endif /* #else #ifdef HAVE_PERF_EVENT */
+#endif /* #else #ifdef HAVE_LINUX_PERF_EVENT_H */
 
 __attribute__((visibility("hidden")))
 int lttng_probes_get_event_list(struct lttng_ust_tracepoint_list *list);
@@ -900,4 +899,11 @@ __attribute__((visibility("hidden")))
 int lttng_ust_session_uuid_validate(struct lttng_ust_session *session,
 		unsigned char *uuid);
 
+__attribute__((visibility("hidden")))
+bool lttng_ust_validate_event_name(const struct lttng_ust_event_desc *desc);
+
+__attribute__((visibility("hidden")))
+void lttng_ust_format_event_name(const struct lttng_ust_event_desc *desc,
+		char *name);
+
 #endif /* _LTTNG_UST_EVENTS_INTERNAL_H */