X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Fust-events.h;h=05966ff69e344218daf0fa29b9e401843e3b7eac;hb=13b21cd60df2abab292653cead980ef27dbfab08;hp=f501fd1459bd6e96356ab52f1a3ddc424447aeb0;hpb=a543151c94023ca7c694cb89c4d9cecceda775dd;p=lttng-ust.git diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h index f501fd14..05966ff6 100644 --- a/include/lttng/ust-events.h +++ b/include/lttng/ust-events.h @@ -17,6 +17,14 @@ * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ #include @@ -233,12 +241,14 @@ struct lttng_event_desc { } u; }; -#define LTTNG_UST_PROBE_DESC_PADDING 40 +#define LTTNG_UST_PROBE_DESC_PADDING 20 struct lttng_probe_desc { const char *provider; const struct lttng_event_desc **event_desc; unsigned int nr_events; struct cds_list_head head; /* chain registered probes */ + struct cds_list_head lazy_init_head; + int lazy; /* lazy registration */ char padding[LTTNG_UST_PROBE_DESC_PADDING]; }; @@ -299,10 +309,19 @@ struct lttng_ust_filter_bytecode_node { struct lttng_ust_filter_bytecode bc; }; +/* + * Filter return value masks. + */ +enum lttng_filter_ret { + LTTNG_FILTER_DISCARD = 0, + LTTNG_FILTER_RECORD_FLAG = (1ULL << 0), + /* Other bits are kept for future use. */ +}; + struct lttng_bytecode_runtime { /* Associated bytecode */ struct lttng_ust_filter_bytecode_node *bc; - int (*filter)(void *filter_data, const char *filter_stack_data); + uint64_t (*filter)(void *filter_data, const char *filter_stack_data); int link_failed; struct cds_list_head node; /* list of bytecode runtime in event */ }; @@ -337,14 +356,15 @@ struct lttng_event { struct cds_list_head node; /* Event list in session */ struct cds_list_head _deprecated2; void *_deprecated3; - unsigned int metadata_dumped:1; + unsigned int _deprecated4:1; /* LTTng-UST 2.1 starts here */ /* list of struct lttng_bytecode_runtime, sorted by seqnum */ struct cds_list_head bytecode_runtime_head; - + int has_enablers_without_bytecode; /* Backward references: list of lttng_enabler_ref (ref to enablers) */ struct cds_list_head enablers_ref_head; + struct cds_hlist_node hlist; /* session ht of events */ }; struct channel; @@ -357,25 +377,17 @@ struct lttng_ust_shm_handle; */ struct lttng_channel_ops { struct lttng_channel *(*channel_create)(const char *name, - 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, - struct lttng_channel *chan_priv_init); - void (*channel_destroy)(struct lttng_channel *lttng_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); - void (*buffer_read_close)(struct lttng_ust_lib_ring_buffer *buf, - struct lttng_ust_shm_handle *handle); + void *buf_addr, + size_t subbuf_size, size_t num_subbuf, + unsigned int switch_timer_interval, + unsigned int read_timer_interval, + unsigned char *uuid); + void (*channel_destroy)(struct lttng_channel *chan); int (*event_reserve)(struct lttng_ust_lib_ring_buffer_ctx *ctx, uint32_t event_id); void (*event_commit)(struct lttng_ust_lib_ring_buffer_ctx *ctx); - void (*event_write)(struct lttng_ust_lib_ring_buffer_ctx *ctx, const void *src, - size_t len); + void (*event_write)(struct lttng_ust_lib_ring_buffer_ctx *ctx, + const void *src, size_t len); /* * packet_avail_size returns the available size in the current * packet. Note that the size returned is only a hint, since it @@ -408,21 +420,21 @@ struct lttng_channel { /* Event ID management */ struct lttng_session *session; int objd; /* Object associated to channel */ - unsigned int free_event_id; /* Next event ID to allocate */ - unsigned int used_event_id; /* Max allocated event IDs */ + unsigned int _deprecated1; + unsigned int _deprecated2; struct cds_list_head node; /* Channel list in session */ - struct lttng_channel_ops *ops; + const struct lttng_channel_ops *ops; int header_type; /* 0: unset, 1: compact, 2: large */ struct lttng_ust_shm_handle *handle; /* shared-memory handle */ - unsigned int metadata_dumped:1; + unsigned int _deprecated3:1; - /* Channel ID, available for consumer too */ + /* Channel ID */ unsigned int id; - /* Copy of session UUID for consumer (availability through shm) */ + enum lttng_ust_chan_type type; unsigned char uuid[LTTNG_UST_UUID_LEN]; /* Trace session unique ID */ }; -#define LTTNG_UST_EVENT_HT_BITS 6 +#define LTTNG_UST_EVENT_HT_BITS 12 #define LTTNG_UST_EVENT_HT_SIZE (1U << LTTNG_UST_EVENT_HT_BITS) struct lttng_ust_event_ht { @@ -438,24 +450,26 @@ struct lttng_session { int active; /* Is trace session active ? */ int been_active; /* Been active ? */ int objd; /* Object associated */ - struct lttng_channel *metadata; /* Metadata channel */ + void *_deprecated1; struct cds_list_head chan_head; /* Channel list head */ struct cds_list_head events_head; /* list of events */ - struct cds_list_head _deprecated1; + struct cds_list_head _deprecated2; struct cds_list_head node; /* Session list */ - unsigned int free_chan_id; /* Next chan ID to allocate */ - unsigned char uuid[LTTNG_UST_UUID_LEN]; /* Trace session unique ID */ - unsigned int metadata_dumped:1; + int _deprecated3; + unsigned int _deprecated4:1; /* New UST 2.1 */ /* List of enablers */ struct cds_list_head enablers_head; + struct lttng_ust_event_ht events_ht; /* ht of events */ + void *owner; /* object owner */ }; struct lttng_transport { char *name; struct cds_list_head node; struct lttng_channel_ops ops; + const struct lttng_ust_lib_ring_buffer_config *client_config; }; struct lttng_session *lttng_session_create(void); @@ -472,13 +486,6 @@ struct lttng_channel *lttng_channel_create(struct lttng_session *session, int **shm_fd, int **wait_fd, uint64_t **memory_map_size, struct lttng_channel *chan_priv_init); -struct lttng_channel *lttng_global_channel_create(struct lttng_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 lttng_channel_enable(struct lttng_channel *channel); int lttng_channel_disable(struct lttng_channel *channel); @@ -504,8 +511,6 @@ void synchronize_trace(void); int lttng_probe_register(struct lttng_probe_desc *desc); void lttng_probe_unregister(struct lttng_probe_desc *desc); int lttng_fix_pending_event_desc(const struct lttng_event_desc *desc); -const struct lttng_event_desc *lttng_event_get(const char *name); -void lttng_event_put(const struct lttng_event_desc *desc); int lttng_probes_init(void); void lttng_probes_exit(void); int lttng_find_context(struct lttng_ctx *ctx, const char *name); @@ -542,5 +547,6 @@ void lttng_free_event_filter_runtime(struct lttng_event *event); void lttng_filter_sync_state(struct lttng_bytecode_runtime *runtime); struct cds_list_head *lttng_get_probe_list_head(void); +int lttng_session_active(void); #endif /* _LTTNG_UST_EVENTS_H */