|
@@ -254,9 +254,8 @@ static void _starpu_sched_ctx_create_hwloc_tree(struct _starpu_sched_ctx *sched_
|
|
|
struct starpu_worker_collection *workers = sched_ctx->workers;
|
|
|
struct _starpu_worker *worker;
|
|
|
struct starpu_sched_ctx_iterator it;
|
|
|
- if(workers->init_iterator)
|
|
|
- workers->init_iterator(workers, &it);
|
|
|
|
|
|
+ workers->init_iterator(workers, &it);
|
|
|
while(workers->has_next(workers, &it))
|
|
|
{
|
|
|
worker = _starpu_get_worker_struct(workers->get_next(workers, &it));
|
|
@@ -877,9 +876,8 @@ int _starpu_nworkers_able_to_execute_task(struct starpu_task *task, struct _star
|
|
|
struct starpu_worker_collection *workers = sched_ctx->workers;
|
|
|
|
|
|
struct starpu_sched_ctx_iterator it;
|
|
|
- if(workers->init_iterator)
|
|
|
- workers->init_iterator(workers, &it);
|
|
|
|
|
|
+ workers->init_iterator(workers, &it);
|
|
|
while(workers->has_next(workers, &it))
|
|
|
{
|
|
|
worker = workers->get_next(workers, &it);
|
|
@@ -1202,9 +1200,8 @@ unsigned starpu_sched_ctx_get_workers_list(unsigned sched_ctx_id, int **workerid
|
|
|
int worker;
|
|
|
unsigned nworkers = 0;
|
|
|
struct starpu_sched_ctx_iterator it;
|
|
|
- if(workers->init_iterator)
|
|
|
- workers->init_iterator(workers, &it);
|
|
|
|
|
|
+ workers->init_iterator(workers, &it);
|
|
|
while(workers->has_next(workers, &it))
|
|
|
{
|
|
|
worker = workers->get_next(workers, &it);
|
|
@@ -1236,9 +1233,8 @@ int _starpu_get_workers_of_sched_ctx(unsigned sched_ctx_id, int *pus, enum starp
|
|
|
|
|
|
int npus = 0;
|
|
|
struct starpu_sched_ctx_iterator it;
|
|
|
- if(workers->init_iterator)
|
|
|
- workers->init_iterator(workers, &it);
|
|
|
|
|
|
+ workers->init_iterator(workers, &it);
|
|
|
while(workers->has_next(workers, &it))
|
|
|
{
|
|
|
worker = workers->get_next(workers, &it);
|
|
@@ -1276,12 +1272,9 @@ unsigned starpu_sched_ctx_get_nshared_workers(unsigned sched_ctx_id, unsigned sc
|
|
|
int shared_workers = 0;
|
|
|
|
|
|
struct starpu_sched_ctx_iterator it1, it2;
|
|
|
- if(workers->init_iterator)
|
|
|
- workers->init_iterator(workers, &it1);
|
|
|
-
|
|
|
- if(workers2->init_iterator)
|
|
|
- workers2->init_iterator(workers2, &it2);
|
|
|
|
|
|
+ workers->init_iterator(workers, &it1);
|
|
|
+ workers2->init_iterator(workers2, &it2);
|
|
|
while(workers->has_next(workers, &it1))
|
|
|
{
|
|
|
worker = workers->get_next(workers, &it1);
|
|
@@ -1304,10 +1297,8 @@ unsigned starpu_sched_ctx_contains_worker(int workerid, unsigned sched_ctx_id)
|
|
|
int worker;
|
|
|
|
|
|
struct starpu_sched_ctx_iterator it;
|
|
|
- if(workers->init_iterator)
|
|
|
- workers->init_iterator(workers, &it);
|
|
|
-
|
|
|
|
|
|
+ workers->init_iterator(workers, &it);
|
|
|
while(workers->has_next(workers, &it))
|
|
|
{
|
|
|
worker = workers->get_next(workers, &it);
|
|
@@ -1325,9 +1316,8 @@ unsigned starpu_sched_ctx_contains_type_of_worker(enum starpu_worker_archtype ar
|
|
|
int worker;
|
|
|
|
|
|
struct starpu_sched_ctx_iterator it;
|
|
|
- if(workers->init_iterator)
|
|
|
- workers->init_iterator(workers, &it);
|
|
|
|
|
|
+ workers->init_iterator(workers, &it);
|
|
|
while(workers->has_next(workers, &it))
|
|
|
{
|
|
|
worker = workers->get_next(workers, &it);
|
|
@@ -1548,9 +1538,8 @@ unsigned _starpu_sched_ctx_last_worker_awake(struct _starpu_worker *worker)
|
|
|
struct starpu_sched_ctx_iterator it;
|
|
|
|
|
|
int workerid;
|
|
|
- if(workers->init_iterator)
|
|
|
- workers->init_iterator(workers, &it);
|
|
|
|
|
|
+ workers->init_iterator(workers, &it);
|
|
|
while(workers->has_next(workers, &it))
|
|
|
{
|
|
|
workerid = workers->get_next(workers, &it);
|
|
@@ -1741,9 +1730,8 @@ static void _starpu_sched_ctx_wake_up_workers(unsigned sched_ctx_id, int master)
|
|
|
struct starpu_worker_collection *workers = sched_ctx->workers;
|
|
|
|
|
|
struct starpu_sched_ctx_iterator it;
|
|
|
- if(workers->init_iterator)
|
|
|
- workers->init_iterator(workers, &it);
|
|
|
|
|
|
+ workers->init_iterator(workers, &it);
|
|
|
while(workers->has_next(workers, &it))
|
|
|
{
|
|
|
int workerid = workers->get_next(workers, &it);
|
|
@@ -1790,9 +1778,8 @@ void starpu_sched_ctx_get_available_cpuids(unsigned sched_ctx_id, int **cpuids,
|
|
|
|
|
|
struct starpu_sched_ctx_iterator it;
|
|
|
int workerid;
|
|
|
- if(workers->init_iterator)
|
|
|
- workers->init_iterator(workers, &it);
|
|
|
|
|
|
+ workers->init_iterator(workers, &it);
|
|
|
while(workers->has_next(workers, &it))
|
|
|
{
|
|
|
workerid = workers->get_next(workers, &it);
|
|
@@ -1959,9 +1946,8 @@ int starpu_sched_ctx_get_worker_rank(unsigned sched_ctx_id)
|
|
|
struct starpu_worker_collection *workers = sched_ctx->workers;
|
|
|
|
|
|
struct starpu_sched_ctx_iterator it;
|
|
|
- if(workers->init_iterator)
|
|
|
- workers->init_iterator(workers, &it);
|
|
|
|
|
|
+ workers->init_iterator(workers, &it);
|
|
|
while(workers->has_next(workers, &it))
|
|
|
{
|
|
|
worker = workers->get_next(workers, &it);
|