-#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)
*/
#include <linux/limits.h>
-//ust// #include <linux/kref.h>
-//ust// #include <linux/list.h>
#include <errno.h>
-#include "kernelcompat.h"
-#include <kcompat/kref.h>
+#include <ust/kernelcompat.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;
int active:1;
unsigned int n_subbufs_order;
*/
/* 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;
+ 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 list_head list;
} ____cacheline_aligned;
struct ltt_channel_setting {
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 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 */
+#endif /* UST_CHANNELS_H */