#define _GNU_SOURCE
#include <stdio.h>
-#include <endian.h>
#include <urcu/list.h>
#include <urcu/hlist.h>
#include <pthread.h>
#include <inttypes.h>
#include <time.h>
#include <sys/prctl.h>
+#include <lttng/ust-endian.h>
#include "clock.h"
#include <urcu-bp.h>
struct ltt_event *event;
int ret = 0;
- if (chan->used_event_id == -1UL) {
+ if (chan->used_event_id == -1U) {
ret = -ENOMEM;
goto full;
}
struct ltt_event *event)
{
int ret = 0;
+ int loglevel = TRACE_DEFAULT;
if (event->metadata_dumped || !CMM_ACCESS_ONCE(session->active))
return 0;
if (ret)
goto end;
- if (event->desc->loglevel) {
- ret = lttng_metadata_printf(session,
- " loglevel = %d;\n",
- *(*event->desc->loglevel));
- if (ret)
- goto end;
- }
+ if (event->desc->loglevel)
+ loglevel = *(*event->desc->loglevel);
+
+ ret = lttng_metadata_printf(session,
+ " loglevel = %d;\n",
+ loglevel);
+ if (ret)
+ goto end;
if (event->ctx) {
ret = lttng_metadata_printf(session,
lttng_alignof(uint16_t) * CHAR_BIT,
lttng_alignof(uint32_t) * CHAR_BIT,
lttng_alignof(uint64_t) * CHAR_BIT,
- CTF_VERSION_MAJOR,
- CTF_VERSION_MINOR,
+ CTF_SPEC_MAJOR,
+ CTF_SPEC_MINOR,
uuid_s,
#if (BYTE_ORDER == BIG_ENDIAN)
"be"
"env {\n"
" vpid = %d;\n"
" procname = \"%s\";\n"
- " domain = %s;\n"
+ " domain = \"ust\";\n"
+ " tracer_name = \"lttng-ust\";\n"
+ " tracer_major = %u;\n"
+ " tracer_minor = %u;\n"
+ " tracer_patchlevel = %u;\n"
"};\n\n",
(int) getpid(),
procname,
- "ust"
+ LTTNG_UST_MAJOR_VERSION,
+ LTTNG_UST_MINOR_VERSION,
+ LTTNG_UST_PATCHLEVEL_VERSION
);
if (ret)
goto end;