X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ltt-events.h;h=0b4638975cd718fc9e5e01885ed5f1ed89e03f1e;hb=833ad6a0c344849269df6875f40c3d7cb21529d3;hp=3bacac785a2acd007f0a8c3bf5c06471100d7165;hpb=cd4bd11fe2d3232089186a5b9b021b7cb504a8fb;p=lttng-modules.git diff --git a/ltt-events.h b/ltt-events.h index 3bacac78..0b463897 100644 --- a/ltt-events.h +++ b/ltt-events.h @@ -10,11 +10,15 @@ */ #include +#include +#include #include "ltt-debugfs-abi.h" struct ltt_channel; struct ltt_session; struct lib_ring_buffer_ctx; +struct perf_event; +struct perf_event_attr; /* Type description */ @@ -30,8 +34,9 @@ enum abstract_types { /* Update the string_encodings name table in lttng-types.c along with this enum */ enum lttng_string_encodings { - lttng_encode_UTF8 = 0, - lttng_encode_ASCII = 1, + lttng_encode_none = 0, + lttng_encode_UTF8 = 1, + lttng_encode_ASCII = 2, NR_STRING_ENCODINGS, }; @@ -40,15 +45,17 @@ struct lttng_enum_entry { const char *string; }; -#define __type_integer(_type, _byte_order) \ +#define __type_integer(_type, _byte_order, _base) \ { \ .atype = atype_integer, \ .u.basic.integer = \ { \ .size = sizeof(_type), \ - .alignment = __alignof__(_type), \ + .alignment = ltt_alignof(_type) * CHAR_BIT, \ .signedness = is_signed_type(_type), \ .reverse_byte_order = _byte_order != __BYTE_ORDER, \ + .base = _base, \ + .encoding = lttng_encode_none, \ }, \ } \ @@ -57,6 +64,8 @@ struct lttng_integer_type { unsigned short alignment; /* in bits */ unsigned int signedness:1; unsigned int reverse_byte_order:1; + unsigned int base; /* 2, 8, 10, 16, for pretty print */ + enum lttng_string_encodings encoding; }; union _lttng_basic_type { @@ -102,13 +111,33 @@ struct lttng_enum { struct lttng_event_field { const char *name; - const struct lttng_type type; + struct lttng_type type; +}; + +struct lttng_ctx_field { + const char *name; + struct lttng_type type; + void *callback; + union { + struct { + struct perf_event **e; /* per-cpu array */ + struct list_head head; + struct perf_event_attr *attr; + } perf_counter; + } u; +}; + +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; }; @@ -127,14 +156,23 @@ struct ltt_event { struct ltt_channel *chan; const struct lttng_event_desc *desc; void *filter; - enum instrum_type itype; + enum lttng_kernel_instrumentation instrumentation; + union { + struct { + struct kprobe kp; + char *symbol_name; + } kprobe; + struct { + char *symbol_name; + } ftrace; + } u; struct list_head list; /* Event list */ int metadata_dumped:1; }; struct ltt_channel_ops { struct channel *(*channel_create)(const char *name, - struct ltt_session *session, + struct ltt_channel *ltt_chan, void *buf_addr, size_t subbuf_size, size_t num_subbuf, unsigned int switch_timer_interval, @@ -146,6 +184,12 @@ struct ltt_channel_ops { void (*event_commit)(struct lib_ring_buffer_ctx *ctx); void (*event_write)(struct 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 + * may change due to concurrent writes. + */ + size_t (*packet_avail_size)(struct channel *chan); wait_queue_head_t *(*get_reader_wait_queue)(struct ltt_channel *chan); }; @@ -159,8 +203,8 @@ struct ltt_channel { struct list_head list; /* Channel list */ wait_queue_head_t notify_wait; /* Channel addition notif. waitqueue */ struct ltt_channel_ops *ops; + int header_type; /* 0: unset, 1: compact, 2: large */ int metadata_dumped:1; - int header_type:2; /* 0: unset, 1: compact, 2: large */ }; struct ltt_session { @@ -171,6 +215,7 @@ struct ltt_session { struct list_head events; /* Event list head */ struct list_head list; /* Session list */ unsigned int free_chan_id; /* Next chan ID to allocate */ + uuid_le uuid; /* Trace session unique ID */ int metadata_dumped:1; }; @@ -201,11 +246,9 @@ void _ltt_channel_destroy(struct ltt_channel *chan); struct ltt_event *ltt_event_create(struct ltt_channel *chan, char *name, - enum instrum_type itype, - const struct lttng_event_desc *event_desc, + struct lttng_kernel_event *event_param, void *filter); -int _ltt_event_unregister(struct ltt_event *event); -void _ltt_event_destroy(struct ltt_event *event); +int ltt_event_unregister(struct ltt_event *event); void ltt_transport_register(struct ltt_transport *transport); void ltt_transport_unregister(struct ltt_transport *transport); @@ -220,4 +263,46 @@ void ltt_event_put(const struct lttng_event_desc *desc); int ltt_probes_init(void); void ltt_probes_exit(void); +#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); +#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; +} + +void lttng_kprobes_unregister(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); +#else +static inline +int lttng_ftrace_register(const char *name, + const char *symbol_name, + struct ltt_event *event) +{ + return -ENOSYS; +} + +static inline +void lttng_ftrace_unregister(struct ltt_event *event) +{ +} +#endif #endif /* _LTT_EVENTS_H */