X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2Fchannels.h;h=e7bc59fefb36be0e4b4c513077c19b5f7939651d;hb=8d6300d3b3cb0219e1109e931a2219dbd812b24d;hp=e460e12b916f0faa9ad58634ae180fa791db2a2e;hpb=fbca6b624335eef18c8d86194aeb101a720168f4;p=ust.git

diff --git a/libust/channels.h b/libust/channels.h
index e460e12..e7bc59f 100644
--- a/libust/channels.h
+++ b/libust/channels.h
@@ -1,5 +1,5 @@
-#ifndef _LTT_CHANNELS_H
-#define _LTT_CHANNELS_H
+#ifndef UST_CHANNELS_H
+#define UST_CHANNELS_H
 
 /*
  * Copyright (C) 2008 Mathieu Desnoyers (mathieu.desnoyers@polymtl.ca)
@@ -22,24 +22,29 @@
  */
 
 #include <linux/limits.h>
-//ust// #include <linux/kref.h>
-//ust// #include <linux/list.h>
 #include <errno.h>
+#include <ust/kcompat/kcompat.h>
+#include <ust/core.h>
 
-#include <ust/kernelcompat.h>
-#include <kcompat/kref.h>
+#define _LGPL_SOURCE
+#include <urcu/list.h>
+#include <urcu/urcu_ref.h>
 
 #define EVENTS_PER_CHANNEL	65536
+#define MAX_CPUS		32
 
-struct ltt_trace_struct;
-struct rchan_buf;
+struct ust_trace;
 
-struct ltt_channel_struct {
+struct ust_buffer;
+
+struct ust_channel {
 	/* First 32 bytes cache-hot cacheline */
-	struct ltt_trace_struct	*trace;
-	void *buf;
-	void *trans_channel_data;
+	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,31 +55,23 @@ struct ltt_channel_struct {
 						 */
 	/* 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 rchan_buf *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 rchan_buf *buf,
-			u64 tsc, unsigned int offset, unsigned int subbuf_idx);
-	struct kref kref;	/* Channel transport reference count */
-	unsigned int subbuf_size;
+	struct urcu_ref urcu_ref;	/* Channel transport reference count */
+	size_t subbuf_size;
+	int subbuf_size_order;
 	unsigned int subbuf_cnt;
 	const char *channel_name;
+	int n_cpus;
 
-	int buf_shmid;
+	u32 version;
+	size_t alloc_size;
+	struct cds_list_head list;
 } ____cacheline_aligned;
 
 struct ltt_channel_setting {
 	unsigned int subbuf_size;
 	unsigned int subbuf_cnt;
-	struct kref kref;	/* Number of references to structure content */
-	struct list_head list;
+	struct urcu_ref urcu_ref;	/* Number of references to structure content */
+	struct cds_list_head list;
 	unsigned int index;	/* index of channel in trace channel array */
 	u16 free_event_id;	/* Next event ID to allocate */
 	char name[PATH_MAX];
@@ -87,11 +84,15 @@ extern int ltt_channels_set_default(const char *name,
 			     unsigned int subbuf_cnt);
 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 ltt_channel_struct *ltt_channels_trace_alloc(unsigned int *nr_channels,
+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 ltt_channel_struct *channels);
+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);
 
-#endif /* _LTT_CHANNELS_H */
+extern int ust_channels_overwrite_by_default;
+extern int ust_channels_request_collection_by_default;
+
+#endif /* UST_CHANNELS_H */