X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2Fchannels.h;h=2000430d9f42041c80d0820fa25e0f88b6963335;hb=86699c2035dd69428706ade2d6dfb150ada757cb;hp=6f57f13de6de2b7c58800b5bda5d284f7f0f31ea;hpb=204141ee9da22a244c9095287f4f1c513784b171;p=ust.git

diff --git a/libust/channels.h b/libust/channels.h
index 6f57f13..2000430 100644
--- a/libust/channels.h
+++ b/libust/channels.h
@@ -23,23 +23,25 @@
 
 #include <linux/limits.h>
 #include <errno.h>
-
-#include <ust/kernelcompat.h>
-#include <kcompat/kref.h>
+#include <ust/kcompat/kcompat.h>
+#include <urcu/list.h>
+#include <ust/core.h>
 
 #define EVENTS_PER_CHANNEL	65536
 #define MAX_CPUS		32
 
-struct ltt_trace_struct;
+struct ust_trace;
 
 struct ust_buffer;
 
 struct ust_channel {
 	/* First 32 bytes cache-hot cacheline */
-	struct ltt_trace_struct	*trace;
+	struct ust_trace *trace;
 	int *buf_struct_shmids;
 	struct ust_buffer **buf;
 	int overwrite:1;
+	/* whether collection is requested upon trace start */
+	int request_collection:1;
 	int active:1;
 	unsigned int n_subbufs_order;
 	unsigned long commit_count_mask;	/*
@@ -50,18 +52,6 @@ struct ust_channel {
 						 */
 	/* End of first 32 bytes cacheline */
 
-	/*
-	 * buffer_begin - called on buffer-switch to a new sub-buffer
-	 * @buf: the channel buffer containing the new sub-buffer
-	 */
-	void (*buffer_begin) (struct ust_buffer *buf,
-			u64 tsc, unsigned int subbuf_idx);
-	/*
-	 * buffer_end - called on buffer-switch to a new sub-buffer
-	 * @buf: the channel buffer containing the previous sub-buffer
-	 */
-	void (*buffer_end) (struct ust_buffer *buf,
-			u64 tsc, unsigned int offset, unsigned int subbuf_idx);
 	struct kref kref;	/* Channel transport reference count */
 	size_t subbuf_size;
 	int subbuf_size_order;
@@ -93,9 +83,13 @@ extern const char *ltt_channels_get_name_from_index(unsigned int index);
 extern int ltt_channels_get_index_from_name(const char *name);
 extern struct ust_channel *ltt_channels_trace_alloc(unsigned int *nr_channels,
 						    int overwrite,
+						    int request_collection,
 						    int active);
 extern void ltt_channels_trace_free(struct ust_channel *channels);
 extern int _ltt_channels_get_event_id(const char *channel, const char *name);
 extern int ltt_channels_get_event_id(const char *channel, const char *name);
 
+extern int ust_channels_overwrite_by_default;
+extern int ust_channels_request_collection_by_default;
+
 #endif /* UST_CHANNELS_H */