projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean-up: ustctl: adapt comment to use new ABI name
[lttng-ust.git]
/
liblttng-ust
/
event-notifier-notification.c
diff --git
a/liblttng-ust/event-notifier-notification.c
b/liblttng-ust/event-notifier-notification.c
index 559c7fe88e21a62d42382d3aa657a595aa680aa0..199e615b15fe0e065d375b3a9991a0ba0c79fe0f 100644
(file)
--- a/
liblttng-ust/event-notifier-notification.c
+++ b/
liblttng-ust/event-notifier-notification.c
@@
-24,7
+24,7
@@
* of the notification struct we are sending alongside the capture buffer.
*/
#define CAPTURE_BUFFER_SIZE \
* of the notification struct we are sending alongside the capture buffer.
*/
#define CAPTURE_BUFFER_SIZE \
- (PIPE_BUF - sizeof(struct lttng_ust_event_notifier_notification) - 1)
+ (PIPE_BUF - sizeof(struct lttng_ust_
abi_
event_notifier_notification) - 1)
struct lttng_event_notifier_notification {
int notification_fd;
struct lttng_event_notifier_notification {
int notification_fd;
@@
-60,11
+60,11
@@
void capture_enum(struct lttng_msgpack_writer *writer,
static
int64_t capture_sequence_element_signed(uint8_t *ptr,
static
int64_t capture_sequence_element_signed(uint8_t *ptr,
-
const struct lttng_integer_type *
type)
+
struct lttng_ust_type_integer *integer_
type)
{
int64_t value;
{
int64_t value;
- unsigned int size = type->size;
- bool byte_order_reversed = type->reverse_byte_order;
+ unsigned int size =
integer_
type->size;
+ bool byte_order_reversed =
integer_
type->reverse_byte_order;
switch (size) {
case 8:
switch (size) {
case 8:
@@
-109,11
+109,11
@@
int64_t capture_sequence_element_signed(uint8_t *ptr,
static
uint64_t capture_sequence_element_unsigned(uint8_t *ptr,
static
uint64_t capture_sequence_element_unsigned(uint8_t *ptr,
-
const struct lttng_integer_type *
type)
+
struct lttng_ust_type_integer *integer_
type)
{
uint64_t value;
{
uint64_t value;
- unsigned int size = type->size;
- bool byte_order_reversed = type->reverse_byte_order;
+ unsigned int size =
integer_
type->size;
+ bool byte_order_reversed =
integer_
type->reverse_byte_order;
switch (size) {
case 8:
switch (size) {
case 8:
@@
-160,8
+160,8
@@
static
void capture_sequence(struct lttng_msgpack_writer *writer,
struct lttng_interpreter_output *output)
{
void capture_sequence(struct lttng_msgpack_writer *writer,
struct lttng_interpreter_output *output)
{
-
const struct lttng_integer_type
*integer_type;
-
const struct lttng_type
*nested_type;
+
struct lttng_ust_type_integer
*integer_type;
+
struct lttng_ust_type_common
*nested_type;
uint8_t *ptr;
bool signedness;
int i;
uint8_t *ptr;
bool signedness;
int i;
@@
-170,13
+170,13
@@
void capture_sequence(struct lttng_msgpack_writer *writer,
ptr = (uint8_t *) output->u.sequence.ptr;
nested_type = output->u.sequence.nested_type;
ptr = (uint8_t *) output->u.sequence.ptr;
nested_type = output->u.sequence.nested_type;
- switch (nested_type->
a
type) {
- case
a
type_integer:
- integer_type =
&nested_type->u.integer
;
+ switch (nested_type->type) {
+ case
lttng_ust_
type_integer:
+ integer_type =
lttng_ust_get_type_integer(nested_type)
;
break;
break;
- case
atype_enum_nestable
:
+ case
lttng_ust_type_enum
:
/* Treat enumeration as an integer. */
/* Treat enumeration as an integer. */
- integer_type =
&nested_type->u.enum_nestable.container_type->u.integer
;
+ integer_type =
lttng_ust_get_type_integer(lttng_ust_get_type_enum(nested_type)->container_type)
;
break;
default:
/* Capture of array of non-integer are not supported. */
break;
default:
/* Capture of array of non-integer are not supported. */
@@
-210,19
+210,19
@@
void capture_sequence(struct lttng_msgpack_writer *writer,
static
void notification_init(struct lttng_event_notifier_notification *notif,
static
void notification_init(struct lttng_event_notifier_notification *notif,
- struct lttng_event_notifier *event_notifier)
+ struct lttng_
ust_
event_notifier *event_notifier)
{
struct lttng_msgpack_writer *writer = ¬if->writer;
{
struct lttng_msgpack_writer *writer = ¬if->writer;
- notif->event_notifier_token = event_notifier->user_token;
- notif->notification_fd = event_notifier->group->notification_fd;
+ notif->event_notifier_token = event_notifier->
priv->parent.
user_token;
+ notif->notification_fd = event_notifier->
priv->
group->notification_fd;
notif->has_captures = false;
notif->has_captures = false;
- if (event_notifier->num_captures > 0) {
+ if (event_notifier->
priv->
num_captures > 0) {
lttng_msgpack_writer_init(writer, notif->capture_buf,
CAPTURE_BUFFER_SIZE);
lttng_msgpack_writer_init(writer, notif->capture_buf,
CAPTURE_BUFFER_SIZE);
- lttng_msgpack_begin_array(writer, event_notifier->num_captures);
+ lttng_msgpack_begin_array(writer, event_notifier->
priv->
num_captures);
notif->has_captures = true;
}
}
notif->has_captures = true;
}
}
@@
-266,10
+266,10
@@
void notification_append_empty_capture(
lttng_msgpack_write_nil(¬if->writer);
}
lttng_msgpack_write_nil(¬if->writer);
}
-static void record_error(struct lttng_event_notifier *event_notifier)
+static void record_error(struct lttng_
ust_
event_notifier *event_notifier)
{
struct lttng_event_notifier_group *event_notifier_group =
{
struct lttng_event_notifier_group *event_notifier_group =
- event_notifier->group;
+ event_notifier->
priv->
group;
struct lttng_counter *error_counter;
size_t dimension_index[1];
int ret;
struct lttng_counter *error_counter;
size_t dimension_index[1];
int ret;
@@
-287,7
+287,7
@@
static void record_error(struct lttng_event_notifier *event_notifier)
if (!error_counter)
return;
if (!error_counter)
return;
- dimension_index[0] = event_notifier->error_counter_index;
+ dimension_index[0] = event_notifier->
priv->
error_counter_index;
ret = event_notifier_group->error_counter->ops->counter_add(
error_counter->counter, dimension_index, 1);
if (ret)
ret = event_notifier_group->error_counter->ops->counter_add(
error_counter->counter, dimension_index, 1);
if (ret)
@@
-296,17
+296,17
@@
static void record_error(struct lttng_event_notifier *event_notifier)
static
void notification_send(struct lttng_event_notifier_notification *notif,
static
void notification_send(struct lttng_event_notifier_notification *notif,
- struct lttng_event_notifier *event_notifier)
+ struct lttng_
ust_
event_notifier *event_notifier)
{
ssize_t ret;
size_t content_len;
int iovec_count = 1;
{
ssize_t ret;
size_t content_len;
int iovec_count = 1;
- struct lttng_ust_event_notifier_notification ust_notif = {0};
+ struct lttng_ust_
abi_
event_notifier_notification ust_notif = {0};
struct iovec iov[2];
assert(notif);
struct iovec iov[2];
assert(notif);
- ust_notif.token = event_notifier->user_token;
+ ust_notif.token = event_notifier->
priv->parent.
user_token;
/*
* Prepare sending the notification from multiple buffers using an
/*
* Prepare sending the notification from multiple buffers using an
@@
-356,7
+356,7
@@
void notification_send(struct lttng_event_notifier_notification *notif,
}
void lttng_event_notifier_notification_send(
}
void lttng_event_notifier_notification_send(
- struct lttng_event_notifier *event_notifier,
+ struct lttng_
ust_
event_notifier *event_notifier,
const char *stack_data)
{
/*
const char *stack_data)
{
/*
@@
-368,7
+368,7
@@
void lttng_event_notifier_notification_send(
notification_init(¬if, event_notifier);
if (caa_unlikely(!cds_list_empty(&event_notifier->capture_bytecode_runtime_head))) {
notification_init(¬if, event_notifier);
if (caa_unlikely(!cds_list_empty(&event_notifier->capture_bytecode_runtime_head))) {
- struct lttng_bytecode_runtime *capture_bc_runtime;
+ struct lttng_
ust_
bytecode_runtime *capture_bc_runtime;
/*
* Iterate over all the capture bytecodes. If the interpreter
/*
* Iterate over all the capture bytecodes. If the interpreter
This page took
0.026088 seconds
and
4
git commands to generate.