projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gcc blacklist: only apply when building with gcc
[lttng-modules.git]
/
lttng-events.c
diff --git
a/lttng-events.c
b/lttng-events.c
index 2fedbea59202df8da309a6b24fb348b37db1092c..ff937089b7e89618eb62f81ae8146223f43e2ba7 100644
(file)
--- a/
lttng-events.c
+++ b/
lttng-events.c
@@
-30,8
+30,11
@@
#include "wrapper/uuid.h"
#include "wrapper/vmalloc.h" /* for wrapper_vmalloc_sync_all() */
#include "wrapper/random.h"
#include "wrapper/uuid.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);
@@
-51,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)
@@
-292,7
+301,7
@@
struct lttng_event *lttng_event_create(struct lttng_channel *chan,
int ret;
mutex_lock(&sessions_mutex);
int ret;
mutex_lock(&sessions_mutex);
- if (chan->free_event_id == -1U
L
)
+ if (chan->free_event_id == -1U)
goto full;
/*
* This is O(n^2) (for each event, the loop is called at event
goto full;
/*
* This is O(n^2) (for each event, the loop is called at event
@@
-316,7
+325,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;
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)
event->desc->probe_callback,
event);
if (ret)
@@
-420,7
+429,7
@@
int _lttng_event_unregister(struct lttng_event *event)
switch (event->instrumentation) {
case LTTNG_KERNEL_TRACEPOINT:
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)
event->desc->probe_callback,
event);
if (ret)
@@
-815,9
+824,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"
- " uint
32_t events_discarded
;\n"
- " uint
32_t conten
t_size;\n"
- " u
int32_t packet_size
;\n"
+ " uint
64_t content_size
;\n"
+ " uint
64_t packe
t_size;\n"
+ " u
nsigned long events_discarded
;\n"
" uint32_t cpu_id;\n"
"};\n\n"
);
" uint32_t cpu_id;\n"
"};\n\n"
);
@@
-926,6
+935,7
@@
int _lttng_session_metadata_statedump(struct lttng_session *session)
"typealias integer { size = 16; align = %u; signed = false; } := uint16_t;\n"
"typealias integer { size = 32; align = %u; signed = false; } := uint32_t;\n"
"typealias integer { size = 64; align = %u; signed = false; } := uint64_t;\n"
"typealias integer { size = 16; align = %u; signed = false; } := uint16_t;\n"
"typealias integer { size = 32; align = %u; signed = false; } := uint32_t;\n"
"typealias integer { size = 64; align = %u; signed = false; } := uint64_t;\n"
+ "typealias integer { size = %u; align = %u; signed = false; } := unsigned long;\n"
"typealias integer { size = 5; align = 1; signed = false; } := uint5_t;\n"
"typealias integer { size = 27; align = 1; signed = false; } := uint27_t;\n"
"\n"
"typealias integer { size = 5; align = 1; signed = false; } := uint5_t;\n"
"typealias integer { size = 27; align = 1; signed = false; } := uint27_t;\n"
"\n"
@@
-944,6
+954,8
@@
int _lttng_session_metadata_statedump(struct lttng_session *session)
lttng_alignof(uint16_t) * CHAR_BIT,
lttng_alignof(uint32_t) * CHAR_BIT,
lttng_alignof(uint64_t) * CHAR_BIT,
lttng_alignof(uint16_t) * CHAR_BIT,
lttng_alignof(uint32_t) * CHAR_BIT,
lttng_alignof(uint64_t) * CHAR_BIT,
+ sizeof(unsigned long) * CHAR_BIT,
+ lttng_alignof(unsigned long) * CHAR_BIT,
CTF_SPEC_MAJOR,
CTF_SPEC_MINOR,
uuid_s,
CTF_SPEC_MAJOR,
CTF_SPEC_MINOR,
uuid_s,
@@
-958,6
+970,7
@@
int _lttng_session_metadata_statedump(struct lttng_session *session)
ret = lttng_metadata_printf(session,
"env {\n"
ret = lttng_metadata_printf(session,
"env {\n"
+ " hostname = \"%s\";\n"
" domain = \"kernel\";\n"
" sysname = \"%s\";\n"
" kernel_release = \"%s\";\n"
" domain = \"kernel\";\n"
" sysname = \"%s\";\n"
" kernel_release = \"%s\";\n"
@@
-967,6
+980,7
@@
int _lttng_session_metadata_statedump(struct lttng_session *session)
" tracer_minor = %d;\n"
" tracer_patchlevel = %d;\n"
"};\n\n",
" tracer_minor = %d;\n"
" tracer_patchlevel = %d;\n"
"};\n\n",
+ current->nsproxy->uts_ns->name.nodename,
utsname()->sysname,
utsname()->release,
utsname()->version,
utsname()->sysname,
utsname()->release,
utsname()->version,
This page took
0.025912 seconds
and
4
git commands to generate.