projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: build failure on 2.6.36
[lttng-modules.git]
/
probes
/
lttng-events.h
diff --git
a/probes/lttng-events.h
b/probes/lttng-events.h
index 29b44af71d9316b0701adfba64dc4312c3c403e7..a6c36b088dfba22ab12a7cf162c7880087dff578 100644
(file)
--- a/
probes/lttng-events.h
+++ b/
probes/lttng-events.h
@@
-27,6
+27,7
@@
#include "lttng-probe-user.h"
#include "../wrapper/vmalloc.h" /* for wrapper_vmalloc_sync_all() */
#include "../wrapper/ringbuffer/frontend_types.h"
#include "lttng-probe-user.h"
#include "../wrapper/vmalloc.h" /* for wrapper_vmalloc_sync_all() */
#include "../wrapper/ringbuffer/frontend_types.h"
+#include "../wrapper/rcu.h"
#include "../lttng-events.h"
#include "../lttng-tracer-core.h"
#include "../lttng-events.h"
#include "../lttng-tracer-core.h"
@@
-326,10
+327,10
@@
static void __event_probe__##_name(void *__data);
#define _ctf_string(_item, _src, _user, _nowrite) \
if (_user) \
__event_len += __dynamic_len[__dynamic_len_idx++] = \
#define _ctf_string(_item, _src, _user, _nowrite) \
if (_user) \
__event_len += __dynamic_len[__dynamic_len_idx++] = \
-
strlen(_src) + 1;
\
+
max_t(size_t, lttng_strlen_user_inatomic(_src), 1);
\
else \
__event_len += __dynamic_len[__dynamic_len_idx++] = \
else \
__event_len += __dynamic_len[__dynamic_len_idx++] = \
-
max_t(size_t, lttng_strlen_user_inatomic(_src), 1)
;
+
strlen(_src) + 1
;
#undef TP_PROTO
#define TP_PROTO(...) __VA_ARGS__
#undef TP_PROTO
#define TP_PROTO(...) __VA_ARGS__
@@
-728,7
+729,7
@@
static void __event_probe__##_name(void *__data, _proto) \
return; \
if (unlikely(!ACCESS_ONCE(__event->enabled))) \
return; \
return; \
if (unlikely(!ACCESS_ONCE(__event->enabled))) \
return; \
- __lpf =
rcu_dereference(__session->pid_tracker);
\
+ __lpf =
lttng_rcu_dereference(__session->pid_tracker);
\
if (__lpf && likely(!lttng_pid_tracker_lookup(__lpf, current->pid))) \
return; \
_code \
if (__lpf && likely(!lttng_pid_tracker_lookup(__lpf, current->pid))) \
return; \
_code \
@@
-738,7
+739,7
@@
static void __event_probe__##_name(void *__data, _proto) \
\
__event_prepare_filter_stack__##_name(__stackvar.__filter_stack_data, \
tp_locvar, _args); \
\
__event_prepare_filter_stack__##_name(__stackvar.__filter_stack_data, \
tp_locvar, _args); \
- list_for_each_entry_rcu(bc_runtime, &__event->bytecode_runtime_head, node) { \
+ l
ttng_l
ist_for_each_entry_rcu(bc_runtime, &__event->bytecode_runtime_head, node) { \
if (unlikely(bc_runtime->filter(bc_runtime, \
__stackvar.__filter_stack_data) & LTTNG_FILTER_RECORD_FLAG)) \
__filter_record = 1; \
if (unlikely(bc_runtime->filter(bc_runtime, \
__stackvar.__filter_stack_data) & LTTNG_FILTER_RECORD_FLAG)) \
__filter_record = 1; \
@@
-787,7
+788,7
@@
static void __event_probe__##_name(void *__data) \
return; \
if (unlikely(!ACCESS_ONCE(__event->enabled))) \
return; \
return; \
if (unlikely(!ACCESS_ONCE(__event->enabled))) \
return; \
- __lpf =
rcu_dereference(__session->pid_tracker);
\
+ __lpf =
lttng_rcu_dereference(__session->pid_tracker);
\
if (__lpf && likely(!lttng_pid_tracker_lookup(__lpf, current->pid))) \
return; \
_code \
if (__lpf && likely(!lttng_pid_tracker_lookup(__lpf, current->pid))) \
return; \
_code \
@@
-797,7
+798,7
@@
static void __event_probe__##_name(void *__data) \
\
__event_prepare_filter_stack__##_name(__stackvar.__filter_stack_data, \
tp_locvar); \
\
__event_prepare_filter_stack__##_name(__stackvar.__filter_stack_data, \
tp_locvar); \
- list_for_each_entry_rcu(bc_runtime, &__event->bytecode_runtime_head, node) { \
+ l
ttng_l
ist_for_each_entry_rcu(bc_runtime, &__event->bytecode_runtime_head, node) { \
if (unlikely(bc_runtime->filter(bc_runtime, \
__stackvar.__filter_stack_data) & LTTNG_FILTER_RECORD_FLAG)) \
__filter_record = 1; \
if (unlikely(bc_runtime->filter(bc_runtime, \
__stackvar.__filter_stack_data) & LTTNG_FILTER_RECORD_FLAG)) \
__filter_record = 1; \
This page took
0.024188 seconds
and
4
git commands to generate.