Add loglevel enable/disable support

[lttng-ust.git] / include / lttng / ust-events.h

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index afcc67f910795aaf10cfa63a2be3e0fa58f34741..5867b124878c6993291591094d049634c5c699f1 100644 (file)
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -19,6 +19,7 @@
  */
 
 #include <urcu/list.h>
+#include <urcu/hlist.h>
 #include <uuid/uuid.h>
 #include <stdint.h>
 #include <lttng/ust-abi.h>
@@ -183,19 +184,53 @@ struct lttng_ctx {
        unsigned int allocated_fields;
 };
 
+struct tracepoint_loglevel_entry  {
+       const char *identifier;
+       long value;
+};
+
+/*
+ * Entry describing an active loglevel, along with the event attribute
+ * and channel information configuring the events that need to be
+ * enabled.
+ */
+struct loglevel_entry {
+       struct cds_hlist_node hlist;
+       struct ltt_channel *chan;
+       struct lttng_ctx *ctx;  /* TODO */
+       struct lttng_ust_event event_param;
+       struct cds_list_head events;    /* list of events enabled */
+       struct cds_list_head list;      /* per-session list of loglevels */
+       unsigned int enabled:1;
+       char name[0];
+};
+
 struct lttng_event_desc {
        const char *name;
        void *probe_callback;
        const struct lttng_event_ctx *ctx;      /* context */
        const struct lttng_event_field *fields; /* event payload */
        unsigned int nr_fields;
+       const struct tracepoint_loglevel_entry **loglevel;
 };
 
 struct lttng_probe_desc {
-       const struct lttng_event_desc *event_desc;
+       const char *provider;
+       const struct lttng_event_desc **event_desc;
        unsigned int nr_events;
+       const struct tracepoint_loglevel_entry **loglevels;
+       unsigned int nr_loglevels;
        struct cds_list_head head;              /* chain registered probes */
-       struct tracepoint_loglevel *loglevels;
+};
+
+struct tp_list_entry {
+       struct lttng_ust_tracepoint_iter tp;
+       struct cds_list_head head;
+};
+
+struct lttng_ust_tracepoint_list {
+       struct tp_list_entry *iter;
+       struct cds_list_head head;
 };
 
 struct ust_pending_probe;
@@ -203,6 +238,9 @@ struct ust_pending_probe;
 /*
  * ltt_event structure is referred to by the tracing fast path. It must be
  * kept small.
+ * Note about loglevel_list: this list is only used to enable/disable
+ * events on a per-loglevel basis. The events created internally by the
+ * loglevel are only freed when the session is destroyed.
  */
 struct ltt_event {
        unsigned int id;
@@ -215,8 +253,9 @@ struct ltt_event {
        union {
        } u;
        struct cds_list_head list;              /* Event list */
+       struct cds_list_head loglevel_list;     /* Event list for loglevel */
        struct ust_pending_probe *pending_probe;
-       int metadata_dumped:1;
+       unsigned int metadata_dumped:1;
 };
 
 struct channel;
@@ -276,7 +315,7 @@ struct ltt_channel {
        struct ltt_channel_ops *ops;
        int header_type;                /* 0: unset, 1: compact, 2: large */
        struct lttng_ust_shm_handle *handle;    /* shared-memory handle */
-       int metadata_dumped:1;
+       unsigned int metadata_dumped:1;
 
        /* Channel ID, available for consumer too */
        unsigned int id;
@@ -291,10 +330,11 @@ struct ltt_session {
        struct ltt_channel *metadata;   /* Metadata channel */
        struct cds_list_head chan;      /* Channel list head */
        struct cds_list_head events;    /* Event list head */
+       struct cds_list_head loglevels; /* Loglevel list head */
        struct cds_list_head list;      /* Session list */
        unsigned int free_chan_id;      /* Next chan ID to allocate */
        uuid_t uuid;                    /* Trace session unique ID */
-       int metadata_dumped:1;
+       unsigned int metadata_dumped:1;
 };
 
 struct ltt_transport {
@@ -303,17 +343,6 @@ struct ltt_transport {
        struct ltt_channel_ops ops;
 };
 
-struct tracepoint_loglevel_enum_entry  {
-       const char *identifier;
-       long value;
-};
-
-/* mapping between tracepoint and loglevel */
-struct tracepoint_loglevel {
-       const char *name;
-       const struct tracepoint_loglevel_enum_entry *loglevel;
-};
-
 struct ltt_session *ltt_session_create(void);
 int ltt_session_enable(struct ltt_session *session);
 int ltt_session_disable(struct ltt_session *session);
@@ -336,9 +365,10 @@ struct ltt_channel *ltt_global_channel_create(struct ltt_session *session,
                                       int *shm_fd, int *wait_fd,
                                       uint64_t *memory_map_size);
 
-struct ltt_event *ltt_event_create(struct ltt_channel *chan,
-                                  struct lttng_ust_event *event_param,
-                                  void *filter);
+int ltt_event_create(struct ltt_channel *chan,
+               struct lttng_ust_event *event_param,
+               void *filter,
+               struct ltt_event **event);
 
 int ltt_channel_enable(struct ltt_channel *channel);
 int ltt_channel_disable(struct ltt_channel *channel);
@@ -375,4 +405,20 @@ const struct lttng_ust_lib_ring_buffer_client_cb *lttng_client_callbacks_overwri
 
 struct ltt_transport *ltt_transport_find(const char *name);
 
+int ltt_probes_get_event_list(struct lttng_ust_tracepoint_list *list);
+void ltt_probes_prune_event_list(struct lttng_ust_tracepoint_list *list);
+struct lttng_ust_tracepoint_iter *
+       lttng_ust_tracepoint_list_get_iter_next(struct lttng_ust_tracepoint_list *list);
+
+struct loglevel_entry *get_loglevel(const char *name);
+struct loglevel_entry *add_loglevel(const char *name,
+       struct ltt_channel *chan,
+       struct lttng_ust_event *event_param);
+void _remove_loglevel(struct loglevel_entry *e);
+int ltt_loglevel_enable(struct loglevel_entry *loglevel);
+int ltt_loglevel_disable(struct loglevel_entry *loglevel);
+int ltt_loglevel_create(struct ltt_channel *chan,
+       struct lttng_ust_event *event_param,
+       struct loglevel_entry **_entry);
+
 #endif /* _LTTNG_UST_EVENTS_H */