X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Fust%2Flttng-events.h;h=e028f6b2ce43de7e1ff71c5dd4e5904cfa3ebbba;hb=4cfec15c93af7e0cfe3ce769ee90486bb8ab7c37;hp=5ca156b7c74a81a025673aa6608fd2896c67f838;hpb=8d8a24c8565ce6dce7e7bd1045a95d1d2af5e536;p=lttng-ust.git diff --git a/include/ust/lttng-events.h b/include/ust/lttng-events.h index 5ca156b7..e028f6b2 100644 --- a/include/ust/lttng-events.h +++ b/include/ust/lttng-events.h @@ -15,15 +15,13 @@ #include #include #include +#include #include #include -#undef is_signed_type -#define is_signed_type(type) (((type)(-1)) < 0) - struct ltt_channel; struct ltt_session; -struct lib_ring_buffer_ctx; +struct lttng_ust_lib_ring_buffer_ctx; /* Type description */ @@ -57,8 +55,8 @@ struct lttng_enum_entry { .u.basic.integer = \ { \ .size = sizeof(_type) * CHAR_BIT, \ - .alignment = ltt_alignof(_type) * CHAR_BIT, \ - .signedness = is_signed_type(_type), \ + .alignment = lttng_alignof(_type) * CHAR_BIT, \ + .signedness = lttng_is_signed_type(_type), \ .reverse_byte_order = _byte_order != __BYTE_ORDER, \ .base = _base, \ .encoding = lttng_encode_##_encoding, \ @@ -74,11 +72,14 @@ struct lttng_integer_type { enum lttng_string_encodings encoding; }; +/* + * Only float and double are supported. long double is not supported at + * the moment. + */ #define _float_mant_dig(_type) \ (sizeof(_type) == sizeof(float) ? FLT_MANT_DIG \ : (sizeof(_type) == sizeof(double) ? DBL_MANT_DIG \ - : (sizeof(_type) == sizeof(long double) ? LDBL_MANT_DIG \ - : 0))) + : 0)) #define __type_float(_type) \ { \ @@ -88,8 +89,7 @@ struct lttng_integer_type { .exp_dig = sizeof(_type) * CHAR_BIT \ - _float_mant_dig(_type), \ .mant_dig = _float_mant_dig(_type), \ - .alignment = ltt_alignof(_type) * CHAR_BIT, \ - .signedness = is_signed_type(_type), \ + .alignment = lttng_alignof(_type) * CHAR_BIT, \ .reverse_byte_order = __BYTE_ORDER != __FLOAT_WORD_ORDER, \ }, \ } \ @@ -152,7 +152,7 @@ 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 lttng_ust_lib_ring_buffer_ctx *ctx, struct ltt_channel *chan); union { } u; @@ -179,6 +179,8 @@ struct lttng_probe_desc { struct cds_list_head head; /* chain registered probes */ }; +struct ust_pending_probe; + /* * ltt_event structure is referred to by the tracing fast path. It must be * kept small. @@ -194,36 +196,46 @@ struct ltt_event { union { } u; struct cds_list_head list; /* Event list */ + struct ust_pending_probe *pending_probe; int metadata_dumped:1; }; struct channel; +struct lttng_ust_shm_handle; struct ltt_channel_ops { - struct shm_handle *(*channel_create)(const char *name, + struct ltt_channel *(*channel_create)(const char *name, struct ltt_channel *ltt_chan, void *buf_addr, size_t subbuf_size, size_t num_subbuf, unsigned int switch_timer_interval, - unsigned int read_timer_interval); - void (*channel_destroy)(struct shm_handle *handle); - 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, + unsigned int read_timer_interval, + int *shm_fd, int *wait_fd, + uint64_t *memory_map_size); + void (*channel_destroy)(struct ltt_channel *ltt_chan); + struct lttng_ust_lib_ring_buffer *(*buffer_read_open)(struct channel *chan, + struct lttng_ust_shm_handle *handle, + int *shm_fd, int *wait_fd, + uint64_t *memory_map_size); + void (*buffer_read_close)(struct lttng_ust_lib_ring_buffer *buf, + struct lttng_ust_shm_handle *handle); + int (*event_reserve)(struct lttng_ust_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, + void (*event_commit)(struct lttng_ust_lib_ring_buffer_ctx *ctx); + void (*event_write)(struct lttng_ust_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); + size_t (*packet_avail_size)(struct channel *chan, + struct lttng_ust_shm_handle *handle); //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); int (*is_disabled)(struct channel *chan); + int (*flush_buffer)(struct channel *chan, struct lttng_ust_shm_handle *handle); }; struct ltt_channel { @@ -235,10 +247,11 @@ struct ltt_channel { struct ltt_session *session; int objd; /* Object associated to channel */ unsigned int free_event_id; /* Next event ID to allocate */ + unsigned int used_event_id; /* Max allocated event IDs */ struct cds_list_head list; /* Channel list */ struct ltt_channel_ops *ops; int header_type; /* 0: unset, 1: compact, 2: large */ - struct shm_handle *handle; /* shared-memory handle */ + struct lttng_ust_shm_handle *handle; /* shared-memory handle */ int metadata_dumped:1; }; @@ -271,12 +284,16 @@ struct ltt_channel *ltt_channel_create(struct ltt_session *session, void *buf_addr, size_t subbuf_size, size_t num_subbuf, unsigned int switch_timer_interval, - unsigned int read_timer_interval); + unsigned int read_timer_interval, + int *shm_fd, int *wait_fd, + uint64_t *memory_map_size); struct ltt_channel *ltt_global_channel_create(struct ltt_session *session, int overwrite, void *buf_addr, size_t subbuf_size, size_t num_subbuf, unsigned int switch_timer_interval, - unsigned int read_timer_interval); + unsigned int read_timer_interval, + int *shm_fd, int *wait_fd, + uint64_t *memory_map_size); struct ltt_event *ltt_event_create(struct ltt_channel *chan, struct lttng_ust_event *event_param, @@ -291,21 +308,24 @@ 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 ltt_probe_register(struct lttng_probe_desc *desc); void ltt_probe_unregister(struct lttng_probe_desc *desc); +int pending_probe_fix_events(const struct lttng_event_desc *desc); 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, +int lttng_find_context(struct lttng_ctx *ctx, const char *name); +struct lttng_ctx_field *lttng_append_context(struct lttng_ctx **ctx_p); +void lttng_remove_context_field(struct lttng_ctx **ctx_p, struct lttng_ctx_field *field); void lttng_destroy_context(struct lttng_ctx *ctx); int lttng_add_vtid_to_ctx(struct lttng_ctx **ctx); - -//extern const struct file_operations lttng_tracepoint_list_fops; +int lttng_add_vpid_to_ctx(struct lttng_ctx **ctx); +int lttng_add_pthread_id_to_ctx(struct lttng_ctx **ctx); +int lttng_add_procname_to_ctx(struct lttng_ctx **ctx); +void lttng_context_vtid_reset(void); +void lttng_context_vpid_reset(void); #endif /* _UST_LTTNG_EVENTS_H */