|
@@ -1,6 +1,6 @@
|
|
/* StarPU --- Runtime system for heterogeneous multicore architectures.
|
|
/* StarPU --- Runtime system for heterogeneous multicore architectures.
|
|
*
|
|
*
|
|
- * Copyright (C) 2010-2016 Université de Bordeaux
|
|
|
|
|
|
+ * Copyright (C) 2010-2017 Université de Bordeaux
|
|
* Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016 CNRS
|
|
* Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016 CNRS
|
|
* Copyright (C) 2011 Télécom-SudParis
|
|
* Copyright (C) 2011 Télécom-SudParis
|
|
* Copyright (C) 2014, 2016 INRIA
|
|
* Copyright (C) 2014, 2016 INRIA
|
|
@@ -428,10 +428,7 @@ struct starpu_task *_starpu_get_worker_task(struct _starpu_worker *worker, int w
|
|
_starpu_worker_set_status_sleeping(workerid);
|
|
_starpu_worker_set_status_sleeping(workerid);
|
|
|
|
|
|
if (_starpu_worker_can_block(memnode, worker)
|
|
if (_starpu_worker_can_block(memnode, worker)
|
|
-#ifndef STARPU_SIMGRID
|
|
|
|
- && !_starpu_sched_ctx_last_worker_awake(worker)
|
|
|
|
-#endif
|
|
|
|
- )
|
|
|
|
|
|
+ && !_starpu_sched_ctx_last_worker_awake(worker))
|
|
{
|
|
{
|
|
STARPU_PTHREAD_COND_WAIT(&worker->sched_cond, &worker->sched_mutex);
|
|
STARPU_PTHREAD_COND_WAIT(&worker->sched_cond, &worker->sched_mutex);
|
|
STARPU_PTHREAD_MUTEX_UNLOCK_SCHED(&worker->sched_mutex);
|
|
STARPU_PTHREAD_MUTEX_UNLOCK_SCHED(&worker->sched_mutex);
|
|
@@ -440,18 +437,7 @@ struct starpu_task *_starpu_get_worker_task(struct _starpu_worker *worker, int w
|
|
{
|
|
{
|
|
STARPU_PTHREAD_MUTEX_UNLOCK_SCHED(&worker->sched_mutex);
|
|
STARPU_PTHREAD_MUTEX_UNLOCK_SCHED(&worker->sched_mutex);
|
|
if (_starpu_machine_is_running())
|
|
if (_starpu_machine_is_running())
|
|
- {
|
|
|
|
_starpu_exponential_backoff(worker);
|
|
_starpu_exponential_backoff(worker);
|
|
-#ifdef STARPU_SIMGRID
|
|
|
|
- static int warned;
|
|
|
|
- if (!warned)
|
|
|
|
- {
|
|
|
|
- warned = 1;
|
|
|
|
- _STARPU_DISP("Has to make simgrid spin for CPU idle time. You can try to pass --enable-blocking-drivers to ./configure to avoid this\n");
|
|
|
|
- }
|
|
|
|
- MSG_process_sleep(0.000010);
|
|
|
|
-#endif
|
|
|
|
- }
|
|
|
|
}
|
|
}
|
|
|
|
|
|
return NULL;
|
|
return NULL;
|