Rewrite last GPL bits in relay.c and relay.h

[ust.git] / libust / channels.h

diff --git a/libust/channels.h b/libust/channels.h
index dedc1f8a7bd72e3950c1210c27c4a82ef9003ed1..0b179e5cc670fe1b75f765a66d0b5f253d41e709 100644 (file)
--- a/libust/channels.h
+++ b/libust/channels.h
@@ -5,27 +5,38 @@
  * Copyright (C) 2008 Mathieu Desnoyers (mathieu.desnoyers@polymtl.ca)
  *
  * Dynamic tracer channel allocation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #include <linux/limits.h>
-//ust// #include <linux/kref.h>
-//ust// #include <linux/list.h>
 #include <errno.h>
 
-#include "kernelcompat.h"
-#include "kref.h"
-#include "list.h"
+#include <ust/kernelcompat.h>
+#include <kcompat/kref.h>
 
 #define EVENTS_PER_CHANNEL     65536
 
 struct ltt_trace_struct;
-struct rchan_buf;
 
-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;
        int overwrite:1;
        int active:1;
        unsigned int n_subbufs_order;
@@ -41,20 +52,25 @@ struct ltt_channel_struct {
         * 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,
+       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 rchan_buf *buf,
+       void (*buffer_end) (struct ust_buffer *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 buf_shmid;
+
+       u32 version;
+       size_t alloc_size;
+       struct list_head list;
 } ____cacheline_aligned;
 
 struct ltt_channel_setting {
@@ -67,18 +83,18 @@ struct ltt_channel_setting {
        char name[PATH_MAX];
 };
 
-int ltt_channels_register(const char *name);
-int ltt_channels_unregister(const char *name);
-int ltt_channels_set_default(const char *name,
+extern int ltt_channels_register(const char *name);
+extern int ltt_channels_unregister(const char *name);
+extern int ltt_channels_set_default(const char *name,
                             unsigned int subbuf_size,
                             unsigned int subbuf_cnt);
-const char *ltt_channels_get_name_from_index(unsigned int index);
-int ltt_channels_get_index_from_name(const char *name);
-struct ltt_channel_struct *ltt_channels_trace_alloc(unsigned int *nr_channels,
+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 active);
-void ltt_channels_trace_free(struct ltt_channel_struct *channels);
-int _ltt_channels_get_event_id(const char *channel, const char *name);
-int ltt_channels_get_event_id(const char *channel, const char *name);
+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 */