Browse Source

fix last commit

Nathalie Furmento 12 years ago
parent
commit
3f40093bf5
2 changed files with 2 additions and 8 deletions
  1. 0 2
      include/starpu_sched_ctx.h
  2. 2 6
      src/core/workers.h

+ 0 - 2
include/starpu_sched_ctx.h

@@ -100,8 +100,6 @@ of a scheduling strategy with a single task queue, the same condition variable
 would be used to block and wake up all workers.  The initialization method of a
 scheduling strategy (init_sched) must call this function once per worker. */
 #if !defined(_MSC_VER) && !defined(STARPU_SIMGRID)
-void starpu_worker_set_sched_condition(unsigned sched_ctx_id, int workerid, pthread_mutex_t *sched_mutex, pthread_cond_t *sched_cond);
-
 #ifdef STARPU_DEVEL
 #warning do we really need both starpu_sched_ctx_set_worker_mutex_and_cond and starpu_sched_ctx_init_worker_mutex_and_cond functions
 #endif

+ 2 - 6
src/core/workers.h

@@ -247,13 +247,9 @@ void _starpu_worker_set_status(int workerid, enum _starpu_worker_status status);
 unsigned _starpu_execute_registered_progression_hooks(void);
 
 #if defined(_MSC_VER) || defined(STARPU_SIMGRID)
-void starpu_worker_set_sched_condition(unsigned sched_ctx_id, int workerid, _starpu_pthread_mutex_t *sched_mutex, _starpu_pthread_cond_t *sched_cond);
+void starpu_sched_ctx_set_worker_mutex_and_cond(unsigned sched_ctx_id, int workerid, _starpu_pthread_mutex_t *sched_mutex, _starpu_pthread_cond_t *sched_cond);
 
-void starpu_worker_get_sched_condition(unsigned sched_ctx_id, int workerid, _starpu_pthread_mutex_t **sched_mutex, _starpu_pthread_cond_t **sched_cond);
-
-void starpu_sched_ctx_set_worker_mutex_and_cond(unsigned sched_ctx_id, int workerid, pthread_mutex_t *sched_mutex, _starpu_pthread_cond_t *sched_cond);
-
-void starpu_sched_ctx_get_worker_mutex_and_cond(unsigned sched_ctx_id, int workerid, pthread_mutex_t **sched_mutex, _starpu_pthread_cond_t **sched_cond);
+void starpu_sched_ctx_get_worker_mutex_and_cond(unsigned sched_ctx_id, int workerid, _starpu_pthread_mutex_t **sched_mutex, _starpu_pthread_cond_t **sched_cond);
 #endif
 
 /* We keep an initial sched ctx which might be used in case no other ctx is available */