Fix includability of starpu_sched_component.h

include/starpu_sched_component.h

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2013-2014,2017                           Inria
  * Copyright (C) 2014-2015,2017                           CNRS
- * Copyright (C) 2014-2017                                Université de Bordeaux
+ * Copyright (C) 2014-2018                                Université de Bordeaux
  * Copyright (C) 2013                                     Simon Archipoff
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -205,12 +205,12 @@ struct starpu_sched_tree *starpu_sched_component_make_scheduler(unsigned sched_c
 #define STARPU_COMPONENT_MUTEX_LOCK(m) \
 do \
 { \
-	const int _relaxed_state = _starpu_worker_get_relax_state(); \
+	const int _relaxed_state = starpu_worker_get_relax_state(); \
 	if (!_relaxed_state) \
-		_starpu_worker_relax_on(); \
+		starpu_worker_relax_on(); \
 	STARPU_PTHREAD_MUTEX_LOCK((m)); \
 	if (!_relaxed_state) \
-		_starpu_worker_relax_off(); \
+		starpu_worker_relax_off(); \
 } \
 while(0)
 

src/core/workers.c

@@ -2436,16 +2436,19 @@ int starpu_worker_sched_op_pending(void)
 	return _starpu_worker_sched_op_pending();
 }
 
+#undef starpu_worker_relax_on
 void starpu_worker_relax_on(void)
 {
 	_starpu_worker_relax_on();
 }
 
+#undef starpu_worker_relax_off
 void starpu_worker_relax_off(void)
 {
 	_starpu_worker_relax_off();
 }
 
+#undef starpu_worker_get_relax_state
 int starpu_worker_get_relax_state(void)
 {
 	return _starpu_worker_get_relax_state();

src/core/workers.h

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2011-2017                                Inria
- * Copyright (C) 2008-2017                                Université de Bordeaux
+ * Copyright (C) 2008-2018                                Université de Bordeaux
  * Copyright (C) 2010-2017                                CNRS
  * Copyright (C) 2013                                     Thibaut Lambert
  * Copyright (C) 2016                                     Uppsala University
@@ -980,6 +980,7 @@ static inline void _starpu_worker_relax_on(void)
 #ifdef STARPU_SPINLOCK_CHECK
 #define _starpu_worker_relax_on() __starpu_worker_relax_on(__FILE__, __LINE__, __starpu_func__)
 #endif
+#define starpu_worker_relax_on _starpu_worker_relax_on
 
 /* Same, but with current worker mutex already held */
 #ifdef STARPU_SPINLOCK_CHECK
@@ -1037,6 +1038,7 @@ static inline void _starpu_worker_relax_off(void)
 #ifdef STARPU_SPINLOCK_CHECK
 #define _starpu_worker_relax_off() __starpu_worker_relax_off(__FILE__, __LINE__, __starpu_func__)
 #endif
+#define starpu_worker_relax_off _starpu_worker_relax_off
 
 #ifdef STARPU_SPINLOCK_CHECK
 static inline void __starpu_worker_relax_off_locked(const char*file, int line, const char* func)
@@ -1076,6 +1078,7 @@ static inline int _starpu_worker_get_relax_state(void)
 	STARPU_ASSERT(worker != NULL);
 	return worker->state_relax_refcnt != 0;
 }
+#define starpu_worker_get_relax_state _starpu_worker_get_relax_state
 
 /* lock a worker for observing contents
  *