|
@@ -58,11 +58,12 @@ extern "C" {
|
|
|
#endif
|
|
|
|
|
|
#if defined(__i386__) || defined(__x86_64__)
|
|
|
-static inline unsigned starpu_cmpxchg(unsigned *ptr, unsigned old, unsigned next) {
|
|
|
+
|
|
|
+static __inline unsigned starpu_cmpxchg(unsigned *ptr, unsigned old, unsigned next) {
|
|
|
__asm__ __volatile__("lock cmpxchgl %2,%1": "+a" (old), "+m" (*ptr) : "q" (next) : "memory");
|
|
|
return old;
|
|
|
}
|
|
|
-static inline unsigned starpu_xchg(unsigned *ptr, unsigned next) {
|
|
|
+static __inline unsigned starpu_xchg(unsigned *ptr, unsigned next) {
|
|
|
/* Note: xchg is always locked already */
|
|
|
__asm__ __volatile__("xchgl %1,%0": "+m" (*ptr), "+q" (next) : : "memory");
|
|
|
return next;
|
|
@@ -71,7 +72,7 @@ static inline unsigned starpu_xchg(unsigned *ptr, unsigned next) {
|
|
|
#endif
|
|
|
|
|
|
#define STARPU_ATOMIC_SOMETHING(name,expr) \
|
|
|
-static inline unsigned starpu_atomic_##name(unsigned *ptr, unsigned value) { \
|
|
|
+static __inline unsigned starpu_atomic_##name(unsigned *ptr, unsigned value) { \
|
|
|
unsigned old, next; \
|
|
|
while (1) { \
|
|
|
old = *ptr; \
|
|
@@ -120,7 +121,7 @@ STARPU_ATOMIC_SOMETHING(or, old | value)
|
|
|
#define STARPU_SYNCHRONIZE() __asm__ __volatile__("sync" ::: "memory")
|
|
|
#endif
|
|
|
|
|
|
-static inline int starpu_get_env_number(const char *str)
|
|
|
+static __inline int starpu_get_env_number(const char *str)
|
|
|
{
|
|
|
char *strval;
|
|
|
|
|
@@ -133,12 +134,12 @@ static inline int starpu_get_env_number(const char *str)
|
|
|
val = (int)strtol(strval, &check, 10);
|
|
|
STARPU_ASSERT(strcmp(check, "\0") == 0);
|
|
|
|
|
|
- //fprintf(stderr, "ENV %s WAS %d\n", str, val);
|
|
|
+ /* fprintf(stderr, "ENV %s WAS %d\n", str, val); */
|
|
|
return val;
|
|
|
}
|
|
|
else {
|
|
|
/* there is no such env variable */
|
|
|
- //fprintf("There was no %s ENV\n", str);
|
|
|
+ /* fprintf("There was no %s ENV\n", str); */
|
|
|
return -1;
|
|
|
}
|
|
|
}
|
|
@@ -216,4 +217,4 @@ void starpu_pack_cl_args(char **arg_buffer, size_t *arg_buffer_size, ...);
|
|
|
}
|
|
|
#endif
|
|
|
|
|
|
-#endif // __STARPU_UTIL_H__
|
|
|
+#endif /* __STARPU_UTIL_H__ */
|