Pre-assign fixed loglevels

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

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index b74a176755af19f0bc12da564035a14db5bd3877..249f42365ce31f90d6132bab4324d4254fbfadb8 100644 (file)
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -189,33 +189,6 @@ struct tracepoint_loglevel_entry  {
        long value;
 };
 
-struct loglevel_entry;
-
-/*
- * Entry describing a per-session active loglevel, along with the event
- * attribute and channel information configuring the events that need to
- * be enabled.
- */
-struct session_loglevel {
-       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 */
-       struct cds_list_head session_list;
-       struct loglevel_entry *entry;
-       unsigned int enabled:1;
-};
-
-/*
- * Entry describing an active loglevel (per name) for all sessions.
- */
-struct loglevel_entry {
-       struct cds_hlist_node hlist;
-       struct cds_list_head session_list;
-       char name[0];
-};
-
 /*
  * Entry describing a per-session active wildcard, along with the event
  * attribute and channel information configuring the events that need to
@@ -227,7 +200,7 @@ struct session_wildcard {
        struct lttng_ust_event event_param;
        struct cds_list_head events;    /* list of events enabled */
        struct cds_list_head list;      /* per-session list of wildcards */
-       struct cds_list_head session_list;
+       struct cds_list_head session_list; /* node of session wildcard list */
        struct wildcard_entry *entry;
        unsigned int enabled:1;
 };
@@ -236,7 +209,9 @@ struct session_wildcard {
  * Entry describing an active wildcard (per name) for all sessions.
  */
 struct wildcard_entry {
+       /* node of global wildcards list */
        struct cds_list_head list;
+       /* head of session list to which this wildcard apply */
        struct cds_list_head session_list;
        char name[0];
 };
@@ -289,7 +264,6 @@ struct ltt_event {
        union {
        } u;
        struct cds_list_head list;              /* Event list */
-       struct cds_list_head loglevel_list;     /* Event list for loglevel */
        struct cds_list_head wildcard_list;     /* Event list for wildcard */
        struct ust_pending_probe *pending_probe;
        unsigned int metadata_dumped:1;
@@ -304,14 +278,14 @@ struct ltt_channel_ops {
                                size_t subbuf_size, size_t num_subbuf,
                                unsigned int switch_timer_interval,
                                unsigned int read_timer_interval,
-                               int *shm_fd, int *wait_fd,
-                               uint64_t *memory_map_size,
+                               int **shm_fd, int **wait_fd,
+                               uint64_t **memory_map_size,
                                struct ltt_channel *chan_priv_init);
        void (*channel_destroy)(struct ltt_channel *ltt_chan);
        struct lttng_ust_lib_ring_buffer *(*buffer_read_open)(struct channel *chan,
                                struct lttng_ust_shm_handle *handle,
-                               int *shm_fd, int *wait_fd,
-                               uint64_t *memory_map_size);
+                               int **shm_fd, int **wait_fd,
+                               uint64_t **memory_map_size);
        void (*buffer_read_close)(struct lttng_ust_lib_ring_buffer *buf,
                                struct lttng_ust_shm_handle *handle);
        int (*event_reserve)(struct lttng_ust_lib_ring_buffer_ctx *ctx,
@@ -367,7 +341,6 @@ 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 wildcards; /* Wildcard list head */
        struct cds_list_head list;      /* Session list */
        unsigned int free_chan_id;      /* Next chan ID to allocate */
@@ -392,16 +365,16 @@ struct ltt_channel *ltt_channel_create(struct ltt_session *session,
                                       size_t subbuf_size, size_t num_subbuf,
                                       unsigned int switch_timer_interval,
                                       unsigned int read_timer_interval,
-                                      int *shm_fd, int *wait_fd,
-                                      uint64_t *memory_map_size,
+                                      int **shm_fd, int **wait_fd,
+                                      uint64_t **memory_map_size,
                                       struct ltt_channel *chan_priv_init);
 struct ltt_channel *ltt_global_channel_create(struct ltt_session *session,
                                       int overwrite, void *buf_addr,
                                       size_t subbuf_size, size_t num_subbuf,
                                       unsigned int switch_timer_interval,
                                       unsigned int read_timer_interval,
-                                      int *shm_fd, int *wait_fd,
-                                      uint64_t *memory_map_size);
+                                      int **shm_fd, int **wait_fd,
+                                      uint64_t **memory_map_size);
 
 int ltt_event_create(struct ltt_channel *chan,
                struct lttng_ust_event *event_param,
@@ -448,18 +421,6 @@ 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 *get_loglevel_value(int64_t value);
-struct session_loglevel *add_loglevel(const char *name,
-       struct ltt_channel *chan,
-       struct lttng_ust_event *event_param);
-void _remove_loglevel(struct session_loglevel *loglevel);
-int ltt_loglevel_enable(struct session_loglevel *loglevel);
-int ltt_loglevel_disable(struct session_loglevel *loglevel);
-int ltt_loglevel_create(struct ltt_channel *chan,
-       struct lttng_ust_event *event_param,
-       struct session_loglevel **sl);
-
 struct wildcard_entry *match_wildcard(const char *name);
 struct session_wildcard *add_wildcard(const char *name,
        struct ltt_channel *chan,