#include <urcu/list.h>
#include <urcu/hlist.h>
-#include <uuid/uuid.h>
#include <stdint.h>
#include <lttng/ust-abi.h>
#include <lttng/ust-tracer.h>
-#include <endian.h>
+#include <lttng/ust-endian.h>
#include <float.h>
+#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.
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) \
.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 */
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];
};
/*
- _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 {
enum lttng_string_encodings encoding;
} string;
struct lttng_float_type _float;
+ char padding[LTTNG_UST_BASIC_TYPE_PADDING];
};
struct lttng_basic_type {
} u;
};
+#define LTTNG_UST_TYPE_PADDING 128
struct lttng_type {
enum abstract_types atype;
union {
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);
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;
+ 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
struct cds_list_head list;
/* head of session list to which this wildcard apply */
struct cds_list_head session_list;
+ enum lttng_ust_loglevel_type loglevel_type;
+ int loglevel;
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;
/* 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 {
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;
};
struct lttng_ust_tracepoint_iter *
lttng_ust_tracepoint_list_get_iter_next(struct lttng_ust_tracepoint_list *list);
-struct wildcard_entry *match_wildcard(const char *name);
-struct session_wildcard *add_wildcard(const char *name,
- struct ltt_channel *chan,
- struct lttng_ust_event *event_param);
-void _remove_wildcard(struct session_wildcard *wildcard);
int ltt_wildcard_enable(struct session_wildcard *wildcard);
int ltt_wildcard_disable(struct session_wildcard *wildcard);
int ltt_wildcard_create(struct ltt_channel *chan,
struct lttng_ust_event *event_param,
struct session_wildcard **sl);
+int ltt_loglevel_match(const struct lttng_event_desc *desc,
+ enum lttng_ust_loglevel_type req_type,
+ int req_loglevel);
+void ltt_probes_create_wildcard_events(struct wildcard_entry *entry,
+ struct session_wildcard *wildcard);
#endif /* _LTTNG_UST_EVENTS_H */
projects / lttng-ust.git / blobdiff