projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement ustctl_duplicate_ust_object_data
[lttng-ust.git]
/
libringbuffer
/
frontend_internal.h
diff --git
a/libringbuffer/frontend_internal.h
b/libringbuffer/frontend_internal.h
index 2d3b1071f9e4f10565ca52b0385c65359a8866f2..a96746dcc53533910e76baaa15ab28e0133fd566 100644
(file)
--- a/
libringbuffer/frontend_internal.h
+++ b/
libringbuffer/frontend_internal.h
@@
-32,6
+32,7
@@
*/
#include <urcu/compiler.h>
*/
#include <urcu/compiler.h>
+#include <urcu/tls-compat.h>
#include <signal.h>
#include <pthread.h>
#include <signal.h>
#include <pthread.h>
@@
-393,8
+394,7
@@
void lib_ring_buffer_check_deliver(const struct lttng_ust_lib_ring_buffer_config
* RING_BUFFER_WAKEUP_BY_WRITER wakeup is not lock-free.
*/
if (config->wakeup == RING_BUFFER_WAKEUP_BY_WRITER
* RING_BUFFER_WAKEUP_BY_WRITER wakeup is not lock-free.
*/
if (config->wakeup == RING_BUFFER_WAKEUP_BY_WRITER
- && (uatomic_read(&buf->active_readers)
- || uatomic_read(&buf->active_shadow_readers))
+ && uatomic_read(&buf->active_readers)
&& lib_ring_buffer_poll_deliver(config, buf, chan, handle)) {
int wakeup_fd = shm_get_wakeup_fd(handle, &buf->self._ref);
&& lib_ring_buffer_poll_deliver(config, buf, chan, handle)) {
int wakeup_fd = shm_get_wakeup_fd(handle, &buf->self._ref);
@@
-521,6
+521,6
@@
extern void lib_ring_buffer_free(struct lttng_ust_lib_ring_buffer *buf,
struct lttng_ust_shm_handle *handle);
/* Keep track of trap nesting inside ring buffer code */
struct lttng_ust_shm_handle *handle);
/* Keep track of trap nesting inside ring buffer code */
-extern
__thread unsigned int lib_ring_buffer_nesting
;
+extern
DECLARE_URCU_TLS(unsigned int, lib_ring_buffer_nesting)
;
#endif /* _LTTNG_RING_BUFFER_FRONTEND_INTERNAL_H */
#endif /* _LTTNG_RING_BUFFER_FRONTEND_INTERNAL_H */
This page took
0.024233 seconds
and
4
git commands to generate.