projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: Make test_per_application_leaks more robust
[lttng-tools.git]
/
src
/
common
/
futex.cpp
diff --git
a/src/common/futex.cpp
b/src/common/futex.cpp
index e178b7e1b4f1e8a99de25e42b10733266353ada0..b0e01fc73d4d8d4a6cbec6e669958fe80fa94b5e 100644
(file)
--- a/
src/common/futex.cpp
+++ b/
src/common/futex.cpp
@@
-7,15
+7,15
@@
*/
#define _LGPL_SOURCE
*/
#define _LGPL_SOURCE
+#include "futex.hpp"
+
+#include <common/common.hpp>
+
#include <limits.h>
#include <unistd.h>
#include <urcu.h>
#include <urcu/futex.h>
#include <limits.h>
#include <unistd.h>
#include <urcu.h>
#include <urcu/futex.h>
-#include <common/common.hpp>
-
-#include "futex.hpp"
-
/*
* This futex wait/wake scheme only works for N wakers / 1 waiters. Hence the
* "nto1" added to all function signature.
/*
* This futex wait/wake scheme only works for N wakers / 1 waiters. Hence the
* "nto1" added to all function signature.
@@
-42,8
+42,7
@@
void futex_wait_update(int32_t *futex, int active)
{
if (active) {
uatomic_set(futex, 1);
{
if (active) {
uatomic_set(futex, 1);
- if (futex_async(futex, FUTEX_WAKE,
- INT_MAX, NULL, NULL, 0) < 0) {
+ if (futex_async(futex, FUTEX_WAKE, INT_MAX, nullptr, nullptr, 0) < 0) {
PERROR("futex_async");
abort();
}
PERROR("futex_async");
abort();
}
@@
-73,7
+72,7
@@
void futex_nto1_wait(int32_t *futex)
cmm_smp_mb();
while (uatomic_read(futex) == -1) {
cmm_smp_mb();
while (uatomic_read(futex) == -1) {
- if (!futex_async(futex, FUTEX_WAIT, -1,
NULL, NULL
, 0)) {
+ if (!futex_async(futex, FUTEX_WAIT, -1,
nullptr, nullptr
, 0)) {
/*
* Prior queued wakeups queued by unrelated code
* using the same address can cause futex wait to
/*
* Prior queued wakeups queued by unrelated code
* using the same address can cause futex wait to
@@
-90,7
+89,7
@@
void futex_nto1_wait(int32_t *futex)
goto end;
case EINTR:
/* Retry if interrupted by signal. */
goto end;
case EINTR:
/* Retry if interrupted by signal. */
- break;
/* Get out of switch. Check again. */
+ break; /* Get out of switch. Check again. */
default:
/* Unexpected error. */
PERROR("futex_async");
default:
/* Unexpected error. */
PERROR("futex_async");
@@
-109,7
+108,7
@@
void futex_nto1_wake(int32_t *futex)
if (caa_unlikely(uatomic_read(futex) != -1))
goto end;
uatomic_set(futex, 0);
if (caa_unlikely(uatomic_read(futex) != -1))
goto end;
uatomic_set(futex, 0);
- if (futex_async(futex, FUTEX_WAKE, 1,
NULL, NULL
, 0) < 0) {
+ if (futex_async(futex, FUTEX_WAKE, 1,
nullptr, nullptr
, 0) < 0) {
PERROR("futex_async");
abort();
}
PERROR("futex_async");
abort();
}
This page took
0.023986 seconds
and
4
git commands to generate.