X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt-events.h;h=3aed0e217dfbc71d21db5f3db1252a659f2bf3dd;hb=80996790fa42072d6525f2adb9a910312077bef6;hp=4cb4919ff87a8620bfa5c40b959168f115229340;hpb=360f38ea4fee91e2403c03cb43841ef6769aaac7;p=lttng-modules.git diff --git a/ltt-events.h b/ltt-events.h index 4cb4919f..3aed0e21 100644 --- a/ltt-events.h +++ b/ltt-events.h @@ -12,9 +12,9 @@ */ #include -#include #include -#include "ltt-debugfs-abi.h" +#include "wrapper/uuid.h" +#include "lttng-abi.h" #undef is_signed_type #define is_signed_type(type) (((type)(-1)) < 0) @@ -67,8 +67,8 @@ struct lttng_enum_entry { struct lttng_integer_type { unsigned int size; /* in bits */ unsigned short alignment; /* in bits */ - unsigned int signedness:1; - unsigned int reverse_byte_order:1; + unsigned int signedness:1, + reverse_byte_order:1; unsigned int base; /* 2, 8, 10, 16, for pretty print */ enum lttng_string_encodings encoding; }; @@ -119,6 +119,17 @@ struct lttng_event_field { struct lttng_type type; }; +/* + * We need to keep this perf counter field separately from struct + * lttng_ctx_field because cpu hotplug needs fixed-location addresses. + */ +struct lttng_perf_counter_field { + struct notifier_block nb; + int hp_enable; + struct perf_event_attr *attr; + struct perf_event **e; /* per-cpu array */ +}; + struct lttng_ctx_field { struct lttng_event_field event_field; size_t (*get_size)(size_t offset); @@ -126,12 +137,7 @@ struct lttng_ctx_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; + struct lttng_perf_counter_field *perf_counter; } u; void (*destroy)(struct lttng_ctx_field *field); }; @@ -152,11 +158,13 @@ struct lttng_event_desc { }; struct lttng_probe_desc { - const struct lttng_event_desc *event_desc; + const struct lttng_event_desc **event_desc; unsigned int nr_events; struct list_head head; /* chain registered probes */ }; +struct lttng_krp; /* Kretprobe handling */ + /* * ltt_event structure is referred to by the tracing fast path. It must be * kept small. @@ -174,12 +182,16 @@ struct ltt_event { struct kprobe kp; char *symbol_name; } kprobe; + struct { + struct lttng_krp *lttng_krp; + char *symbol_name; + } kretprobe; struct { char *symbol_name; } ftrace; } u; struct list_head list; /* Event list */ - int metadata_dumped:1; + unsigned int metadata_dumped:1; }; struct ltt_channel_ops { @@ -191,24 +203,36 @@ struct ltt_channel_ops { unsigned int read_timer_interval); void (*channel_destroy)(struct channel *chan); struct lib_ring_buffer *(*buffer_read_open)(struct channel *chan); + int (*buffer_has_read_closed_stream)(struct channel *chan); void (*buffer_read_close)(struct lib_ring_buffer *buf); 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); + void (*event_write_from_user)(struct lib_ring_buffer_ctx *ctx, + const void *src, size_t len); + void (*event_memset)(struct lib_ring_buffer_ctx *ctx, + int c, 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 channel *chan); + wait_queue_head_t *(*get_writer_buf_wait_queue)(struct channel *chan, int cpu); wait_queue_head_t *(*get_hp_wait_queue)(struct channel *chan); int (*is_finalized)(struct channel *chan); int (*is_disabled)(struct channel *chan); }; +struct ltt_transport { + char *name; + struct module *owner; + struct list_head node; + struct ltt_channel_ops ops; +}; + struct ltt_channel { unsigned int id; struct channel *chan; /* Channel buffers */ @@ -220,8 +244,14 @@ struct ltt_channel { unsigned int free_event_id; /* Next event ID to allocate */ struct list_head list; /* Channel list */ struct ltt_channel_ops *ops; + struct ltt_transport *transport; + struct ltt_event **sc_table; /* for syscall tracing */ + struct ltt_event **compat_sc_table; + struct ltt_event *sc_unknown; /* for unknown syscalls */ + struct ltt_event *sc_compat_unknown; + struct ltt_event *sc_exit; /* for syscall exit */ int header_type; /* 0: unset, 1: compact, 2: large */ - int metadata_dumped:1; + unsigned int metadata_dumped:1; }; struct ltt_session { @@ -234,14 +264,7 @@ struct ltt_session { 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; -}; - -struct ltt_transport { - char *name; - struct module *owner; - struct list_head node; - struct ltt_channel_ops ops; + unsigned int metadata_dumped:1; }; struct ltt_session *ltt_session_create(void); @@ -263,7 +286,8 @@ struct ltt_channel *ltt_global_channel_create(struct ltt_session *session, struct ltt_event *ltt_event_create(struct ltt_channel *chan, struct lttng_kernel_event *event_param, - void *filter); + void *filter, + const struct lttng_event_desc *internal_desc); int ltt_channel_enable(struct ltt_channel *channel); int ltt_channel_disable(struct ltt_channel *channel); @@ -274,8 +298,8 @@ void ltt_transport_register(struct ltt_transport *transport); void ltt_transport_unregister(struct ltt_transport *transport); void synchronize_trace(void); -int ltt_debugfs_abi_init(void); -void ltt_debugfs_abi_exit(void); +int lttng_abi_init(void); +void lttng_abi_exit(void); int ltt_probe_register(struct lttng_probe_desc *desc); void ltt_probe_unregister(struct lttng_probe_desc *desc); @@ -283,12 +307,29 @@ 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); + +#ifdef CONFIG_HAVE_SYSCALL_TRACEPOINTS +int lttng_syscalls_register(struct ltt_channel *chan, void *filter); +int lttng_syscalls_unregister(struct ltt_channel *chan); +#else +static inline int lttng_syscalls_register(struct ltt_channel *chan, void *filter) +{ + return -ENOSYS; +} + +static inline int lttng_syscalls_unregister(struct ltt_channel *chan) +{ + return 0; +} +#endif + struct lttng_ctx_field *lttng_append_context(struct lttng_ctx **ctx); +int lttng_find_context(struct lttng_ctx *ctx, const char *name); 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_procname_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_vpid_to_ctx(struct lttng_ctx **ctx); @@ -296,10 +337,21 @@ int lttng_add_tid_to_ctx(struct lttng_ctx **ctx); int lttng_add_vtid_to_ctx(struct lttng_ctx **ctx); int lttng_add_ppid_to_ctx(struct lttng_ctx **ctx); int lttng_add_vppid_to_ctx(struct lttng_ctx **ctx); +#if defined(CONFIG_PERF_EVENTS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) int lttng_add_perf_counter_to_ctx(uint32_t type, uint64_t config, const char *name, struct lttng_ctx **ctx); +#else +static inline +int lttng_add_perf_counter_to_ctx(uint32_t type, + uint64_t config, + const char *name, + struct lttng_ctx **ctx) +{ + return -ENOSYS; +} +#endif #ifdef CONFIG_KPROBES int lttng_kprobes_register(const char *name, @@ -331,6 +383,38 @@ void lttng_kprobes_destroy_private(struct ltt_event *event) } #endif +#ifdef CONFIG_KRETPROBES +int lttng_kretprobes_register(const char *name, + const char *symbol_name, + uint64_t offset, + uint64_t addr, + struct ltt_event *event_entry, + struct ltt_event *event_exit); +void lttng_kretprobes_unregister(struct ltt_event *event); +void lttng_kretprobes_destroy_private(struct ltt_event *event); +#else +static inline +int lttng_kretprobes_register(const char *name, + const char *symbol_name, + uint64_t offset, + uint64_t addr, + struct ltt_event *event_entry, + struct ltt_event *event_exit) +{ + return -ENOSYS; +} + +static inline +void lttng_kretprobes_unregister(struct ltt_event *event) +{ +} + +static inline +void lttng_kretprobes_destroy_private(struct ltt_event *event) +{ +} +#endif + #ifdef CONFIG_DYNAMIC_FTRACE int lttng_ftrace_register(const char *name, const char *symbol_name, @@ -357,6 +441,12 @@ void lttng_ftrace_destroy_private(struct ltt_event *event) } #endif +int lttng_calibrate(struct lttng_kernel_calibrate *calibrate); + extern const struct file_operations lttng_tracepoint_list_fops; +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) +#define TRACEPOINT_HAS_DATA_ARG +#endif + #endif /* _LTT_EVENTS_H */