X-Git-Url: http://git.lttng.org/?p=lttng-ust.git;a=blobdiff_plain;f=include%2Flttng%2Fust-events.h;h=b892fbf84f7190e273ad866fcd54b30870d70ac0;hp=2bbe785e6850e8c5c21bf54f6ad81011168bfb09;hb=bf5ff35ed0a3a7f60e92d654a5b97e73b94da852;hpb=578ce73a104b847b78790041bf30aa9aaa310dd0 diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h index 2bbe785e..b892fbf8 100644 --- a/include/lttng/ust-events.h +++ b/include/lttng/ust-events.h @@ -4,33 +4,40 @@ /* * lttng/ust-events.h * - * Copyright 2010 (c) - Mathieu Desnoyers + * Copyright 2010-2012 (c) - Mathieu Desnoyers * * Holds LTTng per-session event registry. * - * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED - * OR IMPLIED. ANY USE IS AT YOUR OWN RISK. + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: * - * Permission is hereby granted to use or copy this program - * for any purpose, provided the above notices are retained on all copies. - * Permission to modify the code and to distribute modified code is granted, - * provided the above notices are retained, and a notice that the code was - * modified is included with the above copyright notice. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. */ #include #include -#include #include #include #include #include #include +#define LTTNG_UST_UUID_LEN 16 + struct ltt_channel; struct ltt_session; struct lttng_ust_lib_ring_buffer_ctx; +/* + * Data structures used by tracepoint event declarations, and by the + * tracer. Those structures have padding for future extension. + */ + /* * LTTng client type enumeration. Used by the consumer to map the * callbacks from its own address space. @@ -63,9 +70,11 @@ enum lttng_string_encodings { NR_STRING_ENCODINGS, }; +#define LTTNG_UST_ENUM_ENTRY_PADDING 16 struct lttng_enum_entry { unsigned long long start, end; /* start and end are inclusive */ const char *string; + char padding[LTTNG_UST_ENUM_ENTRY_PADDING]; }; #define __type_integer(_type, _byte_order, _base, _encoding) \ @@ -76,12 +85,13 @@ struct lttng_enum_entry { .size = sizeof(_type) * CHAR_BIT, \ .alignment = lttng_alignof(_type) * CHAR_BIT, \ .signedness = lttng_is_signed_type(_type), \ - .reverse_byte_order = _byte_order != __BYTE_ORDER, \ + .reverse_byte_order = _byte_order != BYTE_ORDER, \ .base = _base, \ .encoding = lttng_encode_##_encoding, \ }, \ } \ +#define LTTNG_UST_INTEGER_TYPE_PADDING 24 struct lttng_integer_type { unsigned int size; /* in bits */ unsigned short alignment; /* in bits */ @@ -89,6 +99,7 @@ struct lttng_integer_type { unsigned int reverse_byte_order:1; unsigned int base; /* 2, 8, 10, 16, for pretty print */ enum lttng_string_encodings encoding; + char padding[LTTNG_UST_INTEGER_TYPE_PADDING]; }; /* @@ -109,17 +120,20 @@ struct lttng_integer_type { - _float_mant_dig(_type), \ .mant_dig = _float_mant_dig(_type), \ .alignment = lttng_alignof(_type) * CHAR_BIT, \ - .reverse_byte_order = __BYTE_ORDER != __FLOAT_WORD_ORDER, \ + .reverse_byte_order = BYTE_ORDER != FLOAT_WORD_ORDER, \ }, \ } \ +#define LTTNG_UST_FLOAT_TYPE_PADDING 24 struct lttng_float_type { unsigned int exp_dig; /* exponent digits, in bits */ unsigned int mant_dig; /* mantissa digits, in bits */ unsigned short alignment; /* in bits */ unsigned int reverse_byte_order:1; + char padding[LTTNG_UST_FLOAT_TYPE_PADDING]; }; +#define LTTNG_UST_BASIC_TYPE_PADDING 128 union _lttng_basic_type { struct lttng_integer_type integer; struct { @@ -129,6 +143,7 @@ union _lttng_basic_type { enum lttng_string_encodings encoding; } string; struct lttng_float_type _float; + char padding[LTTNG_UST_BASIC_TYPE_PADDING]; }; struct lttng_basic_type { @@ -138,6 +153,7 @@ struct lttng_basic_type { } u; }; +#define LTTNG_UST_TYPE_PADDING 128 struct lttng_type { enum abstract_types atype; union { @@ -150,23 +166,29 @@ struct lttng_type { struct lttng_basic_type length_type; struct lttng_basic_type elem_type; } sequence; + char padding[LTTNG_UST_TYPE_PADDING]; } u; }; +#define LTTNG_UST_ENUM_TYPE_PADDING 24 struct lttng_enum { const char *name; struct lttng_type container_type; const struct lttng_enum_entry *entries; unsigned int len; + char padding[LTTNG_UST_ENUM_TYPE_PADDING]; }; /* Event field description */ +#define LTTNG_UST_EVENT_FIELD_PADDING 32 struct lttng_event_field { const char *name; struct lttng_type type; + char padding[LTTNG_UST_EVENT_FIELD_PADDING]; }; +#define LTTNG_UST_CTX_FIELD_PADDING 40 struct lttng_ctx_field { struct lttng_event_field event_field; size_t (*get_size)(size_t offset); @@ -174,16 +196,42 @@ struct lttng_ctx_field { struct lttng_ust_lib_ring_buffer_ctx *ctx, struct ltt_channel *chan); union { + char padding[LTTNG_UST_CTX_FIELD_PADDING]; } u; void (*destroy)(struct lttng_ctx_field *field); }; +#define LTTNG_UST_CTX_PADDING 24 struct lttng_ctx { struct lttng_ctx_field *fields; unsigned int nr_fields; unsigned int allocated_fields; + char padding[LTTNG_UST_CTX_PADDING]; +}; + +#define LTTNG_UST_EVENT_DESC_PADDING 40 +struct lttng_event_desc { + const char *name; + void (*probe_callback)(void); + const struct lttng_event_ctx *ctx; /* context */ + const struct lttng_event_field *fields; /* event payload */ + unsigned int nr_fields; + const int **loglevel; + const char *signature; /* Argument types/names received */ + char padding[LTTNG_UST_EVENT_DESC_PADDING]; }; +#define LTTNG_UST_PROBE_DESC_PADDING 40 +struct lttng_probe_desc { + const char *provider; + const struct lttng_event_desc **event_desc; + unsigned int nr_events; + struct cds_list_head head; /* chain registered probes */ + char padding[LTTNG_UST_PROBE_DESC_PADDING]; +}; + +/* Data structures used by the tracer. */ + /* * Entry describing a per-session active wildcard, along with the event * attribute and channel information configuring the events that need to @@ -213,22 +261,6 @@ struct wildcard_entry { char name[0]; }; -struct lttng_event_desc { - 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; - const int **loglevel; -}; - -struct lttng_probe_desc { - const char *provider; - const struct lttng_event_desc **event_desc; - unsigned int nr_events; - struct cds_list_head head; /* chain registered probes */ -}; - struct tp_list_entry { struct lttng_ust_tracepoint_iter tp; struct cds_list_head head; @@ -240,6 +272,7 @@ struct lttng_ust_tracepoint_list { }; struct ust_pending_probe; +struct ltt_event; /* * ltt_event structure is referred to by the tracing fast path. It must be @@ -250,7 +283,7 @@ struct ltt_event { struct ltt_channel *chan; int enabled; const struct lttng_event_desc *desc; - void *filter; + void (*filter)(struct ltt_event *event); struct lttng_ctx *ctx; enum lttng_ust_instrumentation instrumentation; union { @@ -270,13 +303,15 @@ struct ltt_channel_ops { size_t subbuf_size, size_t num_subbuf, unsigned int switch_timer_interval, unsigned int read_timer_interval, - int **shm_fd, int **wait_fd, + int **shm_fd, char **shm_path, + int **wait_fd, char **wait_pipe_path, uint64_t **memory_map_size, struct ltt_channel *chan_priv_init); 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, + int **shm_fd, char **shm_path, + int **wait_fd, char **wait_pipe_path, uint64_t **memory_map_size); void (*buffer_read_close)(struct lttng_ust_lib_ring_buffer *buf, struct lttng_ust_shm_handle *handle); @@ -323,7 +358,7 @@ struct ltt_channel { /* Channel ID, available for consumer too */ unsigned int id; /* Copy of session UUID for consumer (availability through shm) */ - uuid_t uuid; /* Trace session unique ID */ + unsigned char uuid[LTTNG_UST_UUID_LEN]; /* Trace session unique ID */ }; struct ltt_session { @@ -336,7 +371,7 @@ struct ltt_session { struct cds_list_head wildcards; /* Wildcard list head */ struct cds_list_head list; /* Session list */ unsigned int free_chan_id; /* Next chan ID to allocate */ - uuid_t uuid; /* Trace session unique ID */ + unsigned char uuid[LTTNG_UST_UUID_LEN]; /* Trace session unique ID */ unsigned int metadata_dumped:1; }; @@ -357,7 +392,8 @@ struct ltt_channel *ltt_channel_create(struct ltt_session *session, size_t subbuf_size, size_t num_subbuf, unsigned int switch_timer_interval, unsigned int read_timer_interval, - int **shm_fd, int **wait_fd, + int **shm_fd, char **shm_path, + int **wait_fd, char **wait_pipe_path, uint64_t **memory_map_size, struct ltt_channel *chan_priv_init); struct ltt_channel *ltt_global_channel_create(struct ltt_session *session, @@ -365,12 +401,13 @@ struct ltt_channel *ltt_global_channel_create(struct ltt_session *session, size_t subbuf_size, size_t num_subbuf, unsigned int switch_timer_interval, unsigned int read_timer_interval, - int **shm_fd, int **wait_fd, + int **shm_fd, char **shm_path, + int **wait_fd, char **wait_pipe_path, uint64_t **memory_map_size); int ltt_event_create(struct ltt_channel *chan, struct lttng_ust_event *event_param, - void *filter, + void (*filter)(struct ltt_event *event), struct ltt_event **event); int ltt_channel_enable(struct ltt_channel *channel); @@ -402,9 +439,9 @@ int lttng_add_procname_to_ctx(struct lttng_ctx **ctx); void lttng_context_vtid_reset(void); void lttng_context_vpid_reset(void); -const struct lttng_ust_lib_ring_buffer_client_cb *lttng_client_callbacks_metadata; -const struct lttng_ust_lib_ring_buffer_client_cb *lttng_client_callbacks_discard; -const struct lttng_ust_lib_ring_buffer_client_cb *lttng_client_callbacks_overwrite; +extern const struct lttng_ust_lib_ring_buffer_client_cb *lttng_client_callbacks_metadata; +extern const struct lttng_ust_lib_ring_buffer_client_cb *lttng_client_callbacks_discard; +extern const struct lttng_ust_lib_ring_buffer_client_cb *lttng_client_callbacks_overwrite; struct ltt_transport *ltt_transport_find(const char *name);