X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt-events.h;h=9c6fcac31a7a9207ad718be60a733c365755111c;hb=24cedcfefbfe781af5430e07a327030cc7caddfc;hp=5fd0b67a0c5137cbbd0e68ad67fd1c3254e61302;hpb=30bdb6e41d33f7ce7b4eb51f363423c1dc9fd88e;p=lttng-modules.git diff --git a/ltt-events.h b/ltt-events.h index 5fd0b67a..9c6fcac3 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,6 +16,9 @@ #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; @@ -45,7 +50,7 @@ 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 = \ @@ -55,7 +60,7 @@ struct lttng_enum_entry { .signedness = is_signed_type(_type), \ .reverse_byte_order = _byte_order != __BYTE_ORDER, \ .base = _base, \ - .encoding = lttng_encode_none, \ + .encoding = lttng_encode_##_encoding, \ }, \ } \ @@ -115,16 +120,20 @@ struct lttng_event_field { }; struct lttng_ctx_field { - const char *name; - struct lttng_type type; - void *callback; + 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 list_head head; + 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 { @@ -139,6 +148,7 @@ struct lttng_event_desc { 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 { @@ -156,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 { @@ -180,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); @@ -190,18 +202,20 @@ struct ltt_channel_ops { * 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); + wait_queue_head_t *(*get_reader_wait_queue)(struct channel *chan); + wait_queue_head_t *(*get_hp_wait_queue)(struct channel *chan); + int (*is_finalized)(struct channel *chan); }; 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 */ unsigned int free_event_id; /* Next event ID to allocate */ 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; @@ -209,6 +223,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 */ @@ -259,6 +274,18 @@ 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, @@ -267,6 +294,7 @@ int lttng_kprobes_register(const char *name, 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, @@ -282,6 +310,11 @@ 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 @@ -289,6 +322,7 @@ 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, @@ -302,5 +336,13 @@ 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 */