projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use urcu tls-compat.h
[lttng-ust.git]
/
libringbuffer
/
ring_buffer_frontend.c
diff --git
a/libringbuffer/ring_buffer_frontend.c
b/libringbuffer/ring_buffer_frontend.c
index 6f94040e9b186ca9a2788c3875d9d453bddde8c6..7762da7291ae5d1f215ee0c47039bd8c84f78d28 100644
(file)
--- a/
libringbuffer/ring_buffer_frontend.c
+++ b/
libringbuffer/ring_buffer_frontend.c
@@
-58,6
+58,7
@@
#include <fcntl.h>
#include <urcu/compiler.h>
#include <urcu/ref.h>
#include <fcntl.h>
#include <urcu/compiler.h>
#include <urcu/ref.h>
+#include <urcu/tls-compat.h>
#include <helper.h>
#include "smp.h"
#include <helper.h>
#include "smp.h"
@@
-102,7
+103,7
@@
struct switch_offsets {
switch_old_end:1;
};
switch_old_end:1;
};
-
__thread unsigned int lib_ring_buffer_nesting
;
+
DEFINE_URCU_TLS(unsigned int, lib_ring_buffer_nesting)
;
/*
* TODO: this is unused. Errors are saved within the ring buffer.
/*
* TODO: this is unused. Errors are saved within the ring buffer.
@@
-1558,5
+1559,5
@@
int lib_ring_buffer_reserve_slow(struct lttng_ust_lib_ring_buffer_ctx *ctx)
*/
void lttng_fixup_ringbuffer_tls(void)
{
*/
void lttng_fixup_ringbuffer_tls(void)
{
- asm volatile ("" : : "m" (
lib_ring_buffer_nesting
));
+ asm volatile ("" : : "m" (
URCU_TLS(lib_ring_buffer_nesting)
));
}
}
This page took
0.023542 seconds
and
4
git commands to generate.