X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=libust%2Fchannels.h;h=0d2715d17166fbabfa4768b9f2591214d0546239;hb=920bdf719a175cc0e542e2f001e7d01f230412c1;hp=0b179e5cc670fe1b75f765a66d0b5f253d41e709;hpb=b5b073e22d34bec71259d39b8946354f170f01a9;p=ust.git

diff --git a/libust/channels.h b/libust/channels.h
index 0b179e5..0d2715d 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)
@@ -28,15 +28,17 @@
 #include <kcompat/kref.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;
-	void *buf;
+	struct ust_trace *trace;
+	int *buf_struct_shmids;
+	struct ust_buffer **buf;
 	int overwrite:1;
 	int active:1;
 	unsigned int n_subbufs_order;
@@ -48,25 +50,12 @@ 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;
 	unsigned int subbuf_cnt;
 	const char *channel_name;
-
-	int buf_shmid;
+	int n_cpus;
 
 	u32 version;
 	size_t alloc_size;
@@ -97,4 +86,4 @@ 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 */
+#endif /* UST_CHANNELS_H */