src/sched_policies : Renaming pop_task into pull_task in Modularized Schedulers only

include/starpu_sched_component.h

@@ -79,7 +79,7 @@ struct starpu_sched_component
 	/* component->push_task(component, task)
 	 * this function is called to push a task on component subtree, this can either
 	 * perform a recursive call on a child or store the task in the component, then
-	 * it will be returned by a further pop_task call
+	 * it will be returned by a further pull_task call
 	 *
 	 * the caller must ensure that component is able to execute task
 	 */
@@ -91,7 +91,7 @@ struct starpu_sched_component
 	 *
 	 * a default implementation simply do a recursive call on parent
 	 */
-	struct starpu_task * (*pop_task)(struct starpu_sched_component *);
+	struct starpu_task * (*pull_task)(struct starpu_sched_component *);
 
 	/* This function is called by a component which implements a queue, allowing it to
 	 * signify to its parents that an empty slot is available in its queue.

src/sched_policies/component_best_implementation.c

@@ -83,7 +83,7 @@ int starpu_sched_component_is_best_implementation(struct starpu_sched_component
 	return component->push_task == best_implementation_push_task;
 }
 
-static struct starpu_task * best_implementation_pop_task(struct starpu_sched_component * component)
+static struct starpu_task * best_implementation_pull_task(struct starpu_sched_component * component)
 {
 	struct starpu_task * task = NULL;
 	int i;
@@ -93,7 +93,7 @@ static struct starpu_task * best_implementation_pop_task(struct starpu_sched_com
 			continue;
 		else
 		{
-			task = component->parents[i]->pop_task(component->parents[i]);
+			task = component->parents[i]->pull_task(component->parents[i]);
 			if(task)
 				break;
 		}
@@ -108,6 +108,6 @@ struct starpu_sched_component * starpu_sched_component_best_implementation_creat
 {
 	struct starpu_sched_component * component = starpu_sched_component_create();
 	component->push_task = best_implementation_push_task;
-	component->pop_task = best_implementation_pop_task;
+	component->pull_task = best_implementation_pull_task;
 	return component;
 }

src/sched_policies/component_composed.c

@@ -123,12 +123,12 @@ static int composed_component_push_task(struct starpu_sched_component * componen
 	struct composed_component *c = component->data;
 	return c->top->push_task(c->top,task);
 }
-struct starpu_task * composed_component_pop_task(struct starpu_sched_component *component)
+struct starpu_task * composed_component_pull_task(struct starpu_sched_component *component)
 {
 	struct composed_component *c = component->data;
 	struct starpu_task * task = NULL;
 	
-	task = c->bottom->pop_task(c->bottom);
+	task = c->bottom->pull_task(c->bottom);
 	if(task)
 		return task;
 
@@ -139,7 +139,7 @@ struct starpu_task * composed_component_pop_task(struct starpu_sched_component *
 			continue;
 		else
 		{
-			task = component->parents[i]->pop_task(component->parents[i]);
+			task = component->parents[i]->pull_task(component->parents[i]);
 			if(task)
 				break;
 		}
@@ -224,7 +224,7 @@ struct starpu_sched_component * starpu_sched_component_composed_component_create
 
 	component->data = c;
 	component->push_task = composed_component_push_task;
-	component->pop_task = composed_component_pop_task;
+	component->pull_task = composed_component_pull_task;
 	component->estimated_load = composed_component_estimated_load;
 	component->add_child = composed_component_add_child;
 	component->remove_child = composed_component_remove_child;

src/sched_policies/component_fifo.c

@@ -155,7 +155,7 @@ static int fifo_push_task(struct starpu_sched_component * component, struct star
 	return fifo_push_local_task(component, task, 0);
 }
 
-static struct starpu_task * fifo_pop_task(struct starpu_sched_component * component)
+static struct starpu_task * fifo_pull_task(struct starpu_sched_component * component)
 {
 	STARPU_ASSERT(component && component->data);
 	struct _starpu_fifo_data * data = component->data;
@@ -214,7 +214,7 @@ static int fifo_can_push(struct starpu_sched_component * component)
 	STARPU_ASSERT(component->nchildren == 1);
 	struct starpu_sched_component * child = component->children[0];
 
-	struct starpu_task * task = component->pop_task(component);
+	struct starpu_task * task = component->pull_task(component);
 	if(task)
 		ret = child->push_task(child,task);	
 	while(task && !ret) 
@@ -222,7 +222,7 @@ static int fifo_can_push(struct starpu_sched_component * component)
 		if(!res)
 			res = 1;
 
-		task = component->pop_task(component);
+		task = component->pull_task(component);
 		if(task)
 			ret = child->push_task(child,task);	
 	} 
@@ -247,7 +247,7 @@ struct starpu_sched_component * starpu_sched_component_fifo_create(struct starpu
 	component->estimated_end = fifo_estimated_end;
 	component->estimated_load = fifo_estimated_load;
 	component->push_task = fifo_push_task;
-	component->pop_task = fifo_pop_task;
+	component->pull_task = fifo_pull_task;
 	component->can_push = fifo_can_push;
 	component->deinit_data = fifo_component_deinit_data;
 

src/sched_policies/component_prio.c

@@ -169,7 +169,7 @@ static int prio_push_task(struct starpu_sched_component * component, struct star
 	return ret;
 }
 
-static struct starpu_task * prio_pop_task(struct starpu_sched_component * component)
+static struct starpu_task * prio_pull_task(struct starpu_sched_component * component)
 {
 	STARPU_ASSERT(component && component->data);
 	struct _starpu_prio_data * data = component->data;
@@ -230,7 +230,7 @@ static int prio_can_push(struct starpu_sched_component * component)
 	STARPU_ASSERT(component->nchildren == 1);
 	struct starpu_sched_component * child = component->children[0];
 
-	struct starpu_task * task = component->pop_task(component);
+	struct starpu_task * task = component->pull_task(component);
 	if(task)
 		ret = child->push_task(child,task);	
 	while(task && !ret) 
@@ -238,7 +238,7 @@ static int prio_can_push(struct starpu_sched_component * component)
 		if(!res)
 			res = 1;
 
-		task = component->pop_task(component);
+		task = component->pull_task(component);
 		if(task)
 			ret = child->push_task(child,task);	
 	} 
@@ -263,7 +263,7 @@ struct starpu_sched_component * starpu_sched_component_prio_create(struct starpu
 	component->estimated_end = prio_estimated_end;
 	component->estimated_load = prio_estimated_load;
 	component->push_task = prio_push_task;
-	component->pop_task = prio_pop_task;
+	component->pull_task = prio_pull_task;
 	component->can_push = prio_can_push;
 	component->deinit_data = prio_component_deinit_data;
 

src/sched_policies/component_sched.c

@@ -344,9 +344,9 @@ struct starpu_task * starpu_sched_tree_pop_task(unsigned sched_ctx STARPU_ATTRIB
 	int workerid = starpu_worker_get_id();
 	struct starpu_sched_component * component = starpu_sched_component_worker_get(workerid);
 
-	/* _starpu_sched_component_lock_worker(workerid) is called by component->pop_task()
+	/* _starpu_sched_component_lock_worker(workerid) is called by component->pull_task()
 	 */
-	struct starpu_task * task = component->pop_task(component);
+	struct starpu_task * task = component->pull_task(component);
 	return task;
 }
 
@@ -469,10 +469,10 @@ static void starpu_sched_component_remove_parent(struct starpu_sched_component *
 	component->parents[pos] = component->parents[--component->nparents];
 }
 
-/* default implementation for component->pop_task()
+/* default implementation for component->pull_task()
  * just perform a recursive call on parent
  */
-static struct starpu_task * starpu_sched_component_pop_task(struct starpu_sched_component * component)
+static struct starpu_task * starpu_sched_component_pull_task(struct starpu_sched_component * component)
 {
 	STARPU_ASSERT(component);
 	struct starpu_task * task = NULL;
@@ -483,7 +483,7 @@ static struct starpu_task * starpu_sched_component_pop_task(struct starpu_sched_
 			continue;
 		else
 		{
-			task = component->parents[i]->pop_task(component->parents[i]);
+			task = component->parents[i]->pull_task(component->parents[i]);
 			if(task)
 				break;
 		}
@@ -567,7 +567,7 @@ struct starpu_sched_component * starpu_sched_component_create(void)
 	component->remove_child = starpu_sched_component_remove_child;
 	component->add_parent = starpu_sched_component_add_parent;
 	component->remove_parent = starpu_sched_component_remove_parent;
-	component->pop_task = starpu_sched_component_pop_task;
+	component->pull_task = starpu_sched_component_pull_task;
 	component->can_push = starpu_sched_component_can_push;
 	component->can_pull = starpu_sched_component_can_pull;
 	component->estimated_load = starpu_sched_component_estimated_load;

src/sched_policies/component_work_stealing.c

@@ -116,7 +116,7 @@ static int is_worker_of_component(struct starpu_sched_component * component, int
 
 
 
-static struct starpu_task * pop_task(struct starpu_sched_component * component)
+static struct starpu_task * pull_task(struct starpu_sched_component * component)
 {
 	int workerid = starpu_worker_get_id();
 	int i;
@@ -161,7 +161,7 @@ static struct starpu_task * pop_task(struct starpu_sched_component * component)
 			continue;
 		else
 		{
-			task = component->parents[i]->pop_task(component->parents[i]);
+			task = component->parents[i]->pull_task(component->parents[i]);
 			if(task)
 				break;
 		}
@@ -340,7 +340,7 @@ struct starpu_sched_component * starpu_sched_component_work_stealing_create(void
 	struct starpu_sched_component * component = starpu_sched_component_create();
 	struct _starpu_work_stealing_data * wsd = malloc(sizeof(*wsd));
 	memset(wsd, 0, sizeof(*wsd));
-	component->pop_task = pop_task;
+	component->pull_task = pull_task;
 	component->push_task = push_task;
 	component->add_child = _ws_add_child;
 	component->remove_child = _ws_remove_child;

src/sched_policies/component_worker.c

@@ -478,7 +478,7 @@ static int simple_worker_push_task(struct starpu_sched_component * component, st
 	return 0;
 }
 
-static struct starpu_task * simple_worker_pop_task(struct starpu_sched_component *component)
+static struct starpu_task * simple_worker_pull_task(struct starpu_sched_component *component)
 {
 	int workerid = starpu_worker_get_id();
 	struct _starpu_worker_component_data * data = component->data;
@@ -502,7 +502,7 @@ static struct starpu_task * simple_worker_pop_task(struct starpu_sched_component
 			else
 			{
 				_starpu_sched_component_worker_unlock_scheduling();
-				task = component->parents[i]->pop_task(component->parents[i]);
+				task = component->parents[i]->pull_task(component->parents[i]);
 				_starpu_sched_component_worker_lock_scheduling();
 				if(task)
 					break;
@@ -524,7 +524,7 @@ static struct starpu_task * simple_worker_pop_task(struct starpu_sched_component
 		struct starpu_sched_component * combined_worker_component = starpu_sched_component_worker_get(workerid);
 		(void)combined_worker_component->push_task(combined_worker_component, task);
 		/* we have pushed a task in queue, so can make a recursive call */
-		return simple_worker_pop_task(component);
+		return simple_worker_pull_task(component);
 
 	}
 	if(task)
@@ -599,7 +599,7 @@ static struct starpu_sched_component * starpu_sched_component_worker_create(int
 	component->data = data;
 
 	component->push_task = simple_worker_push_task;
-	component->pop_task = simple_worker_pop_task;
+	component->pull_task = simple_worker_pull_task;
 	component->can_pull = simple_worker_can_pull;
 	component->estimated_end = simple_worker_estimated_end;
 	component->estimated_load = simple_worker_estimated_load;
@@ -775,7 +775,7 @@ static struct starpu_sched_component  * starpu_sched_component_combined_worker_c
 
 	component->data = data;
 	component->push_task = combined_worker_push_task;
-	component->pop_task = NULL;
+	component->pull_task = NULL;
 	component->estimated_end = combined_worker_estimated_end;
 	component->estimated_load = combined_worker_estimated_load;
 	component->can_pull = combined_worker_can_pull;