#include <sys/types.h>
#include <lttng/ust-abi.h>
-
-#ifndef LTTNG_PACKED
-#error "LTTNG_PACKED should be defined"
-#endif
+#include <lttng/ust-utils.h>
#ifndef LTTNG_UST_UUID_LEN
#define LTTNG_UST_UUID_LEN 16
/* Default unix socket path */
#define LTTNG_UST_SOCK_FILENAME \
"lttng-ust-sock-" \
- __ust_stringify(LTTNG_UST_ABI_MAJOR_VERSION)
+ lttng_ust_stringify(LTTNG_UST_ABI_MAJOR_VERSION)
/*
* Shared memory files path are automatically related to shm root, e.g.
*/
#define LTTNG_UST_WAIT_FILENAME \
"lttng-ust-wait-" \
- __ust_stringify(LTTNG_UST_ABI_MAJOR_VERSION)
+ lttng_ust_stringify(LTTNG_UST_ABI_MAJOR_VERSION)
-struct lttng_ust_shm_handle;
struct lttng_ust_lib_ring_buffer;
struct ustctl_consumer_channel_attr {
- enum lttng_ust_chan_type type;
+ enum lttng_ust_abi_chan_type type;
uint64_t subbuf_size; /* bytes */
uint64_t num_subbuf; /* power of 2 */
int overwrite; /* 1: overwrite, 0: discard */
unsigned int switch_timer_interval; /* usec */
unsigned int read_timer_interval; /* usec */
- enum lttng_ust_output output; /* splice, mmap */
+ enum lttng_ust_abi_output output; /* splice, mmap */
uint32_t chan_id; /* channel ID */
unsigned char uuid[LTTNG_UST_UUID_LEN]; /* Trace session unique ID */
int64_t blocking_timeout; /* Blocking timeout (usec) */
-} LTTNG_PACKED;
+} __attribute__((packed));
/*
* API used by sessiond.
*/
struct lttng_ust_context_attr {
- enum lttng_ust_context_type ctx;
+ enum lttng_ust_abi_context_type ctx;
union {
- struct lttng_ust_perf_counter_ctx perf_counter;
+ struct lttng_ust_abi_perf_counter_ctx perf_counter;
struct {
char *provider_name;
char *ctx_name;
*/
int ustctl_register_done(int sock);
int ustctl_create_session(int sock);
-int ustctl_create_event(int sock, struct lttng_ust_event *ev,
- struct lttng_ust_object_data *channel_data,
- struct lttng_ust_object_data **event_data);
+int ustctl_create_event(int sock, struct lttng_ust_abi_event *ev,
+ struct lttng_ust_abi_object_data *channel_data,
+ struct lttng_ust_abi_object_data **event_data);
int ustctl_add_context(int sock, struct lttng_ust_context_attr *ctx,
- struct lttng_ust_object_data *obj_data,
- struct lttng_ust_object_data **context_data);
-int ustctl_set_filter(int sock, struct lttng_ust_filter_bytecode *bytecode,
- struct lttng_ust_object_data *obj_data);
-int ustctl_set_capture(int sock, struct lttng_ust_capture_bytecode *bytecode,
- struct lttng_ust_object_data *obj_data);
-int ustctl_set_exclusion(int sock, struct lttng_ust_event_exclusion *exclusion,
- struct lttng_ust_object_data *obj_data);
-
-int ustctl_enable(int sock, struct lttng_ust_object_data *object);
-int ustctl_disable(int sock, struct lttng_ust_object_data *object);
+ struct lttng_ust_abi_object_data *obj_data,
+ struct lttng_ust_abi_object_data **context_data);
+int ustctl_set_filter(int sock, struct lttng_ust_abi_filter_bytecode *bytecode,
+ struct lttng_ust_abi_object_data *obj_data);
+int ustctl_set_capture(int sock, struct lttng_ust_abi_capture_bytecode *bytecode,
+ struct lttng_ust_abi_object_data *obj_data);
+int ustctl_set_exclusion(int sock, struct lttng_ust_abi_event_exclusion *exclusion,
+ struct lttng_ust_abi_object_data *obj_data);
+
+int ustctl_enable(int sock, struct lttng_ust_abi_object_data *object);
+int ustctl_disable(int sock, struct lttng_ust_abi_object_data *object);
int ustctl_start_session(int sock, int handle);
int ustctl_stop_session(int sock, int handle);
* notifier in that group.
*/
int ustctl_create_event_notifier_group(int sock, int pipe_fd,
- struct lttng_ust_object_data **event_notifier_group);
+ struct lttng_ust_abi_object_data **event_notifier_group);
/*
* ustctl_create_event notifier creates a event notifier in a event notifier
* notifier.
*/
int ustctl_create_event_notifier(int sock,
- struct lttng_ust_event_notifier *event_notifier,
- struct lttng_ust_object_data *event_notifier_group,
- struct lttng_ust_object_data **event_notifier_data);
+ struct lttng_ust_abi_event_notifier *event_notifier,
+ struct lttng_ust_abi_object_data *event_notifier_group,
+ struct lttng_ust_abi_object_data **event_notifier_data);
/*
* ustctl_tracepoint_list returns a tracepoint list handle, or negative
* returned.
*/
int ustctl_tracepoint_list_get(int sock, int tp_list_handle,
- struct lttng_ust_tracepoint_iter *iter);
+ struct lttng_ust_abi_tracepoint_iter *iter);
/*
* ustctl_tracepoint_field_list returns a tracepoint field list handle,
* returned.
*/
int ustctl_tracepoint_field_list_get(int sock, int tp_field_list_handle,
- struct lttng_ust_field_iter *iter);
+ struct lttng_ust_abi_field_iter *iter);
-int ustctl_tracer_version(int sock, struct lttng_ust_tracer_version *v);
+int ustctl_tracer_version(int sock, struct lttng_ust_abi_tracer_version *v);
int ustctl_wait_quiescent(int sock);
-int ustctl_sock_flush_buffer(int sock, struct lttng_ust_object_data *object);
+int ustctl_sock_flush_buffer(int sock, struct lttng_ust_abi_object_data *object);
-int ustctl_calibrate(int sock, struct lttng_ust_calibrate *calibrate);
+int ustctl_calibrate(int sock, struct lttng_ust_abi_calibrate *calibrate);
/* Release object created by members of this API. */
-int ustctl_release_object(int sock, struct lttng_ust_object_data *data);
+int ustctl_release_object(int sock, struct lttng_ust_abi_object_data *data);
/* Release handle returned by create session. */
int ustctl_release_handle(int sock, int handle);
int ustctl_recv_channel_from_consumer(int sock,
- struct lttng_ust_object_data **channel_data);
+ struct lttng_ust_abi_object_data **channel_data);
int ustctl_recv_stream_from_consumer(int sock,
- struct lttng_ust_object_data **stream_data);
+ struct lttng_ust_abi_object_data **stream_data);
int ustctl_send_channel_to_ust(int sock, int session_handle,
- struct lttng_ust_object_data *channel_data);
+ struct lttng_ust_abi_object_data *channel_data);
int ustctl_send_stream_to_ust(int sock,
- struct lttng_ust_object_data *channel_data,
- struct lttng_ust_object_data *stream_data);
+ struct lttng_ust_abi_object_data *channel_data,
+ struct lttng_ust_abi_object_data *stream_data);
/*
* ustctl_duplicate_ust_object_data allocated a new object in "dest" if
* it succeeds (returns 0). It must be released using
* ustctl_release_object() and then freed with free().
*/
-int ustctl_duplicate_ust_object_data(struct lttng_ust_object_data **dest,
- struct lttng_ust_object_data *src);
+int ustctl_duplicate_ust_object_data(struct lttng_ust_abi_object_data **dest,
+ struct lttng_ust_abi_object_data *src);
/*
* API used by consumer.
int32_t encoding; /* enum ustctl_string_encodings */
uint16_t alignment; /* in bits */
char padding[USTCTL_UST_INTEGER_TYPE_PADDING];
-} LTTNG_PACKED;
+} __attribute__((packed));
#define USTCTL_UST_FLOAT_TYPE_PADDING 24
struct ustctl_float_type {
uint32_t reverse_byte_order;
uint16_t alignment; /* in bits */
char padding[USTCTL_UST_FLOAT_TYPE_PADDING];
-} LTTNG_PACKED;
+} __attribute__((packed));
#define USTCTL_UST_ENUM_VALUE_PADDING 15
struct ustctl_enum_value {
uint64_t value;
uint8_t signedness;
char padding[USTCTL_UST_ENUM_VALUE_PADDING];
-} LTTNG_PACKED;
+} __attribute__((packed));
enum ustctl_ust_enum_entry_options {
USTCTL_UST_ENUM_ENTRY_OPTION_IS_AUTO = 1U << 0,
#define USTCTL_UST_ENUM_ENTRY_PADDING 32
struct ustctl_enum_entry {
struct ustctl_enum_value start, end; /* start and end are inclusive */
- char string[LTTNG_UST_SYM_NAME_LEN];
+ char string[LTTNG_UST_ABI_SYM_NAME_LEN];
union {
struct {
uint32_t options;
- } LTTNG_PACKED extra;
+ } __attribute__((packed)) extra;
char padding[USTCTL_UST_ENUM_ENTRY_PADDING];
} u;
-} LTTNG_PACKED;
+} __attribute__((packed));
/* legacy */
#define USTCTL_UST_BASIC_TYPE_PADDING 296
union _ustctl_basic_type {
struct ustctl_integer_type integer;
struct {
- char name[LTTNG_UST_SYM_NAME_LEN];
+ char name[LTTNG_UST_ABI_SYM_NAME_LEN];
struct ustctl_integer_type container_type;
uint64_t id; /* enum ID in sessiond. */
} enumeration;
} string;
struct ustctl_float_type _float;
char padding[USTCTL_UST_BASIC_TYPE_PADDING];
-} LTTNG_PACKED;
+} __attribute__((packed));
/* legacy */
struct ustctl_basic_type {
union {
union _ustctl_basic_type basic;
} u;
-} LTTNG_PACKED;
+} __attribute__((packed));
/*
* Padding is derived from largest member: u.legacy.sequence which
int32_t encoding; /* enum ustctl_string_encodings */
} string;
struct {
- char name[LTTNG_UST_SYM_NAME_LEN];
+ char name[LTTNG_UST_ABI_SYM_NAME_LEN];
uint64_t id; /* enum ID in sessiond. */
/* container_type follows after this struct ustctl_field. */
} enum_nestable;
/* elem_type follows after this struct ustctl_field. */
} array_nestable;
struct {
- char length_name[LTTNG_UST_SYM_NAME_LEN];
+ char length_name[LTTNG_UST_ABI_SYM_NAME_LEN];
uint32_t alignment; /* Alignment before elements. */
/* elem_type follows after the length_type. */
} sequence_nestable;
} struct_nestable;
struct {
uint32_t nr_choices;
- char tag_name[LTTNG_UST_SYM_NAME_LEN];
+ char tag_name[LTTNG_UST_ABI_SYM_NAME_LEN];
uint32_t alignment;
/* Followed by nr_choices struct ustctl_field. */
} variant_nestable;
} _struct;
struct {
uint32_t nr_choices;
- char tag_name[LTTNG_UST_SYM_NAME_LEN];
+ char tag_name[LTTNG_UST_ABI_SYM_NAME_LEN];
/* Followed by nr_choices struct ustctl_field. */
} variant;
} legacy;
char padding[USTCTL_UST_TYPE_PADDING];
} u;
-} LTTNG_PACKED;
+} __attribute__((packed));
#define USTCTL_UST_FIELD_PADDING 28
struct ustctl_field {
- char name[LTTNG_UST_SYM_NAME_LEN];
+ char name[LTTNG_UST_ABI_SYM_NAME_LEN];
struct ustctl_type type;
char padding[USTCTL_UST_FIELD_PADDING];
-} LTTNG_PACKED;
+} __attribute__((packed));
/*
* Returns 0 on success, negative error value on error.
int *channel_objd, /* channel descriptor (output) */
char *event_name, /*
* event name (output,
- * size LTTNG_UST_SYM_NAME_LEN)
+ * size LTTNG_UST_ABI_SYM_NAME_LEN)
*/
int *loglevel,
char **signature, /*
bool coalesce_hits);
int ustctl_create_counter_data(struct ustctl_daemon_counter *counter,
- struct lttng_ust_object_data **counter_data);
+ struct lttng_ust_abi_object_data **counter_data);
int ustctl_create_counter_global_data(struct ustctl_daemon_counter *counter,
- struct lttng_ust_object_data **counter_global_data);
+ struct lttng_ust_abi_object_data **counter_global_data);
int ustctl_create_counter_cpu_data(struct ustctl_daemon_counter *counter, int cpu,
- struct lttng_ust_object_data **counter_cpu_data);
+ struct lttng_ust_abi_object_data **counter_cpu_data);
/*
* Each counter data and counter cpu data created need to be destroyed
void ustctl_destroy_counter(struct ustctl_daemon_counter *counter);
int ustctl_send_counter_data_to_ust(int sock, int parent_handle,
- struct lttng_ust_object_data *counter_data);
+ struct lttng_ust_abi_object_data *counter_data);
int ustctl_send_counter_global_data_to_ust(int sock,
- struct lttng_ust_object_data *counter_data,
- struct lttng_ust_object_data *counter_global_data);
+ struct lttng_ust_abi_object_data *counter_data,
+ struct lttng_ust_abi_object_data *counter_global_data);
int ustctl_send_counter_cpu_data_to_ust(int sock,
- struct lttng_ust_object_data *counter_data,
- struct lttng_ust_object_data *counter_cpu_data);
+ struct lttng_ust_abi_object_data *counter_data,
+ struct lttng_ust_abi_object_data *counter_cpu_data);
int ustctl_counter_read(struct ustctl_daemon_counter *counter,
const size_t *dimension_indexes,
projects / lttng-ust.git / blobdiff