X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt-tracer.h;h=1ca13a99aa7a22af873f1e8e462f320108d9fb94;hb=6db3d13b849ff90922bd55fdaf047d746d79ba4a;hp=ac90ee73c953cbe7965b7250782af6ca4524972e;hpb=7514523fe6d6be9d94be2e577954cdd82296d20e;p=lttng-modules.git diff --git a/ltt-tracer.h b/ltt-tracer.h index ac90ee73..1ca13a99 100644 --- a/ltt-tracer.h +++ b/ltt-tracer.h @@ -9,56 +9,48 @@ #ifndef _LTT_TRACER_H #define _LTT_TRACER_H -#ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS -/* Align data on its natural alignment */ -#define RING_BUFFER_ALIGN -#endif - -#include - #include #include #include #include #include -#include #include #include -#include #include #include #include #include "ltt-tracer-core.h" -#include "ltt-channels.h" +#include "ltt-events.h" /* Number of bytes to log with a read/write event */ #define LTT_LOG_RW_SIZE 32L -struct ltt_active_marker; - /* Maximum number of callbacks per marker */ #define LTT_NR_CALLBACKS 10 +struct ltt_serialize_closure; + +/* Serialization callback */ +typedef size_t (*ltt_serialize_cb)(struct lib_ring_buffer *buf, + size_t buf_offset, + struct ltt_serialize_closure *closure, + void *serialize_private, + unsigned int stack_pos_ctx, + int *largest_align, + const char *fmt, va_list *args); + struct ltt_serialize_closure { ltt_serialize_cb *callbacks; long cb_args[LTT_NR_CALLBACKS]; unsigned int cb_idx; }; -size_t ltt_serialize_data(struct ltt_chanbuf *buf, size_t buf_offset, +size_t ltt_serialize_data(struct lib_ring_buffer *buf, size_t buf_offset, struct ltt_serialize_closure *closure, void *serialize_private, unsigned int stack_pos_ctx, int *largest_align, const char *fmt, va_list *args); -struct ltt_available_probe { - const char *name; /* probe name */ - const char *format; - marker_probe_func *probe_func; - ltt_serialize_cb callbacks[LTT_NR_CALLBACKS]; - struct list_head node; /* registered probes list */ -}; - enum ltt_channels { LTT_CHANNEL_METADATA, LTT_CHANNEL_FD_STATE, @@ -80,20 +72,8 @@ enum ltt_channels { LTT_CHANNEL_DEFAULT, }; -struct ltt_active_marker { - struct list_head node; /* active markers list */ - const char *channel; - const char *name; - const char *format; - struct ltt_available_probe *probe; -}; - -extern void ltt_vtrace(const struct marker *mdata, void *probe_data, - void *call_data, const char *fmt, va_list *args); -extern void ltt_trace(const struct marker *mdata, void *probe_data, - void *call_data, const char *fmt, ...); - -size_t ltt_serialize_printf(struct ltt_chanbuf *buf, unsigned long buf_offset, +#if 0 +size_t ltt_serialize_printf(struct lib_ring_buffer *buf, unsigned long buf_offset, size_t *msg_size, char *output, size_t outlen, const char *fmt); @@ -123,23 +103,13 @@ struct user_dbg_data { unsigned long read; }; -struct ltt_trace_ops { - int (*create_dirs) (struct ltt_trace *new_trace); - void (*remove_dirs) (struct ltt_trace *new_trace); -}; - -struct ltt_transport { - char *name; - struct module *owner; - struct list_head node; - struct ltt_trace_ops ops; -}; - enum trace_mode { LTT_TRACE_NORMAL, LTT_TRACE_FLIGHT, LTT_TRACE_HYBRID }; #define CHANNEL_FLAG_ENABLE (1U<<0) #define CHANNEL_FLAG_OVERWRITE (1U<<1) +#endif //0 +#if 0 /* Per-trace information - each trace/flight recorder represented by one */ struct ltt_trace { /* First 32 bytes cache-hot cacheline */ @@ -165,6 +135,7 @@ struct ltt_trace { wait_queue_head_t kref_wq; /* Place for ltt_trace_destroy to sleep */ char trace_name[NAME_MAX]; } ____cacheline_aligned; +#endif //0 /* * Hardcoded event headers @@ -215,13 +186,24 @@ struct event_header { * because gcc generates poor code on at least powerpc and mips. Don't ever * let gcc add padding between the structure elements. */ -struct subbuffer_header { - uint64_t cycle_count_begin; /* Cycle count at subbuffer start */ - uint64_t cycle_count_end; /* Cycle count at subbuffer end */ - uint32_t magic_number; /* +struct packet_header { + uint32_t magic; /* * Trace magic number. * contains endianness information. */ + uint8_t trace_uuid[16]; + uint32_t stream_id; + uint64_t timestamp_begin; /* Cycle count at subbuffer start */ + uint64_t timestamp_end; /* Cycle count at subbuffer end */ + uint32_t content_size; /* Size of data in subbuffer */ + uint32_t packet_size; /* Subbuffer size (include padding) */ + uint32_t events_lost; /* + * Events lost in this subbuffer since + * the beginning of the trace. + * (may overflow) + */ + /* TODO: move to metadata */ +#if 0 uint8_t major_version; uint8_t minor_version; uint8_t arch_size; /* Architecture pointer size */ @@ -233,18 +215,7 @@ struct subbuffer_header { * used all along the trace. */ uint32_t freq_scale; /* Frequency scaling (divisor) */ - uint32_t data_size; /* Size of data in subbuffer */ - uint32_t sb_size; /* Subbuffer size (include padding) */ - uint32_t events_lost; /* - * Events lost in this subbuffer since - * the beginning of the trace. - * (may overflow) - */ - uint32_t subbuf_corrupt; /* - * Corrupted (lost) subbuffers since - * the begginig of the trace. - * (may overflow) - */ +#endif //0 uint8_t header_end[0]; /* End of header */ }; @@ -291,7 +262,7 @@ unsigned char record_header_size(const struct lib_ring_buffer_config *config, BUILD_BUG_ON(sizeof(struct event_header) != sizeof(u32)); - padding = lib_ring_buffer_align(config, offset, + padding = lib_ring_buffer_align(offset, sizeof(struct event_header)); offset += padding; offset += sizeof(struct event_header); @@ -323,10 +294,9 @@ unsigned char record_header_size(const struct lib_ring_buffer_config *config, #include extern -size_t ltt_write_event_header_slow(struct ltt_chanbuf_alloc *bufa, - struct ltt_chan_alloc *chana, - long buf_offset, u16 eID, u32 event_size, - u64 tsc, unsigned int rflags); +void ltt_write_event_header_slow(const struct lib_ring_buffer_config *config, + struct lib_ring_buffer_ctx *ctx, + u16 eID, u32 event_size); /* * ltt_write_event_header @@ -420,49 +390,10 @@ size_t ltt_read_event_header(struct ltt_chanbuf_alloc *bufa, long buf_offset, } #endif //0 -/* - * Control channels : - * control/metadata - * control/interrupts - * control/... - * - * cpu channel : - * cpu - */ -#define LTT_RELAY_ROOT "ltt" - -#define LTT_METADATA_CHANNEL "metadata_state" -#define LTT_FD_STATE_CHANNEL "fd_state" -#define LTT_GLOBAL_STATE_CHANNEL "global_state" -#define LTT_IRQ_STATE_CHANNEL "irq_state" -#define LTT_MODULE_STATE_CHANNEL "module_state" -#define LTT_NETIF_STATE_CHANNEL "netif_state" -#define LTT_SOFTIRQ_STATE_CHANNEL "softirq_state" -#define LTT_SWAP_STATE_CHANNEL "swap_state" -#define LTT_SYSCALL_STATE_CHANNEL "syscall_state" -#define LTT_TASK_STATE_CHANNEL "task_state" -#define LTT_VM_STATE_CHANNEL "vm_state" -#define LTT_FS_CHANNEL "fs" -#define LTT_INPUT_CHANNEL "input" -#define LTT_IPC_CHANNEL "ipc" -#define LTT_KERNEL_CHANNEL "kernel" -#define LTT_MM_CHANNEL "mm" -#define LTT_RCU_CHANNEL "rcu" - -#define LTT_FLIGHT_PREFIX "flight-" - -#define LTT_ASCII "ascii" - /* Tracer properties */ -#define LTT_DEFAULT_SUBBUF_SIZE_LOW 65536 -#define LTT_DEFAULT_N_SUBBUFS_LOW 2 -#define LTT_DEFAULT_SUBBUF_SIZE_MED 262144 -#define LTT_DEFAULT_N_SUBBUFS_MED 2 -#define LTT_DEFAULT_SUBBUF_SIZE_HIGH 1048576 -#define LTT_DEFAULT_N_SUBBUFS_HIGH 2 -#define LTT_TRACER_MAGIC_NUMBER 0x00D6B7ED -#define LTT_TRACER_VERSION_MAJOR 2 -#define LTT_TRACER_VERSION_MINOR 6 +#define CTF_MAGIC_NUMBER 0xC1FC1FC1 +#define LTT_TRACER_VERSION_MAJOR 3 +#define LTT_TRACER_VERSION_MINOR 0 /** * ltt_write_trace_header - Write trace header @@ -470,20 +401,21 @@ size_t ltt_read_event_header(struct ltt_chanbuf_alloc *bufa, long buf_offset, * @header: Memory address where the information must be written to */ static __inline__ -void ltt_write_trace_header(void *priv, - struct subbuffer_header *header) +void write_trace_header(const struct lib_ring_buffer_config *config, + struct packet_header *header) { - struct ltt_trace *trace = priv; - - header->magic_number = LTT_TRACER_MAGIC_NUMBER; + header->magic = CTF_MAGIC_NUMBER; +#if 0 + /* TODO: move start time to metadata */ header->major_version = LTT_TRACER_VERSION_MAJOR; header->minor_version = LTT_TRACER_VERSION_MINOR; header->arch_size = sizeof(void *); - header->alignment = lib_ring_buffer_get_alignment(); - header->start_time_sec = trace->start_time.tv_sec; - header->start_time_usec = trace->start_time.tv_usec; - header->start_freq = trace->start_freq; - header->freq_scale = trace->freq_scale; + header->alignment = lib_ring_buffer_get_alignment(config); + header->start_time_sec = ltt_chan->session->start_time.tv_sec; + header->start_time_usec = ltt_chan->session->start_time.tv_usec; + header->start_freq = ltt_chan->session->start_freq; + header->freq_scale = ltt_chan->session->freq_scale; +#endif //0 } /* @@ -506,87 +438,12 @@ extern int ltt_module_register(enum ltt_module_function name, void *function, struct module *owner); extern void ltt_module_unregister(enum ltt_module_function name); -void ltt_transport_register(struct ltt_transport *transport); -void ltt_transport_unregister(struct ltt_transport *transport); - /* Exported control function */ -enum ltt_control_msg { - LTT_CONTROL_START, - LTT_CONTROL_STOP, - LTT_CONTROL_CREATE_TRACE, - LTT_CONTROL_DESTROY_TRACE -}; - -union ltt_control_args { - struct { - enum trace_mode mode; - unsigned int subbuf_size_low; - unsigned int n_subbufs_low; - unsigned int subbuf_size_med; - unsigned int n_subbufs_med; - unsigned int subbuf_size_high; - unsigned int n_subbufs_high; - } new_trace; -}; - -int _ltt_trace_setup(const char *trace_name); -int ltt_trace_setup(const char *trace_name); -struct ltt_trace *_ltt_trace_find_setup(const char *trace_name); -int ltt_trace_set_type(const char *trace_name, const char *trace_type); -int ltt_trace_set_channel_subbufsize(const char *trace_name, - const char *channel_name, - unsigned int size); -int ltt_trace_set_channel_subbufcount(const char *trace_name, - const char *channel_name, - unsigned int cnt); -int ltt_trace_set_channel_switch_timer(const char *trace_name, - const char *channel_name, - unsigned long interval); -int ltt_trace_set_channel_overwrite(const char *trace_name, - const char *channel_name, - unsigned int overwrite); -int ltt_trace_alloc(const char *trace_name); -int ltt_trace_destroy(const char *trace_name); -int ltt_trace_start(const char *trace_name); -int ltt_trace_stop(const char *trace_name); - -extern int ltt_control(enum ltt_control_msg msg, const char *trace_name, - const char *trace_type, union ltt_control_args args); - -enum ltt_filter_control_msg { - LTT_FILTER_DEFAULT_ACCEPT, - LTT_FILTER_DEFAULT_REJECT -}; - -extern int ltt_filter_control(enum ltt_filter_control_msg msg, - const char *trace_name); - -extern struct dentry *get_filter_root(void); - void ltt_core_register(int (*function)(u8, void *)); void ltt_core_unregister(void); -void ltt_release_trace(struct kref *kref); -void ltt_release_transport(struct kref *kref); - -extern int ltt_probe_register(struct ltt_available_probe *pdata); -extern int ltt_probe_unregister(struct ltt_available_probe *pdata); -extern int ltt_marker_connect(const char *channel, const char *mname, - const char *pname); -extern int ltt_marker_disconnect(const char *channel, const char *mname, - const char *pname); -extern void ltt_dump_marker_state(struct ltt_trace *trace); - -void ltt_lock_traces(void); -void ltt_unlock_traces(void); - -extern int ltt_ascii_create_dir(struct ltt_trace *new_trace); -extern void ltt_ascii_remove_dir(struct ltt_trace *trace); -extern int ltt_ascii_create(struct ltt_chan *chan); -extern void ltt_ascii_remove(struct ltt_chan *chan); - extern void ltt_statedump_register_kprobes_dump(void (*callback)(void *call_data)); extern