Update ring buffer and pretty print

[lttng-modules.git] / ltt-events.h

diff --git a/ltt-events.h b/ltt-events.h
index 6bdacf6ec76d8ba8050fd4374213585323a9cc45..6cc3753101fb1606de8f1c11fe1f81c504c7553b 100644 (file)
--- a/ltt-events.h
+++ b/ltt-events.h
@@ -18,6 +18,7 @@ struct ltt_channel;
 struct ltt_session;
 struct lib_ring_buffer_ctx;
 struct perf_event;
+struct perf_event_attr;
 
 /* Type description */
 
@@ -44,17 +45,17 @@ struct lttng_enum_entry {
        const char *string;
 };
 
-#define __type_integer(_type, _byte_order, _base)              \
+#define __type_integer(_type, _byte_order, _base, _encoding)   \
        {                                                       \
            .atype = atype_integer,                             \
            .u.basic.integer =                                  \
                {                                               \
-                 .size = sizeof(_type),                        \
+                 .size = sizeof(_type) * CHAR_BIT,             \
                  .alignment = ltt_alignof(_type) * CHAR_BIT,   \
                  .signedness = is_signed_type(_type),          \
                  .reverse_byte_order = _byte_order != __BYTE_ORDER,    \
                  .base = _base,                                \
-                 .encoding = lttng_encode_none,                \
+                 .encoding = lttng_encode_##_encoding,         \
                },                                              \
        }                                                       \
 
@@ -116,17 +117,18 @@ struct lttng_event_field {
 struct lttng_ctx_field {
        const char *name;
        struct lttng_type type;
-       void *ctx_field_callback;
+       void *callback;
        union {
                struct {
                        struct perf_event **e;  /* per-cpu array */
-                       struct list_head *head;
+                       struct list_head head;
+                       struct perf_event_attr *attr;
                } perf_counter;
        } u;
 };
 
 struct lttng_ctx {
-       const struct lttng_ctx_field *fields;
+       struct lttng_ctx_field *fields;
        unsigned int nr_fields;
        unsigned int allocated_fields;
 };
@@ -178,7 +180,8 @@ struct ltt_channel_ops {
        void (*channel_destroy)(struct channel *chan);
        struct lib_ring_buffer *(*buffer_read_open)(struct channel *chan);
        void (*buffer_read_close)(struct lib_ring_buffer *buf);
-       int (*event_reserve)(struct lib_ring_buffer_ctx *ctx);
+       int (*event_reserve)(struct lib_ring_buffer_ctx *ctx,
+                            uint32_t event_id);
        void (*event_commit)(struct lib_ring_buffer_ctx *ctx);
        void (*event_write)(struct lib_ring_buffer_ctx *ctx, const void *src,
                            size_t len);
@@ -240,13 +243,10 @@ struct ltt_channel *ltt_global_channel_create(struct ltt_session *session,
                                       size_t subbuf_size, size_t num_subbuf,
                                       unsigned int switch_timer_interval,
                                       unsigned int read_timer_interval);
-void _ltt_channel_destroy(struct ltt_channel *chan);
 
 struct ltt_event *ltt_event_create(struct ltt_channel *chan,
-                                  char *name,
                                   struct lttng_kernel_event *event_param,
                                   void *filter);
-int ltt_event_unregister(struct ltt_event *event);
 
 void ltt_transport_register(struct ltt_transport *transport);
 void ltt_transport_unregister(struct ltt_transport *transport);
@@ -279,6 +279,7 @@ int lttng_kprobes_register(const char *name,
        return -ENOSYS;
 }
 
+static inline
 void lttng_kprobes_unregister(struct ltt_event *event)
 {
 }