projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: quote event name in metadata
[lttng-modules.git]
/
lttng-events.c
diff --git
a/lttng-events.c
b/lttng-events.c
index 168c3b26b9d62d5195449550f06cc2fcdddd29a5..27a44e4ec7febb468c62a26bfc2daf8c61ac61df 100644
(file)
--- a/
lttng-events.c
+++ b/
lttng-events.c
@@
-31,8
+31,10
@@
#include "wrapper/vmalloc.h" /* for wrapper_vmalloc_sync_all() */
#include "wrapper/random.h"
#include "wrapper/tracepoint.h"
#include "wrapper/vmalloc.h" /* for wrapper_vmalloc_sync_all() */
#include "wrapper/random.h"
#include "wrapper/tracepoint.h"
+#include "lttng-kernel-version.h"
#include "lttng-events.h"
#include "lttng-tracer.h"
#include "lttng-events.h"
#include "lttng-tracer.h"
+#include "lttng-abi-old.h"
static LIST_HEAD(sessions);
static LIST_HEAD(lttng_transport_list);
static LIST_HEAD(sessions);
static LIST_HEAD(lttng_transport_list);
@@
-52,9
+54,15
@@
int _lttng_session_metadata_statedump(struct lttng_session *session);
void synchronize_trace(void)
{
synchronize_sched();
void synchronize_trace(void)
{
synchronize_sched();
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
+#ifdef CONFIG_PREEMPT_RT_FULL
+ synchronize_rcu();
+#endif
+#else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) */
#ifdef CONFIG_PREEMPT_RT
synchronize_rcu();
#endif
#ifdef CONFIG_PREEMPT_RT
synchronize_rcu();
#endif
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) */
}
struct lttng_session *lttng_session_create(void)
}
struct lttng_session *lttng_session_create(void)
@@
-393,6
+401,7
@@
struct lttng_event *lttng_event_create(struct lttng_channel *chan,
break;
default:
WARN_ON_ONCE(1);
break;
default:
WARN_ON_ONCE(1);
+ goto register_error;
}
ret = _lttng_event_metadata_statedump(chan->session, chan, event);
if (ret)
}
ret = _lttng_event_metadata_statedump(chan->session, chan, event);
if (ret)
@@
-711,7
+720,7
@@
int _lttng_event_metadata_statedump(struct lttng_session *session,
ret = lttng_metadata_printf(session,
"event {\n"
ret = lttng_metadata_printf(session,
"event {\n"
- " name =
%s
;\n"
+ " name =
\"%s\"
;\n"
" id = %u;\n"
" stream_id = %u;\n",
event->desc->name,
" id = %u;\n"
" stream_id = %u;\n",
event->desc->name,
@@
-816,9
+825,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"
"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"
" unsigned long events_discarded;\n"
- " uint32_t content_size;\n"
- " uint32_t packet_size;\n"
" uint32_t cpu_id;\n"
"};\n\n"
);
" uint32_t cpu_id;\n"
"};\n\n"
);
This page took
0.0408 seconds
and
4
git commands to generate.