#include <lttng/events.h>
#include <lttng/events-internal.h>
#include <ringbuffer/frontend_types.h>
+#include <wrapper/compiler_attributes.h>
#include <wrapper/vmalloc.h>
#include <wrapper/irqflags.h>
#include <lttng/tracer.h>
{
struct lttng_kernel_event_recorder *event_recorder =
container_of(event, struct lttng_kernel_event_recorder, parent);
- struct lttng_channel *chan = event_recorder->chan;
+ struct lttng_kernel_channel_buffer *chan = event_recorder->chan;
- if (unlikely(!LTTNG_READ_ONCE(chan->session->active)))
+ if (unlikely(!LTTNG_READ_ONCE(chan->parent.session->active)))
return 0;
- if (unlikely(!LTTNG_READ_ONCE(chan->enabled)))
+ if (unlikely(!LTTNG_READ_ONCE(chan->parent.enabled)))
return 0;
break;
}
- case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER: /* Fall-through. */
+ case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER:
+ lttng_fallthrough;
default:
WARN_ON_ONCE(1);
}
{
struct lttng_kernel_event_recorder *event_recorder =
container_of(event, struct lttng_kernel_event_recorder, parent);
- struct lttng_channel *chan = event_recorder->chan;
+ struct lttng_kernel_channel_buffer *chan = event_recorder->chan;
struct lttng_kernel_ring_buffer_ctx ctx;
int ret;
payload.ip = (unsigned long) lttng_get_kretprobe(krpi)->kp.addr;
- payload.parent_ip = (unsigned long) krpi->ret_addr;
+ payload.parent_ip = lttng_get_kretprobe_retaddr(krpi);
lib_ring_buffer_ctx_init(&ctx, event_recorder, sizeof(payload),
lttng_alignof(payload), <tng_probe_ctx);
ret = chan->ops->event_reserve(&ctx);
if (ret < 0)
return 0;
- lib_ring_buffer_align_ctx(&ctx, lttng_alignof(payload));
- chan->ops->event_write(&ctx, &payload, sizeof(payload));
+ chan->ops->event_write(&ctx, &payload, sizeof(payload), lttng_alignof(payload));
chan->ops->event_commit(&ctx);
break;
}
- case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER: /* Fall-through. */
+ case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER:
+ lttng_fallthrough;
default:
WARN_ON_ONCE(1);
}