X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt-events.h;h=ec70eceadc69986627e2b02031a3b41324185c86;hb=8289661dc0d57d1fe33253b651100ccabe5945da;hp=e10c66c8f2d92460b8e3684107554e68a9486995;hpb=e0a7a7c4a6a88a60ae40baeb4f4656f58175993a;p=lttng-modules.git diff --git a/ltt-events.h b/ltt-events.h index e10c66c8..ec70ecea 100644 --- a/ltt-events.h +++ b/ltt-events.h @@ -7,6 +7,8 @@ * Copyright 2010 (c) - Mathieu Desnoyers * * Holds LTTng per-session event registry. + * + * Dual LGPL v2.1/GPL v2 license. */ #include @@ -14,9 +16,14 @@ #include #include "ltt-debugfs-abi.h" +#undef is_signed_type +#define is_signed_type(type) (((type)(-1)) < 0) + struct ltt_channel; struct ltt_session; struct lib_ring_buffer_ctx; +struct perf_event; +struct perf_event_attr; /* Type description */ @@ -43,17 +50,17 @@ struct lttng_enum_entry { const char *string; }; -#define __type_integer(_type, _byte_order, _base) \ +#define __type_integer(_type, _byte_order, _base, _encoding) \ { \ .atype = atype_integer, \ .u.basic.integer = \ { \ - .size = sizeof(_type), \ + .size = sizeof(_type) * CHAR_BIT, \ .alignment = ltt_alignof(_type) * CHAR_BIT, \ .signedness = is_signed_type(_type), \ .reverse_byte_order = _byte_order != __BYTE_ORDER, \ .base = _base, \ - .encoding = lttng_encode_none, \ + .encoding = lttng_encode_##_encoding, \ }, \ } \ @@ -112,11 +119,36 @@ struct lttng_event_field { struct lttng_type type; }; +struct lttng_ctx_field { + struct lttng_event_field event_field; + size_t (*get_size)(size_t offset); + void (*record)(struct lttng_ctx_field *field, + struct lib_ring_buffer_ctx *ctx, + struct ltt_channel *chan); + union { + struct { + struct perf_event **e; /* per-cpu array */ + struct notifier_block nb; + int hp_enable; + struct perf_event_attr *attr; + } perf_counter; + } u; + void (*destroy)(struct lttng_ctx_field *field); +}; + +struct lttng_ctx { + struct lttng_ctx_field *fields; + unsigned int nr_fields; + unsigned int allocated_fields; +}; + struct lttng_event_desc { - const struct lttng_event_field *fields; 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; + struct module *owner; }; struct lttng_probe_desc { @@ -134,6 +166,7 @@ struct ltt_event { struct ltt_channel *chan; const struct lttng_event_desc *desc; void *filter; + struct lttng_ctx *ctx; enum lttng_kernel_instrumentation instrumentation; union { struct { @@ -158,7 +191,8 @@ struct ltt_channel_ops { void (*channel_destroy)(struct channel *chan); struct lib_ring_buffer *(*buffer_read_open)(struct channel *chan); void (*buffer_read_close)(struct lib_ring_buffer *buf); - int (*event_reserve)(struct lib_ring_buffer_ctx *ctx); + int (*event_reserve)(struct lib_ring_buffer_ctx *ctx, + uint32_t event_id); void (*event_commit)(struct lib_ring_buffer_ctx *ctx); void (*event_write)(struct lib_ring_buffer_ctx *ctx, const void *src, size_t len); @@ -174,6 +208,7 @@ struct ltt_channel_ops { struct ltt_channel { unsigned int id; struct channel *chan; /* Channel buffers */ + struct lttng_ctx *ctx; /* Event ID management */ struct ltt_session *session; struct file *file; /* File associated to channel */ @@ -187,6 +222,7 @@ struct ltt_channel { struct ltt_session { int active; /* Is trace session active ? */ + int been_active; /* Has trace session been active ? */ struct file *file; /* File associated to session */ struct ltt_channel *metadata; /* Metadata channel */ struct list_head chan; /* Channel list head */ @@ -220,13 +256,10 @@ struct ltt_channel *ltt_global_channel_create(struct ltt_session *session, size_t subbuf_size, size_t num_subbuf, unsigned int switch_timer_interval, unsigned int read_timer_interval); -void _ltt_channel_destroy(struct ltt_channel *chan); struct ltt_event *ltt_event_create(struct ltt_channel *chan, - char *name, struct lttng_kernel_event *event_param, void *filter); -int ltt_event_unregister(struct ltt_event *event); void ltt_transport_register(struct ltt_transport *transport); void ltt_transport_unregister(struct ltt_transport *transport); @@ -240,31 +273,75 @@ const struct lttng_event_desc *ltt_event_get(const char *name); void ltt_event_put(const struct lttng_event_desc *desc); int ltt_probes_init(void); void ltt_probes_exit(void); +struct lttng_ctx_field *lttng_append_context(struct lttng_ctx **ctx); +void lttng_remove_context_field(struct lttng_ctx **ctx, + struct lttng_ctx_field *field); +void lttng_destroy_context(struct lttng_ctx *ctx); +int lttng_add_pid_to_ctx(struct lttng_ctx **ctx); +int lttng_add_comm_to_ctx(struct lttng_ctx **ctx); +int lttng_add_prio_to_ctx(struct lttng_ctx **ctx); +int lttng_add_nice_to_ctx(struct lttng_ctx **ctx); +int lttng_add_perf_counter_to_ctx(uint32_t type, + uint64_t config, + const char *name, + struct lttng_ctx **ctx); +#ifdef CONFIG_KPROBES int lttng_kprobes_register(const char *name, const char *symbol_name, uint64_t offset, uint64_t addr, struct ltt_event *event); void lttng_kprobes_unregister(struct ltt_event *event); +void lttng_kprobes_destroy_private(struct ltt_event *event); +#else +static inline +int lttng_kprobes_register(const char *name, + const char *symbol_name, + uint64_t offset, + uint64_t addr, + struct ltt_event *event) +{ + return -ENOSYS; +} + +static inline +void lttng_kprobes_unregister(struct ltt_event *event) +{ +} + +static inline +void lttng_kprobes_destroy_private(struct ltt_event *event) +{ +} +#endif #ifdef CONFIG_DYNAMIC_FTRACE int lttng_ftrace_register(const char *name, const char *symbol_name, struct ltt_event *event); void lttng_ftrace_unregister(struct ltt_event *event); +void lttng_ftrace_destroy_private(struct ltt_event *event); #else static inline int lttng_ftrace_register(const char *name, const char *symbol_name, struct ltt_event *event) { - return 0; + return -ENOSYS; } static inline void lttng_ftrace_unregister(struct ltt_event *event) { } + +static inline +void lttng_ftrace_destroy_private(struct ltt_event *event) +{ +} #endif + +extern const struct file_operations lttng_tracepoint_list_fops; + #endif /* _LTT_EVENTS_H */