LTTng modules now builds again

[lttng-modules.git] / ltt-ring-buffer-client.h

diff --git a/ltt-ring-buffer-client.h b/ltt-ring-buffer-client.h
index 93c793ff0218de72acd8b5154acfe78875c0fe62..229c06aab31fde8f7daae1b9bab283e6fb364fb2 100644 (file)
--- a/ltt-ring-buffer-client.h
+++ b/ltt-ring-buffer-client.h
@@ -34,29 +34,29 @@ size_t client_record_header_size(const struct lib_ring_buffer_config *config,
 }
 
 /**
- * client_subbuffer_header_size - called on buffer-switch to a new sub-buffer
+ * client_packet_header_size - called on buffer-switch to a new sub-buffer
  *
  * Return header size without padding after the structure. Don't use packed
  * structure because gcc generates inefficient code on some architectures
  * (powerpc, mips..)
  */
-static size_t client_subbuffer_header_size(void)
+static size_t client_packet_header_size(void)
 {
-       return offsetof(struct subbuffer_header, header_end);
+       return offsetof(struct packet_header, header_end);
 }
 
 static void client_buffer_begin(struct lib_ring_buffer *buf, u64 tsc,
                                unsigned int subbuf_idx)
 {
        struct channel *chan = buf->backend.chan;
-       struct subbuffer_header *header =
-               (struct subbuffer_header *)
+       struct packet_header *header =
+               (struct packet_header *)
                        lib_ring_buffer_offset_address(&buf->backend,
                                subbuf_idx * chan->backend.subbuf_size);
 
-       header->cycle_count_begin = tsc;
-       header->data_size = 0xFFFFFFFF; /* for debugging */
-       write_trace_header(chan->backend.priv, header);
+       header->timestamp_begin = tsc;
+       header->content_size = 0xFFFFFFFF; /* for debugging */
+       write_trace_header(&client_config, header);
 }
 
 /*
@@ -67,25 +67,25 @@ static void client_buffer_end(struct lib_ring_buffer *buf, u64 tsc,
                              unsigned int subbuf_idx, unsigned long data_size)
 {
        struct channel *chan = buf->backend.chan;
-       struct subbuffer_header *header =
-               (struct subbuffer_header *)
+       struct packet_header *header =
+               (struct packet_header *)
                        lib_ring_buffer_offset_address(&buf->backend,
                                subbuf_idx * chan->backend.subbuf_size);
        unsigned long records_lost = 0;
 
-       header->data_size = data_size;
-       header->subbuf_size = PAGE_ALIGN(data_size);
-       header->cycle_count_end = tsc;
+       header->content_size = data_size;
+       header->packet_size = PAGE_ALIGN(data_size);
+       header->timestamp_end = tsc;
        records_lost += lib_ring_buffer_get_records_lost_full(&client_config, buf);
        records_lost += lib_ring_buffer_get_records_lost_wrap(&client_config, buf);
        records_lost += lib_ring_buffer_get_records_lost_big(&client_config, buf);
        header->events_lost = records_lost;
-       header->subbuf_corrupt = 0;     /* deprecated */
 }
 
 static int client_buffer_create(struct lib_ring_buffer *buf, void *priv,
                                int cpu, const char *name)
 {
+       return 0;
 }
 
 static void client_buffer_finalize(struct lib_ring_buffer *buf, void *priv, int cpu)
@@ -95,7 +95,7 @@ static void client_buffer_finalize(struct lib_ring_buffer *buf, void *priv, int
 static const struct lib_ring_buffer_config client_config = {
        .cb.ring_buffer_clock_read = client_ring_buffer_clock_read,
        .cb.record_header_size = client_record_header_size,
-       .cb.subbuffer_header_size = client_subbuffer_header_size,
+       .cb.subbuffer_header_size = client_packet_header_size,
        .cb.buffer_begin = client_buffer_begin,
        .cb.buffer_end = client_buffer_end,
        .cb.buffer_create = client_buffer_create,
@@ -118,12 +118,13 @@ static const struct lib_ring_buffer_config client_config = {
 };
 
 static
-struct channel *ltt_channel_create(struct ltt_session *session, void *buf_addr,
-                                  size_t subbuf_size, size_t num_subbuf,
-                                  unsigned int switch_timer_interval,
-                                  unsigned int read_timer_interval)
+struct channel *_channel_create(const char *name,
+                               struct ltt_session *session, void *buf_addr,
+                               size_t subbuf_size, size_t num_subbuf,
+                               unsigned int switch_timer_interval,
+                               unsigned int read_timer_interval)
 {
-       return channel_create(&client_config, "[lttng]", session, buf_addr,
+       return channel_create(&client_config, name, session, buf_addr,
                              subbuf_size, num_subbuf, switch_timer_interval,
                              read_timer_interval);
 }
@@ -140,8 +141,8 @@ struct lib_ring_buffer *ltt_buffer_read_open(struct channel *chan)
        struct lib_ring_buffer *buf;
        int cpu;
 
-       for_each_channel_cpu(cpu, chan->chan) {
-               buf = channel_get_ring_buffer(&config_config, chan, cpu);
+       for_each_channel_cpu(cpu, chan) {
+               buf = channel_get_ring_buffer(&client_config, chan, cpu);
                if (!lib_ring_buffer_open_read(buf))
                        return buf;
        }
@@ -149,19 +150,48 @@ struct lib_ring_buffer *ltt_buffer_read_open(struct channel *chan)
 }
 
 static
-struct lib_ring_buffer *ltt_buffer_read_close(struct lib_ring_buffer *buf)
+void ltt_buffer_read_close(struct lib_ring_buffer *buf)
 {
        lib_ring_buffer_release_read(buf);
+       
+}
+
+int ltt_event_reserve(struct lib_ring_buffer_ctx *ctx)
+{
+       int ret, cpu;
+
+       cpu = lib_ring_buffer_get_cpu(&client_config);
+       if (cpu < 0)
+               return -EPERM;
+       ctx->cpu = cpu;
+
+       ret = lib_ring_buffer_reserve(&client_config, ctx);
+       if (ret)
+               goto put;
+       return ret;
+
+put:
+       lib_ring_buffer_put_cpu(&client_config);
+       return ret;
 }
 
+void ltt_event_commit(struct lib_ring_buffer_ctx *ctx)
+{
+       lib_ring_buffer_commit(&client_config, ctx);
+       lib_ring_buffer_put_cpu(&client_config);
+}
+
+
 static struct ltt_transport ltt_relay_transport = {
        .name = "relay-" RING_BUFFER_MODE_TEMPLATE_STRING,
        .owner = THIS_MODULE,
        .ops = {
-               .create_channel = ltt_channel_create,
-               .destroy_channel = ltt_channel_destroy,
+               .channel_create = _channel_create,
+               .channel_destroy = ltt_channel_destroy,
                .buffer_read_open = ltt_buffer_read_open,
                .buffer_read_close = ltt_buffer_read_close,
+               .event_reserve = ltt_event_reserve,
+               .event_commit = ltt_event_commit,
        },
 };
 
@@ -172,12 +202,16 @@ static int __init ltt_ring_buffer_client_init(void)
        return 0;
 }
 
+module_init(ltt_ring_buffer_client_init);
+
 static void __exit ltt_ring_buffer_client_exit(void)
 {
        printk(KERN_INFO "LTT : ltt ring buffer client exit\n");
        ltt_transport_unregister(&ltt_relay_transport);
 }
 
+module_exit(ltt_ring_buffer_client_exit);
+
 MODULE_LICENSE("GPL and additional rights");
 MODULE_AUTHOR("Mathieu Desnoyers");
 MODULE_DESCRIPTION("LTTng ring buffer " RING_BUFFER_MODE_TEMPLATE_STRING