X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-events.h;h=1c7140ff69ef528baf148af2fab14c0faeb5bbf1;hb=4ab44fbe7377ad603da7dccebf2e0af6b768fa91;hp=cb794b40a511efc0c0f1fd1989c4aace3d2940b4;hpb=c1fca4572d4458b2e6e96752f9efc595c5f72405;p=lttng-ust.git

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index cb794b40..1c7140ff 100644
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -1,14 +1,21 @@
-#ifndef _UST_LTTNG_EVENTS_H
-#define _UST_LTTNG_EVENTS_H
+#ifndef _LTTNG_UST_EVENTS_H
+#define _LTTNG_UST_EVENTS_H
 
 /*
- * ust/lttng-events.h
+ * lttng/ust-events.h
  *
  * Copyright 2010 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Holds LTTng per-session event registry.
  *
- * Dual LGPL v2.1/GPL v2 license.
+ * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
+ * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
+ *
+ * Permission is hereby granted to use or copy this program
+ * for any purpose,  provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
  */
 
 #include <urcu/list.h>
@@ -149,7 +156,7 @@ struct lttng_enum {
 	const char *name;
 	struct lttng_type container_type;
 	const struct lttng_enum_entry *entries;
-	unsigned int len;
+	nsigned int len;
 };
 
 /* Event field description */
@@ -216,13 +223,13 @@ struct lttng_ust_shm_handle;
 
 struct ltt_channel_ops {
 	struct ltt_channel *(*channel_create)(const char *name,
-				struct ltt_channel *ltt_chan,
 				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);
+				uint64_t *memory_map_size,
+				struct ltt_channel *chan_priv_init);
 	void (*channel_destroy)(struct ltt_channel *ltt_chan);
 	struct lttng_ust_lib_ring_buffer *(*buffer_read_open)(struct channel *chan,
 				struct lttng_ust_shm_handle *handle,
@@ -250,7 +257,12 @@ struct ltt_channel_ops {
 };
 
 struct ltt_channel {
-	unsigned int id;
+	/*
+	 * The pointers located in this private data are NOT safe to be
+	 * dereferenced by the consumer. The only operations the
+	 * consumer process is designed to be allowed to do is to read
+	 * and perform subbuffer flush.
+	 */
 	struct channel *chan;		/* Channel buffers */
 	int enabled;
 	struct lttng_ctx *ctx;
@@ -264,6 +276,11 @@ struct ltt_channel {
 	int header_type;		/* 0: unset, 1: compact, 2: large */
 	struct lttng_ust_shm_handle *handle;	/* shared-memory handle */
 	int metadata_dumped:1;
+
+	/* Channel ID, available for consumer too */
+	unsigned int id;
+	/* Copy of session UUID for consumer (availability through shm) */
+	uuid_t uuid;			/* Trace session unique ID */
 };
 
 struct ltt_session {
@@ -297,7 +314,8 @@ struct ltt_channel *ltt_channel_create(struct ltt_session *session,
 				       unsigned int switch_timer_interval,
 				       unsigned int read_timer_interval,
 				       int *shm_fd, int *wait_fd,
-				       uint64_t *memory_map_size);
+				       uint64_t *memory_map_size,
+				       struct ltt_channel *chan_priv_init);
 struct ltt_channel *ltt_global_channel_create(struct ltt_session *session,
 				       int overwrite, void *buf_addr,
 				       size_t subbuf_size, size_t num_subbuf,
@@ -339,11 +357,10 @@ int lttng_add_procname_to_ctx(struct lttng_ctx **ctx);
 void lttng_context_vtid_reset(void);
 void lttng_context_vpid_reset(void);
 
-const struct lttng_ust_lib_ring_buffer_config *lttng_client_callbacks_metadata;
-const struct lttng_ust_lib_ring_buffer_config *lttng_client_callbacks_discard;
-const struct lttng_ust_lib_ring_buffer_config *lttng_client_callbacks_overwrite;
+const struct lttng_ust_lib_ring_buffer_client_cb *lttng_client_callbacks_metadata;
+const struct lttng_ust_lib_ring_buffer_client_cb *lttng_client_callbacks_discard;
+const struct lttng_ust_lib_ring_buffer_client_cb *lttng_client_callbacks_overwrite;
 
-struct cds_list_head ltt_transport_list;
 struct ltt_transport *ltt_transport_find(const char *name);
 
-#endif /* _UST_LTTNG_EVENTS_H */
+#endif /* _LTTNG_UST_EVENTS_H */