projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update to use caa_likely/caa_unlikely from urcu 0.6.6
[lttng-ust.git]
/
include
/
ust
/
core.h
diff --git
a/include/ust/core.h
b/include/ust/core.h
index 10e864f18b22a25493b5aa13f6faa3590768724c..4e75c515e708893db275adb7bbf699046d9dd429 100644
(file)
--- a/
include/ust/core.h
+++ b/
include/ust/core.h
@@
-23,9
+23,7
@@
#include <sys/types.h>
#include <ust/config.h>
#include <urcu/arch.h>
#include <sys/types.h>
#include <ust/config.h>
#include <urcu/arch.h>
-
-#define likely(x) __builtin_expect(!!(x), 1)
-#define unlikely(x) __builtin_expect(!!(x), 0)
+#include <urcu/compiler.h>
/* ARRAYS */
/* ARRAYS */
@@
-45,7
+43,7
@@
/* ERROR OPS */
#define MAX_ERRNO 4095
/* ERROR OPS */
#define MAX_ERRNO 4095
-#define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
+#define IS_ERR_VALUE(x)
caa_
unlikely((x) >= (unsigned long)-MAX_ERRNO)
static inline void *ERR_PTR(long error)
{
static inline void *ERR_PTR(long error)
{
@@
-146,7
+144,7
@@
static __inline__ int ust_get_cpu(void)
int cpu;
cpu = sched_getcpu();
int cpu;
cpu = sched_getcpu();
- if (likely(cpu >= 0))
+ if (
caa_
likely(cpu >= 0))
return cpu;
/*
* If getcpu(2) is not implemented in the Kernel use CPU 0 as fallback.
return cpu;
/*
* If getcpu(2) is not implemented in the Kernel use CPU 0 as fallback.
This page took
0.024014 seconds
and
4
git commands to generate.