Use LTTNG_KERNEL_* namespace for exported header

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

diff --git a/ltt-events.h b/ltt-events.h
index a5eab5b8b7ca1fecf5ed681282be8a1b08aee123..7076185308f59fce9140ff87e8a438a28ba7ef27 100644 (file)
--- a/ltt-events.h
+++ b/ltt-events.h
@@ -128,14 +128,14 @@ struct ltt_event {
        struct ltt_channel *chan;
        const struct lttng_event_desc *desc;
        void *filter;
-       enum instrum_type itype;
+       enum lttng_kernel_instrumentation instrumentation;
        struct list_head list;          /* Event list */
        int metadata_dumped:1;
 };
 
 struct ltt_channel_ops {
        struct channel *(*channel_create)(const char *name,
-                               struct ltt_session *session,
+                               struct ltt_channel *ltt_chan,
                                void *buf_addr,
                                size_t subbuf_size, size_t num_subbuf,
                                unsigned int switch_timer_interval,
@@ -166,8 +166,8 @@ struct ltt_channel {
        struct list_head list;          /* Channel list */
        wait_queue_head_t notify_wait;  /* Channel addition notif. waitqueue */
        struct ltt_channel_ops *ops;
+       int header_type;                /* 0: unset, 1: compact, 2: large */
        int metadata_dumped:1;
-       int header_type:2;              /* 0: unset, 1: compact, 2: large */
 };
 
 struct ltt_session {
@@ -209,11 +209,10 @@ void _ltt_channel_destroy(struct ltt_channel *chan);
 
 struct ltt_event *ltt_event_create(struct ltt_channel *chan,
                                   char *name,
-                                  enum instrum_type itype,
+                                  enum lttng_kernel_instrumentation instrumentation,
                                   const struct lttng_event_desc *event_desc,
                                   void *filter);
-int _ltt_event_unregister(struct ltt_event *event);
-void _ltt_event_destroy(struct ltt_event *event);
+int ltt_event_unregister(struct ltt_event *event);
 
 void ltt_transport_register(struct ltt_transport *transport);
 void ltt_transport_unregister(struct ltt_transport *transport);