X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttng-events.c;h=4f30904dc0c922d7c865369387a42c4d860a45c9;hb=refs%2Fheads%2Fstable-2.1;hp=220178f71c96e565d64122e12fa856344e542b17;hpb=3d0d43dbac505d33994f5a57f4f11021410fa417;p=lttng-modules.git diff --git a/lttng-events.c b/lttng-events.c index 220178f7..4f30904d 100644 --- a/lttng-events.c +++ b/lttng-events.c @@ -30,8 +30,10 @@ #include "wrapper/uuid.h" #include "wrapper/vmalloc.h" /* for wrapper_vmalloc_sync_all() */ #include "wrapper/random.h" +#include "wrapper/tracepoint.h" #include "lttng-events.h" #include "lttng-tracer.h" +#include "lttng-abi-old.h" static LIST_HEAD(sessions); static LIST_HEAD(lttng_transport_list); @@ -316,7 +318,7 @@ struct lttng_event *lttng_event_create(struct lttng_channel *chan, event->desc = lttng_event_get(event_param->name); if (!event->desc) goto register_error; - ret = tracepoint_probe_register(event_param->name, + ret = kabi_2635_tracepoint_probe_register(event_param->name, event->desc->probe_callback, event); if (ret) @@ -420,7 +422,7 @@ int _lttng_event_unregister(struct lttng_event *event) switch (event->instrumentation) { case LTTNG_KERNEL_TRACEPOINT: - ret = tracepoint_probe_unregister(event->desc->name, + ret = kabi_2635_tracepoint_probe_unregister(event->desc->name, event->desc->probe_callback, event); if (ret) @@ -815,9 +817,9 @@ int _lttng_stream_packet_context_declare(struct lttng_session *session) "struct packet_context {\n" " uint64_clock_monotonic_t timestamp_begin;\n" " uint64_clock_monotonic_t timestamp_end;\n" + " uint64_t content_size;\n" + " uint64_t packet_size;\n" " unsigned long events_discarded;\n" - " uint32_t content_size;\n" - " uint32_t packet_size;\n" " uint32_t cpu_id;\n" "};\n\n" );