projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: pass private data to context callbacks
[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 ffb13321837db1dc5316b733538cb9d7f5ca694b..b3e2c94f1bd7a2d7180ad64256bcb325ea393e85 100644
(file)
--- a/
liblttng-ust/event-notifier-notification.c
+++ b/
liblttng-ust/event-notifier-notification.c
@@
-8,9
+8,13
@@
#include <assert.h>
#include <errno.h>
#include <assert.h>
#include <errno.h>
+#include <limits.h>
+
#include <lttng/ust-endian.h>
#include <usterr-signal-safe.h>
#include <lttng/ust-endian.h>
#include <usterr-signal-safe.h>
+#include <urcu/rculist.h>
+#include "lttng-tracer-core.h"
#include "ust-events-internal.h"
#include "../libmsgpack/msgpack.h"
#include "lttng-bytecode.h"
#include "ust-events-internal.h"
#include "../libmsgpack/msgpack.h"
#include "lttng-bytecode.h"
@@
-60,11
+64,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)
+ const 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
+113,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)
+ const 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
+164,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;
+ const struct lttng_
ust_type_integer
*integer_type;
+ const struct lttng_
ust_type_common
*nested_type;
uint8_t *ptr;
bool signedness;
int i;
uint8_t *ptr;
bool signedness;
int i;
@@
-170,13
+174,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,7
+214,7
@@
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;
@@
-266,7
+270,7
@@
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 =
event_notifier->priv->group;
{
struct lttng_event_notifier_group *event_notifier_group =
event_notifier->priv->group;
@@
-296,7
+300,7
@@
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;
{
ssize_t ret;
size_t content_len;
@@
-356,8
+360,9
@@
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,
- const char *stack_data)
+ struct lttng_ust_event_notifier *event_notifier,
+ const char *stack_data,
+ struct lttng_ust_notification_ctx *notif_ctx)
{
/*
* This function is called from the probe, we must do dynamic
{
/*
* This function is called from the probe, we must do dynamic
@@
-367,8
+372,8
@@
void lttng_event_notifier_notification_send(
notification_init(¬if, event_notifier);
notification_init(¬if, event_notifier);
- if (caa_unlikely(
!cds_list_empty(&event_notifier->capture_bytecode_runtime_head)
)) {
- struct lttng_bytecode_runtime *capture_bc_runtime;
+ if (caa_unlikely(
notif_ctx->eval_capture
)) {
+ 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
@@
-376,12
+381,12
@@
void lttng_event_notifier_notification_send(
* `output` parameter to the capture buffer. If the interpreter
* fails, append an empty capture to the buffer.
*/
* `output` parameter to the capture buffer. If the interpreter
* fails, append an empty capture to the buffer.
*/
- cds_list_for_each_entry(capture_bc_runtime,
- &event_notifier->capture_bytecode_runtime_head, node) {
+ cds_list_for_each_entry
_rcu
(capture_bc_runtime,
+ &event_notifier->
priv->
capture_bytecode_runtime_head, node) {
struct lttng_interpreter_output output;
struct lttng_interpreter_output output;
- if (capture_bc_runtime->interpreter_func
s.capture
(capture_bc_runtime,
- stack_data, &output)
& LTTNG_INTERPRETER_RECORD_FLAG
)
+ if (capture_bc_runtime->interpreter_func(capture_bc_runtime,
+ stack_data, &output)
== LTTNG_UST_BYTECODE_INTERPRETER_OK
)
notification_append_capture(¬if, &output);
else
notification_append_empty_capture(¬if);
notification_append_capture(¬if, &output);
else
notification_append_empty_capture(¬if);
This page took
0.025802 seconds
and
4
git commands to generate.