projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: add `notification_command_type_str()`
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
ust-ctl-internal.h
diff --git
a/src/bin/lttng-sessiond/ust-ctl-internal.h
b/src/bin/lttng-sessiond/ust-ctl-internal.h
index 96099f8aa08926aee758293f6ccc3e30652780f9..8d7217f31df2b9798baaec1230e41320a8767bf3 100644
(file)
--- a/
src/bin/lttng-sessiond/ust-ctl-internal.h
+++ b/
src/bin/lttng-sessiond/ust-ctl-internal.h
@@
-85,6
+85,14
@@
int ustctl_disable(int sock, struct lttng_ust_object_data *object);
int ustctl_start_session(int sock, int handle);
int ustctl_stop_session(int sock, int handle);
int ustctl_start_session(int sock, int handle);
int ustctl_stop_session(int sock, int handle);
+int ustctl_create_event_notifier_group(int sock,
+ int pipe_fd,
+ struct lttng_ust_object_data **event_notifier_group_handle);
+int ustctl_create_event_notifier(int sock,
+ struct lttng_ust_event_notifier *event_notifier,
+ struct lttng_ust_object_data *event_notifier_group_handle,
+ struct lttng_ust_object_data **event_notifier_data);
+
/*
* ustctl_tracepoint_list returns a tracepoint list handle, or negative
* error value.
/*
* ustctl_tracepoint_list returns a tracepoint list handle, or negative
* error value.
@@
-279,13
+287,18
@@
enum ustctl_channel_header {
enum ustctl_abstract_types {
ustctl_atype_integer,
enum ustctl_abstract_types {
ustctl_atype_integer,
- ustctl_atype_enum,
- ustctl_atype_array,
- ustctl_atype_sequence,
+ ustctl_atype_enum,
/* legacy */
+ ustctl_atype_array,
/* legacy */
+ ustctl_atype_sequence,
/* legacy */
ustctl_atype_string,
ustctl_atype_float,
ustctl_atype_string,
ustctl_atype_float,
- ustctl_atype_variant,
- ustctl_atype_struct,
+ ustctl_atype_variant, /* legacy */
+ ustctl_atype_struct, /* legacy */
+ ustctl_atype_enum_nestable,
+ ustctl_atype_array_nestable,
+ ustctl_atype_sequence_nestable,
+ ustctl_atype_struct_nestable,
+ ustctl_atype_variant_nestable,
NR_USTCTL_ABSTRACT_TYPES,
};
NR_USTCTL_ABSTRACT_TYPES,
};
@@
-339,6
+352,7
@@
struct ustctl_enum_entry {
} u;
} LTTNG_PACKED;
} u;
} LTTNG_PACKED;
+/* legacy */
#define USTCTL_UST_BASIC_TYPE_PADDING 296
union _ustctl_basic_type {
struct ustctl_integer_type integer;
#define USTCTL_UST_BASIC_TYPE_PADDING 296
union _ustctl_basic_type {
struct ustctl_integer_type integer;
@@
-354,6
+368,7
@@
union _ustctl_basic_type {
char padding[USTCTL_UST_BASIC_TYPE_PADDING];
} LTTNG_PACKED;
char padding[USTCTL_UST_BASIC_TYPE_PADDING];
} LTTNG_PACKED;
+/* legacy */
struct ustctl_basic_type {
enum ustctl_abstract_types atype;
union {
struct ustctl_basic_type {
enum ustctl_abstract_types atype;
union {
@@
-361,28
+376,67
@@
struct ustctl_basic_type {
} u;
} LTTNG_PACKED;
} u;
} LTTNG_PACKED;
-#define USTCTL_UST_TYPE_PADDING 128
+/*
+ * Padding is derived from largest member: u.legacy.sequence which
+ * contains two basic types, each with USTCTL_UST_BASIC_TYPE_PADDING.
+ */
+#define USTCTL_UST_TYPE_PADDING (2 * USTCTL_UST_BASIC_TYPE_PADDING)
struct ustctl_type {
enum ustctl_abstract_types atype;
union {
struct ustctl_type {
enum ustctl_abstract_types atype;
union {
- union _ustctl_basic_type basic;
+ struct ustctl_integer_type integer;
+ struct ustctl_float_type _float;
+ struct {
+ int32_t encoding; /* enum ustctl_string_encodings */
+ } string;
+ struct {
+ char name[LTTNG_UST_SYM_NAME_LEN];
+ uint64_t id; /* enum ID in sessiond. */
+ /* container_type follows after this struct ustctl_field. */
+ } enum_nestable;
struct {
struct {
- struct ustctl_basic_type elem_type;
uint32_t length; /* num. elems. */
uint32_t length; /* num. elems. */
- } array;
+ uint32_t alignment;
+ /* elem_type follows after this struct ustctl_field. */
+ } array_nestable;
struct {
struct {
- struct ustctl_basic_type length_type;
- struct ustctl_basic_type elem_type;
- } sequence;
+ char length_name[LTTNG_UST_SYM_NAME_LEN];
+ uint32_t alignment; /* Alignment before elements. */
+ /* elem_type follows after the length_type. */
+ } sequence_nestable;
+ struct {
+ uint32_t nr_fields;
+ uint32_t alignment;
+ /* Followed by nr_fields struct ustctl_field. */
+ } struct_nestable;
struct {
uint32_t nr_choices;
char tag_name[LTTNG_UST_SYM_NAME_LEN];
struct {
uint32_t nr_choices;
char tag_name[LTTNG_UST_SYM_NAME_LEN];
+ uint32_t alignment;
/* Followed by nr_choices struct ustctl_field. */
/* Followed by nr_choices struct ustctl_field. */
- } variant;
- struct {
- uint32_t nr_fields;
- /* Followed by nr_fields struct ustctl_field. */
- } _struct;
+ } variant_nestable;
+
+ /* Legacy ABI */
+ union {
+ union _ustctl_basic_type basic;
+ struct {
+ struct ustctl_basic_type elem_type;
+ uint32_t length; /* num. elems. */
+ } array;
+ struct {
+ struct ustctl_basic_type length_type;
+ struct ustctl_basic_type elem_type;
+ } sequence;
+ struct {
+ uint32_t nr_fields;
+ /* Followed by nr_fields struct ustctl_field. */
+ } _struct;
+ struct {
+ uint32_t nr_choices;
+ char tag_name[LTTNG_UST_SYM_NAME_LEN];
+ /* Followed by nr_choices struct ustctl_field. */
+ } variant;
+ } legacy;
char padding[USTCTL_UST_TYPE_PADDING];
} u;
} LTTNG_PACKED;
char padding[USTCTL_UST_TYPE_PADDING];
} u;
} LTTNG_PACKED;
This page took
0.02834 seconds
and
4
git commands to generate.