#include <lttng/types.h>
#include <lttng/probe-user.h>
#include <lttng/events.h>
-#include <lttng/events-internal.h> /* TODO: remove this include after refactoring is done. */
#include <lttng/tracer-core.h>
#include <lttng/tp-mempool.h>
lttng_kernel_static_type_integer_from_type(_length_type, __BYTE_ORDER, 10), \
_nowrite, 0, 1), \
lttng_kernel_static_event_field(#_item, \
- lttng_kernel_static_type_sequence("_" #_item "_length", \
+ lttng_kernel_static_type_sequence(NULL, /* Use previous field. */ \
lttng_kernel_static_type_integer_from_type(_type, _byte_order, _elem_type_base), \
0, \
_encoding), \
lttng_kernel_static_type_integer_from_type(_length_type, __BYTE_ORDER, 10), \
_nowrite, 0, 1), \
lttng_kernel_static_event_field(#_item, \
- lttng_kernel_static_type_sequence("_" #_item "_length", \
+ lttng_kernel_static_type_sequence(NULL, /* Use previous field. */ \
lttng_kernel_static_type_integer(1, 1, 0, __LITTLE_ENDIAN, 10), \
lttng_alignof(_type), \
none), \
{ \
struct probe_local_vars { _locvar }; \
struct lttng_kernel_event_common *__event = __data; \
- struct lttng_probe_ctx __lttng_probe_ctx = { \
+ struct lttng_kernel_probe_ctx __lttng_probe_ctx = { \
.event = __event, \
.interruptible = !irqs_disabled(), \
}; \
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_session *__session = __chan->session; \
+ struct lttng_kernel_session *__session = __chan->session; \
struct lttng_id_tracker_rcu *__lf; \
\
if (!_TP_SESSION_CHECK(session, __session)) \
struct lttng_kernel_event_recorder *__event_recorder = \
container_of(__event, struct lttng_kernel_event_recorder, parent); \
struct lttng_channel *__chan = __event_recorder->chan; \
- struct lib_ring_buffer_ctx __ctx; \
+ struct lttng_kernel_ring_buffer_ctx __ctx; \
ssize_t __event_len; \
size_t __event_align; \
int __ret; \
goto __post; \
} \
__event_align = __event_get_align__##_name(_locvar_args); \
- lib_ring_buffer_ctx_init(&__ctx, __chan->chan, __event_len, \
- __event_align, -1, &__lttng_probe_ctx); \
- __ret = __chan->ops->event_reserve(&__ctx, __event_recorder->priv->id); \
+ lib_ring_buffer_ctx_init(&__ctx, __event_recorder, __event_len, \
+ __event_align, &__lttng_probe_ctx); \
+ __ret = __chan->ops->event_reserve(&__ctx); \
if (__ret < 0) \
goto __post; \
_fields \
static int TP_ID(__lttng_events_init__, TRACE_SYSTEM)(void)
{
wrapper_vmalloc_sync_mappings();
- return lttng_probe_register(&TP_ID(__probe_desc___, TRACE_SYSTEM));
+ return lttng_kernel_probe_register(&TP_ID(__probe_desc___, TRACE_SYSTEM));
}
static void TP_ID(__lttng_events_exit__, TRACE_SYSTEM)(void)
{
- lttng_probe_unregister(&TP_ID(__probe_desc___, TRACE_SYSTEM));
+ lttng_kernel_probe_unregister(&TP_ID(__probe_desc___, TRACE_SYSTEM));
}
#ifndef TP_MODULE_NOAUTOLOAD