ust consumer: close shm fd after mapping it

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

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 7f5cff846f52dd2b2099023007421759ad9fa3d6..4d1cace5c0cd582554b37d31da32cb1ec1629af6 100644 (file)
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -216,6 +216,31 @@ struct loglevel_entry {
        char name[0];
 };
 
+/*
+ * Entry describing a per-session active wildcard, along with the event
+ * attribute and channel information configuring the events that need to
+ * be enabled.
+ */
+struct session_wildcard {
+       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 wildcards */
+       struct cds_list_head session_list;
+       struct wildcard_entry *entry;
+       unsigned int enabled:1;
+};
+
+/*
+ * Entry describing an active wildcard (per name) for all sessions.
+ */
+struct wildcard_entry {
+       struct cds_list_head list;
+       struct cds_list_head session_list;
+       char name[0];
+};
+
 struct lttng_event_desc {
        const char *name;
        void *probe_callback;
@@ -265,6 +290,7 @@ struct ltt_event {
        } 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;
 };
@@ -278,14 +304,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,
@@ -342,6 +368,7 @@ struct ltt_session {
        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 */
        uuid_t uuid;                    /* Trace session unique ID */
@@ -365,16 +392,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,
@@ -433,4 +460,15 @@ 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,
+       struct lttng_ust_event *event_param);
+void _remove_wildcard(struct session_wildcard *wildcard);
+int ltt_wildcard_enable(struct session_wildcard *wildcard);
+int ltt_wildcard_disable(struct session_wildcard *wildcard);
+int ltt_wildcard_create(struct ltt_channel *chan,
+       struct lttng_ust_event *event_param,
+       struct session_wildcard **sl);
+
 #endif /* _LTTNG_UST_EVENTS_H */