src/sched_policies : Renaming

	component->father  ==>  component->parent
	component->nfathers  ==>  component->nparents

include/starpu_sched_component.h

@@ -26,7 +26,7 @@
 
 /* struct starpu_sched_component are scheduler modules, a scheduler is a tree-like
  * structure of them, some parts of scheduler can be shared by several contexes
- * to perform some local optimisations, so, for all components, a list of father is
+ * to perform some local optimisations, so, for all components, a list of parent is
  * defined indexed by sched_ctx_id
  *
  * they embed there specialised method in a pseudo object-style, so calls are like component->push_task(component,task)
@@ -43,11 +43,11 @@ struct starpu_sched_component
 	 */
 	int (*push_task)(struct starpu_sched_component *,
 			 struct starpu_task *);
-	/* this function is called by workers to get a task on them fathers
+	/* this function is called by workers to get a task on them parents
 	 * this function should first return a localy stored task or perform
-	 * a recursive call on father
+	 * a recursive call on parent
 	 *
-	 * a default implementation simply do a recursive call on father
+	 * a default implementation simply do a recursive call on parent
 	 */
 	struct starpu_task * (*pop_task)(struct starpu_sched_component *);
 
@@ -66,17 +66,17 @@ struct starpu_sched_component
 	 */
 	struct starpu_sched_component ** children;
 	/* may be shared by several contexts
-	 * so we need several fathers
+	 * so we need several parents
 	 */
-	struct starpu_sched_component ** fathers;
-	int nfathers;
+	struct starpu_sched_component ** parents;
+	int nparents;
 	/* the set of workers in the component's subtree
 	 */
 	struct starpu_bitmap * workers;
 	/* the workers available in context
 	 * this member is set with : 
 	 * component->workers UNION tree->workers UNION
-	 * component->child[i]->workers_in_ctx iff exist x such as component->children[i]->fathers[x] == component
+	 * component->child[i]->workers_in_ctx iff exist x such as component->children[i]->parents[x] == component
 	 */
 	struct starpu_bitmap * workers_in_ctx;
 	
@@ -86,8 +86,8 @@ struct starpu_sched_component
 
 	void (*add_child)(struct starpu_sched_component * component, struct starpu_sched_component * child);
 	void (*remove_child)(struct starpu_sched_component * component, struct starpu_sched_component * child);
-	void (*add_father)(struct starpu_sched_component * component, struct starpu_sched_component * father);
-	void (*remove_father)(struct starpu_sched_component * component, struct starpu_sched_component * father);
+	void (*add_parent)(struct starpu_sched_component * component, struct starpu_sched_component * parent);
+	void (*remove_parent)(struct starpu_sched_component * component, struct starpu_sched_component * parent);
 
 	/* this function is called for each component when workers are added or removed from a context
 	 */
@@ -102,9 +102,9 @@ struct starpu_sched_component
 	int properties;
 
 	/* This function is called by a component which implements a queue, allowing it to
-	 * signify to its fathers that an empty slot is available in its queue.
+	 * signify to its parents that an empty slot is available in its queue.
 	 * The basic implementation of this function is a recursive call to its
-	 * fathers, the user have to specify a personally-made function to catch those
+	 * parents, the user have to specify a personally-made function to catch those
 	 * calls.
 	 */ 
 	int (*can_push)(struct starpu_sched_component * component);

src/sched_policies/component_best_implementation.c

@@ -84,13 +84,13 @@ static struct starpu_task * select_best_implementation_pop_task(struct starpu_sc
 {
 	struct starpu_task * task = NULL;
 	int i;
-	for(i=0; i < component->nfathers; i++)
+	for(i=0; i < component->nparents; i++)
 	{
-		if(component->fathers[i] == NULL)
+		if(component->parents[i] == NULL)
 			continue;
 		else
 		{
-			task = component->fathers[i]->pop_task(component->fathers[i]);
+			task = component->parents[i]->pop_task(component->parents[i]);
 			if(task)
 				break;
 		}

src/sched_policies/component_composed.c

@@ -110,7 +110,7 @@ struct composed_component create_composed_component(struct starpu_sched_componen
 		 */
 		unsigned j;
 		for(j = 0; j < STARPU_NMAX_SCHED_CTXS; j++)
-			component->add_father(component, c.bottom);
+			component->add_parent(component, c.bottom);
 		c.bottom = component;
 	}
 	STARPU_ASSERT(!starpu_sched_component_is_worker(c.bottom));
@@ -133,13 +133,13 @@ struct starpu_task * composed_component_pop_task(struct starpu_sched_component *
 		return task;
 
 	int i;
-	for(i=0; i < component->nfathers; i++)
+	for(i=0; i < component->nparents; i++)
 	{
-		if(component->fathers[i] == NULL)
+		if(component->parents[i] == NULL)
 			continue;
 		else
 		{
-			task = component->fathers[i]->pop_task(component->fathers[i]);
+			task = component->parents[i]->pop_task(component->parents[i]);
 			if(task)
 				break;
 		}
@@ -219,8 +219,8 @@ struct starpu_sched_component * starpu_sched_component_composed_component_create
 );
 	c->bottom->nchildren = component->nchildren;
 	c->bottom->children = component->children;
-	c->bottom->nfathers = component->nfathers;
-	c->bottom->fathers = component->fathers;
+	c->bottom->nparents = component->nparents;
+	c->bottom->parents = component->parents;
 
 	component->data = c;
 	component->push_task = composed_component_push_task;

src/sched_policies/component_fifo.c

@@ -185,13 +185,13 @@ static struct starpu_task * fifo_pop_task(struct starpu_sched_component * compon
 	// When a pop is called, a can_push is called for pushing tasks onto
 	// the empty place of the queue left by the popped task.
 	int i,ret;
-	for(i=0; i < component->nfathers; i++)
+	for(i=0; i < component->nparents; i++)
 	{
-		if(component->fathers[i] == NULL)
+		if(component->parents[i] == NULL)
 			continue;
 		else
 		{
-			ret = component->fathers[i]->can_push(component->fathers[i]);
+			ret = component->parents[i]->can_push(component->parents[i]);
 			if(ret)
 				break;
 		}

src/sched_policies/component_heft.c

@@ -202,13 +202,13 @@ static int heft_can_push(struct starpu_sched_component *component)
 	heft_progress(component);
 	_starpu_sched_component_lock_scheduling();
 	int ret, j;
-	for(j=0; j < component->nfathers; j++)
+	for(j=0; j < component->nparents; j++)
 	{
-		if(component->fathers[j] == NULL)
+		if(component->parents[j] == NULL)
 			continue;
 		else
 		{
-			ret = component->fathers[j]->can_push(component->fathers[j]);
+			ret = component->parents[j]->can_push(component->parents[j]);
 			if(ret)
 				break;
 		}

src/sched_policies/component_mct.c

@@ -57,7 +57,7 @@ static int mct_push_task(struct starpu_sched_component * component, struct starp
 
 	/* If no suitable components were found, it means that the perfmodel of
 	 * the task had been purged since it has been pushed on the mct component.
-	 * We should send a push_fail message to its father so that it will
+	 * We should send a push_fail message to its parent so that it will
 	 * be able to reschedule the task properly. */
 	if(nsuitable_components == 0)
 		return 1;
@@ -86,7 +86,7 @@ static int mct_push_task(struct starpu_sched_component * component, struct starp
 
 	/* If no best component is found, it means that the perfmodel of
 	 * the task had been purged since it has been pushed on the mct component.
-	 * We should send a push_fail message to its father so that it will
+	 * We should send a push_fail message to its parent so that it will
 	 * be able to reschedule the task properly. */
 	if(best_icomponent == -1)
 		return 1;

src/sched_policies/component_prio.c

@@ -201,13 +201,13 @@ static struct starpu_task * prio_pop_task(struct starpu_sched_component * compon
 	// When a pop is called, a can_push is called for pushing tasks onto
 	// the empty place of the queue left by the popped task.
 	int i,ret;
-	for(i=0; i < component->nfathers; i++)
+	for(i=0; i < component->nparents; i++)
 	{
-		if(component->fathers[i] == NULL)
+		if(component->parents[i] == NULL)
 			continue;
 		else
 		{
-			ret = component->fathers[i]->can_push(component->fathers[i]);
+			ret = component->parents[i]->can_push(component->parents[i]);
 			if(ret)
 				break;
 		}

src/sched_policies/component_sched.c

@@ -25,20 +25,20 @@
 #include "sched_component.h"
 
 /* default implementation for component->pop_task()
- * just perform a recursive call on father
+ * just perform a recursive call on parent
  */
 static struct starpu_task * pop_task_component(struct starpu_sched_component * component)
 {
 	STARPU_ASSERT(component);
 	struct starpu_task * task = NULL;
 	int i;
-	for(i=0; i < component->nfathers; i++)
+	for(i=0; i < component->nparents; i++)
 	{
-		if(component->fathers[i] == NULL)
+		if(component->parents[i] == NULL)
 			continue;
 		else
 		{
-			task = component->fathers[i]->pop_task(component->fathers[i]);
+			task = component->parents[i]->pop_task(component->parents[i]);
 			if(task)
 				break;
 		}
@@ -183,29 +183,29 @@ static void starpu_sched_component_remove_child(struct starpu_sched_component *
 	component->children[pos] = component->children[--component->nchildren];
 }
 
-static void starpu_sched_component_add_father(struct starpu_sched_component* component, struct starpu_sched_component * father)
+static void starpu_sched_component_add_parent(struct starpu_sched_component* component, struct starpu_sched_component * parent)
 {
-	STARPU_ASSERT(component && father);
+	STARPU_ASSERT(component && parent);
 	int i;
-	for(i = 0; i < component->nfathers; i++){
-		STARPU_ASSERT(component->fathers[i] != component);
-		STARPU_ASSERT(component->fathers[i] != NULL);
+	for(i = 0; i < component->nparents; i++){
+		STARPU_ASSERT(component->parents[i] != component);
+		STARPU_ASSERT(component->parents[i] != NULL);
 	}
 
-	component->fathers = realloc(component->fathers, sizeof(struct starpu_sched_component *) * (component->nfathers + 1));
-	component->fathers[component->nfathers] = father;
-	component->nfathers++;
+	component->parents = realloc(component->parents, sizeof(struct starpu_sched_component *) * (component->nparents + 1));
+	component->parents[component->nparents] = parent;
+	component->nparents++;
 }
 
-static void starpu_sched_component_remove_father(struct starpu_sched_component * component, struct starpu_sched_component * father)
+static void starpu_sched_component_remove_parent(struct starpu_sched_component * component, struct starpu_sched_component * parent)
 {
-	STARPU_ASSERT(component && father);
+	STARPU_ASSERT(component && parent);
 	int pos;
-	for(pos = 0; pos < component->nfathers; pos++)
-		if(component->fathers[pos] == father)
+	for(pos = 0; pos < component->nparents; pos++)
+		if(component->parents[pos] == parent)
 			break;
-	STARPU_ASSERT(pos != component->nfathers);
-	component->fathers[pos] = component->fathers[--component->nfathers];
+	STARPU_ASSERT(pos != component->nparents);
+	component->parents[pos] = component->parents[--component->nparents];
 }
 
 struct starpu_bitmap * _starpu_get_worker_mask(unsigned sched_ctx_id)
@@ -371,7 +371,7 @@ void starpu_sched_component_prefetch_on_node(struct starpu_sched_component * com
 	}
 }
 
-/* The default implementation of the can_push function is a recursive call to its fathers.
+/* The default implementation of the can_push function is a recursive call to its parents.
  * A personally-made can_push in a component (like in prio components) is necessary to catch
  * this recursive call somewhere, if the user wants to exploit it.
  */
@@ -379,14 +379,14 @@ static int starpu_sched_component_can_push(struct starpu_sched_component * compo
 {
 	STARPU_ASSERT(component);
 	int ret = 0;
-	if(component->nfathers > 0)
+	if(component->nparents > 0)
 	{
 		int i;
-		for(i=0; i < component->nfathers; i++)
+		for(i=0; i < component->nparents; i++)
 		{
-			struct starpu_sched_component * father = component->fathers[i];
-			if(father != NULL)
-				ret = father->can_push(father);
+			struct starpu_sched_component * parent = component->parents[i];
+			if(parent != NULL)
+				ret = parent->can_push(parent);
 			if(ret)
 				break;
 		}
@@ -443,8 +443,8 @@ struct starpu_sched_component * starpu_sched_component_create(void)
 	component->workers_in_ctx = starpu_bitmap_create();
 	component->add_child = starpu_sched_component_add_child;
 	component->remove_child = starpu_sched_component_remove_child;
-	component->add_father = starpu_sched_component_add_father;
-	component->remove_father = starpu_sched_component_remove_father;
+	component->add_parent = starpu_sched_component_add_parent;
+	component->remove_parent = starpu_sched_component_remove_parent;
 	component->pop_task = pop_task_component;
 	component->can_push = starpu_sched_component_can_push;
 	component->can_pull = starpu_sched_component_can_pull;
@@ -456,7 +456,7 @@ struct starpu_sched_component * starpu_sched_component_create(void)
 }
 
 /* remove all child
- * for all child of component, if child->fathers[x] == component, set child->fathers[x] to null 
+ * for all child of component, if child->parents[x] == component, set child->parents[x] to null 
  * call component->deinit_data
  */
 void starpu_sched_component_destroy(struct starpu_sched_component *component)
@@ -468,26 +468,26 @@ void starpu_sched_component_destroy(struct starpu_sched_component *component)
 	for(i = 0; i < component->nchildren; i++)
 	{
 		struct starpu_sched_component * child = component->children[i];
-		for(j = 0; j < child->nfathers; j++)
-			if(child->fathers[j] == component)
-				child->remove_father(child,component);
+		for(j = 0; j < child->nparents; j++)
+			if(child->parents[j] == component)
+				child->remove_parent(child,component);
 
 	}
 	while(component->nchildren != 0)
 		component->remove_child(component, component->children[0]);
-	for(i = 0; i < component->nfathers; i++)
+	for(i = 0; i < component->nparents; i++)
 	{
-		struct starpu_sched_component * father = component->fathers[i];
-		for(j = 0; j < father->nchildren; j++)
-			if(father->children[j] == component)
-				father->remove_child(father,component);
+		struct starpu_sched_component * parent = component->parents[i];
+		for(j = 0; j < parent->nchildren; j++)
+			if(parent->children[j] == component)
+				parent->remove_child(parent,component);
 
 	}
-	while(component->nfathers != 0)
-		component->remove_father(component, component->fathers[0]);
+	while(component->nparents != 0)
+		component->remove_parent(component, component->parents[0]);
 	component->deinit_data(component);
 	free(component->children);
-	free(component->fathers);
+	free(component->parents);
 	starpu_bitmap_destroy(component->workers);
 	starpu_bitmap_destroy(component->workers_in_ctx);
 	free(component);
@@ -555,7 +555,7 @@ void _starpu_sched_component_update_workers_in_ctx(struct starpu_sched_component
 		struct starpu_sched_component * child = component->children[i];
 		_starpu_sched_component_update_workers_in_ctx(child, sched_ctx_id);
 		for(j = 0; j < STARPU_NMAX_SCHED_CTXS; j++)
-			if(child->fathers[j] == component)
+			if(child->parents[j] == component)
 			{
 				starpu_bitmap_or(component->workers_in_ctx, child->workers_in_ctx);
 				break;

src/sched_policies/component_work_stealing.c

@@ -155,13 +155,13 @@ static struct starpu_task * pop_task(struct starpu_sched_component * component)
 
 		return task;
 	}
-	for(i=0; i < component->nfathers; i++)
+	for(i=0; i < component->nparents; i++)
 	{
-		if(component->fathers[i] == NULL)
+		if(component->parents[i] == NULL)
 			continue;
 		else
 		{
-			task = component->fathers[i]->pop_task(component->fathers[i]);
+			task = component->parents[i]->pop_task(component->parents[i]);
 			if(task)
 				break;
 		}
@@ -243,9 +243,9 @@ int starpu_sched_tree_work_stealing_push_task(struct starpu_task *task)
 
 	unsigned sched_ctx_id = task->sched_ctx;
 	struct starpu_sched_component * component =starpu_sched_component_worker_get(workerid);
-	while(component->fathers[sched_ctx_id] != NULL)
+	while(component->parents[sched_ctx_id] != NULL)
 	{
-		component = component->fathers[sched_ctx_id];
+		component = component->parents[sched_ctx_id];
 		if(starpu_sched_component_is_work_stealing(component))
 		{
 			if(!starpu_sched_component_can_execute_task(component, task))

src/sched_policies/component_worker.c

@@ -465,13 +465,13 @@ struct starpu_task * simple_worker_pop_task(struct starpu_sched_component *compo
 	int i;
 	do {
 		_starpu_sched_component_worker_reset_status(component);
-		for(i=0; i < component->nfathers; i++)
+		for(i=0; i < component->nparents; i++)
 		{
-			if(component->fathers[i] == NULL)
+			if(component->parents[i] == NULL)
 				continue;
 			else
 			{
-				task = component->fathers[i]->pop_task(component->fathers[i]);
+				task = component->parents[i]->pop_task(component->parents[i]);
 				if(task)
 					break;
 			}
@@ -506,7 +506,7 @@ void starpu_sched_component_worker_destroy(struct starpu_sched_component *compon
 	assert(_worker_components[id] == component);
 	int i;
 	for(i = 0; i < STARPU_NMAX_SCHED_CTXS ; i++)
-		if(component->fathers[i] != NULL)
+		if(component->parents[i] != NULL)
 			return;//this component is shared between several contexts
 	starpu_sched_component_destroy(component);
 	_worker_components[id] = NULL;

src/sched_policies/scheduler_maker.c

@@ -92,7 +92,7 @@ static struct sched_component_list helper_make_scheduler(hwloc_obj_t obj, struct
 	for(i = 0; i < l.size; i++)
 	{
 		component->add_child(component, l.arr[i]);
-		starpu_sched_component_add_father(l.arr[i],component);
+		starpu_sched_component_add_parent(l.arr[i],component);
 	}
 	destroy_list(&l);
 	init_list(&l);
@@ -158,26 +158,26 @@ static struct starpu_sched_component * find_mem_component(struct starpu_sched_co
 static struct starpu_sched_component * where_should_we_plug_this(struct starpu_sched_component *root, struct starpu_sched_component * worker_component, struct starpu_sched_specs specs, unsigned sched_ctx_id)
 {
 	struct starpu_sched_component * mem = find_mem_component(root ,worker_component);
-	if(specs.mix_heterogeneous_workers || mem->fathers[sched_ctx_id] == NULL)
+	if(specs.mix_heterogeneous_workers || mem->parents[sched_ctx_id] == NULL)
 		return mem;
 	hwloc_obj_t obj = mem->obj;
-	struct starpu_sched_component * father = mem->fathers[sched_ctx_id];
+	struct starpu_sched_component * parent = mem->parents[sched_ctx_id];
 	int i;
-	for(i = 0; i < father->nchildren; i++)
+	for(i = 0; i < parent->nchildren; i++)
 	{
-		if(father->children[i]->obj == obj
-		   && is_same_kind_of_all(father->children[i], worker_component->data))
-			return father->children[i];
+		if(parent->children[i]->obj == obj
+		   && is_same_kind_of_all(parent->children[i], worker_component->data))
+			return parent->children[i];
 	}
 	if(obj->type == HWLOC_OBJ_NODE)
 	{	
 		struct starpu_sched_component * component = starpu_sched_component_composed_component_create(specs.hwloc_component_composed_sched_component);
 		component->obj = obj;
-		father->add_child(father, component);
-		starpu_sched_component_add_father(component, father);
+		parent->add_child(parent, component);
+		starpu_sched_component_add_parent(component, parent);
 		return component;
 	}
-	return father;
+	return parent;
 }
 
 static void set_worker_leaf(struct starpu_sched_component * root, struct starpu_sched_component * worker_component, unsigned sched_ctx_id,
@@ -195,13 +195,13 @@ static void set_worker_leaf(struct starpu_sched_component * root, struct starpu_
 #warning FIXME component->obj is set to worker_component->obj even for accelerators workers
 #endif
 		tmp->obj = worker_component->obj;
-		starpu_sched_component_add_father(tmp, component);
+		starpu_sched_component_add_parent(tmp, component);
 		component->add_child(component, tmp);
 		component = tmp;
 		
 	}
 	starpu_destroy_composed_sched_component_recipe(recipe);
-	starpu_sched_component_add_father(worker_component, component);
+	starpu_sched_component_add_parent(worker_component, component);
 	component->add_child(component, worker_component);
 }
 

src/sched_policies/tree_eager.c

@@ -27,7 +27,7 @@ static void initialize_eager_center_policy(unsigned sched_ctx_id)
  	t->root = starpu_sched_component_fifo_create(NULL);
 	struct starpu_sched_component * eager_component = starpu_sched_component_eager_create(NULL);
 	t->root->add_child(t->root, eager_component);
-	eager_component->add_father(eager_component, t->root);
+	eager_component->add_parent(eager_component, t->root);
 
 	unsigned i;
 	for(i = 0; i < starpu_worker_get_count() + starpu_combined_worker_get_count(); i++)
@@ -36,7 +36,7 @@ static void initialize_eager_center_policy(unsigned sched_ctx_id)
 		STARPU_ASSERT(worker_component);
 
 		eager_component->add_child(eager_component, worker_component);
-		worker_component->add_father(worker_component, eager_component);
+		worker_component->add_parent(worker_component, eager_component);
 	}
 	starpu_sched_tree_update_workers(t);
 	starpu_sched_ctx_set_policy_data(sched_ctx_id, (void*)t);

src/sched_policies/tree_eager_prefetching.c

@@ -42,7 +42,7 @@ static void initialize_eager_prefetching_center_policy(unsigned sched_ctx_id)
  	t->root = starpu_sched_component_fifo_create(NULL);
 	struct starpu_sched_component * eager_component = starpu_sched_component_eager_create(NULL);
 	t->root->add_child(t->root, eager_component);
-	eager_component->add_father(eager_component, t->root);
+	eager_component->add_parent(eager_component, t->root);
 
 	struct starpu_fifo_data fifo_data =
 		{
@@ -58,10 +58,10 @@ static void initialize_eager_prefetching_center_policy(unsigned sched_ctx_id)
 
 		struct starpu_sched_component * fifo_component = starpu_sched_component_fifo_create(&fifo_data);
 		fifo_component->add_child(fifo_component, worker_component);
-		worker_component->add_father(worker_component, fifo_component);
+		worker_component->add_parent(worker_component, fifo_component);
 
 		eager_component->add_child(eager_component, fifo_component);
-		fifo_component->add_father(fifo_component, eager_component);
+		fifo_component->add_parent(fifo_component, eager_component);
 	}
 	starpu_sched_tree_update_workers(t);
 	starpu_sched_ctx_set_policy_data(sched_ctx_id, (void*)t);

src/sched_policies/tree_heft.c

@@ -63,14 +63,14 @@ static void initialize_heft_center_policy(unsigned sched_ctx_id)
  *               worker_component                   worker_component
  *
  * A window contain the tasks that failed to be pushed, so as when the prio_components reclaim
- * tasks by calling can_push to their father (classically, just after a successful pop have
+ * tasks by calling can_push to their parent (classically, just after a successful pop have
  * been made by its associated worker_component), this call goes up to the window_component which
  * pops a task from its local queue and try to schedule it by pushing it to the
  * decision_component. 
  * Finally, the task will be pushed to the prio_component which is the direct
- * father in the tree of the worker_component the task has been scheduled on. This
+ * parent in the tree of the worker_component the task has been scheduled on. This
  * component will push the task on its local queue if no one of the two thresholds
- * have been reached for it, or send a push_error signal to its father.
+ * have been reached for it, or send a push_error signal to its parent.
  */
 	struct starpu_sched_tree * t = starpu_sched_tree_create(sched_ctx_id);
 
@@ -90,14 +90,14 @@ static void initialize_heft_center_policy(unsigned sched_ctx_id)
 
 	struct starpu_sched_component * perfmodel_select_component = starpu_sched_component_perfmodel_select_create(&perfmodel_select_data);
 	window_component->add_child(window_component, perfmodel_select_component);
-	perfmodel_select_component->add_father(perfmodel_select_component, window_component);
+	perfmodel_select_component->add_parent(perfmodel_select_component, window_component);
 
 	perfmodel_select_component->add_child(perfmodel_select_component, calibrator_component);
-	calibrator_component->add_father(calibrator_component, perfmodel_select_component);
+	calibrator_component->add_parent(calibrator_component, perfmodel_select_component);
 	perfmodel_select_component->add_child(perfmodel_select_component, perfmodel_component);
-	perfmodel_component->add_father(perfmodel_component, perfmodel_select_component);
+	perfmodel_component->add_parent(perfmodel_component, perfmodel_select_component);
 	perfmodel_select_component->add_child(perfmodel_select_component, no_perfmodel_component);
-	no_perfmodel_component->add_father(no_perfmodel_component, perfmodel_select_component);
+	no_perfmodel_component->add_parent(no_perfmodel_component, perfmodel_select_component);
 
 	struct starpu_prio_data prio_data =
 		{
@@ -113,18 +113,18 @@ static void initialize_heft_center_policy(unsigned sched_ctx_id)
 
 		struct starpu_sched_component * prio_component = starpu_sched_component_prio_create(&prio_data);
 		prio_component->add_child(prio_component, worker_component);
-		worker_component->add_father(worker_component, prio_component);
+		worker_component->add_parent(worker_component, prio_component);
 
 		struct starpu_sched_component * impl_component = starpu_sched_component_best_implementation_create(NULL);
 		impl_component->add_child(impl_component, prio_component);
-		prio_component->add_father(prio_component, impl_component);
+		prio_component->add_parent(prio_component, impl_component);
 
 		perfmodel_component->add_child(perfmodel_component, impl_component);
-		impl_component->add_father(impl_component, perfmodel_component);
+		impl_component->add_parent(impl_component, perfmodel_component);
 		no_perfmodel_component->add_child(no_perfmodel_component, impl_component);
-		impl_component->add_father(impl_component, no_perfmodel_component);
+		impl_component->add_parent(impl_component, no_perfmodel_component);
 		calibrator_component->add_child(calibrator_component, impl_component);
-		impl_component->add_father(impl_component, calibrator_component);
+		impl_component->add_parent(impl_component, calibrator_component);
 	}
 
 	starpu_sched_tree_update_workers(t);

src/sched_policies/tree_heft2.c

@@ -64,14 +64,14 @@ static void initialize_heft2_center_policy(unsigned sched_ctx_id)
 
 	struct starpu_sched_component * perfmodel_select_component = starpu_sched_component_perfmodel_select_create(&perfmodel_select_data);
 	window_component->add_child(window_component, perfmodel_select_component);
-	perfmodel_select_component->add_father(perfmodel_select_component, window_component);
+	perfmodel_select_component->add_parent(perfmodel_select_component, window_component);
 
 	perfmodel_select_component->add_child(perfmodel_select_component, calibrator_component);
-	calibrator_component->add_father(calibrator_component, perfmodel_select_component);
+	calibrator_component->add_parent(calibrator_component, perfmodel_select_component);
 	perfmodel_select_component->add_child(perfmodel_select_component, perfmodel_component);
-	perfmodel_component->add_father(perfmodel_component, perfmodel_select_component);
+	perfmodel_component->add_parent(perfmodel_component, perfmodel_select_component);
 	perfmodel_select_component->add_child(perfmodel_select_component, no_perfmodel_component);
-	no_perfmodel_component->add_father(no_perfmodel_component, perfmodel_select_component);
+	no_perfmodel_component->add_parent(no_perfmodel_component, perfmodel_select_component);
 
 	struct starpu_prio_data prio_data =
 		{
@@ -87,18 +87,18 @@ static void initialize_heft2_center_policy(unsigned sched_ctx_id)
 
 		struct starpu_sched_component * prio_component = starpu_sched_component_prio_create(&prio_data);
 		prio_component->add_child(prio_component, worker_component);
-		worker_component->add_father(worker_component, prio_component);
+		worker_component->add_parent(worker_component, prio_component);
 
 		struct starpu_sched_component * impl_component = starpu_sched_component_best_implementation_create(NULL);
 		impl_component->add_child(impl_component, prio_component);
-		prio_component->add_father(prio_component, impl_component);
+		prio_component->add_parent(prio_component, impl_component);
 
 		perfmodel_component->add_child(perfmodel_component, impl_component);
-		impl_component->add_father(impl_component, perfmodel_component);
+		impl_component->add_parent(impl_component, perfmodel_component);
 		no_perfmodel_component->add_child(no_perfmodel_component, impl_component);
-		impl_component->add_father(impl_component, no_perfmodel_component);
+		impl_component->add_parent(impl_component, no_perfmodel_component);
 		calibrator_component->add_child(calibrator_component, impl_component);
-		impl_component->add_father(impl_component, calibrator_component);
+		impl_component->add_parent(impl_component, calibrator_component);
 	}
 
 	starpu_sched_tree_update_workers(t);

src/sched_policies/tree_prio.c

@@ -24,7 +24,7 @@ static void initialize_prio_center_policy(unsigned sched_ctx_id)
  	t->root = starpu_sched_component_prio_create(NULL);
 	struct starpu_sched_component * eager_component = starpu_sched_component_eager_create(NULL);
 	t->root->add_child(t->root, eager_component);
-	eager_component->add_father(eager_component, t->root);
+	eager_component->add_parent(eager_component, t->root);
 
 	unsigned i;
 	for(i = 0; i < starpu_worker_get_count() + starpu_combined_worker_get_count(); i++)
@@ -33,7 +33,7 @@ static void initialize_prio_center_policy(unsigned sched_ctx_id)
 		STARPU_ASSERT(worker_component);
 
 		eager_component->add_child(eager_component, worker_component);
-		worker_component->add_father(worker_component, eager_component);
+		worker_component->add_parent(worker_component, eager_component);
 	}
 	starpu_sched_tree_update_workers(t);
 	starpu_sched_ctx_set_policy_data(sched_ctx_id, (void*)t);

src/sched_policies/tree_prio_prefetching.c

@@ -38,7 +38,7 @@ static void initialize_prio_prefetching_center_policy(unsigned sched_ctx_id)
  	t->root = starpu_sched_component_prio_create(NULL);
 	struct starpu_sched_component * eager_component = starpu_sched_component_eager_create(NULL);
 	t->root->add_child(t->root, eager_component);
-	eager_component->add_father(eager_component, t->root);
+	eager_component->add_parent(eager_component, t->root);
 
 	struct starpu_prio_data prio_data =
 		{
@@ -54,10 +54,10 @@ static void initialize_prio_prefetching_center_policy(unsigned sched_ctx_id)
 
 		struct starpu_sched_component * prio_component = starpu_sched_component_prio_create(&prio_data);
 		prio_component->add_child(prio_component, worker_component);
-		worker_component->add_father(worker_component, prio_component);
+		worker_component->add_parent(worker_component, prio_component);
 
 		eager_component->add_child(eager_component, prio_component);
-		prio_component->add_father(prio_component, eager_component);
+		prio_component->add_parent(prio_component, eager_component);
 	}
 	starpu_sched_tree_update_workers(t);
 	starpu_sched_ctx_set_policy_data(sched_ctx_id, (void*)t);

src/sched_policies/tree_random.c

@@ -27,7 +27,7 @@ static void initialize_random_fifo_center_policy(unsigned sched_ctx_id)
  	t->root = starpu_sched_component_fifo_create(NULL);
 	struct starpu_sched_component * random_component = starpu_sched_component_random_create(NULL);
 	t->root->add_child(t->root, random_component);
-	random_component->add_father(random_component, t->root);
+	random_component->add_parent(random_component, t->root);
 
 	unsigned i;
 	for(i = 0; i < starpu_worker_get_count() + starpu_combined_worker_get_count(); i++)
@@ -36,7 +36,7 @@ static void initialize_random_fifo_center_policy(unsigned sched_ctx_id)
 		STARPU_ASSERT(worker_component);
 
 		random_component->add_child(random_component, worker_component);
-		worker_component->add_father(worker_component, random_component);
+		worker_component->add_parent(worker_component, random_component);
 	}
 	starpu_sched_tree_update_workers(t);
 	starpu_sched_ctx_set_policy_data(sched_ctx_id, (void*)t);
@@ -73,7 +73,7 @@ static void initialize_random_prio_center_policy(unsigned sched_ctx_id)
  	t->root = starpu_sched_component_prio_create(NULL);
 	struct starpu_sched_component * random_component = starpu_sched_component_random_create(NULL);
 	t->root->add_child(t->root, random_component);
-	random_component->add_father(random_component, t->root);
+	random_component->add_parent(random_component, t->root);
 
 	unsigned i;
 	for(i = 0; i < starpu_worker_get_count() + starpu_combined_worker_get_count(); i++)
@@ -82,7 +82,7 @@ static void initialize_random_prio_center_policy(unsigned sched_ctx_id)
 		STARPU_ASSERT(worker_component);
 
 		random_component->add_child(random_component, worker_component);
-		worker_component->add_father(worker_component, random_component);
+		worker_component->add_parent(worker_component, random_component);
 	}
 	starpu_sched_tree_update_workers(t);
 	starpu_sched_ctx_set_policy_data(sched_ctx_id, (void*)t);

src/sched_policies/tree_random_prefetching.c

@@ -41,7 +41,7 @@ static void initialize_random_fifo_prefetching_center_policy(unsigned sched_ctx_
  	t->root = starpu_sched_component_fifo_create(NULL);
 	struct starpu_sched_component * random_component = starpu_sched_component_random_create(NULL);
 	t->root->add_child(t->root, random_component);
-	random_component->add_father(random_component, t->root);
+	random_component->add_parent(random_component, t->root);
 
 	struct starpu_fifo_data fifo_data =
 		{
@@ -57,10 +57,10 @@ static void initialize_random_fifo_prefetching_center_policy(unsigned sched_ctx_
 
 		struct starpu_sched_component * fifo_component = starpu_sched_component_fifo_create(&fifo_data);
 		fifo_component->add_child(fifo_component, worker_component);
-		worker_component->add_father(worker_component, fifo_component);
+		worker_component->add_parent(worker_component, fifo_component);
 
 		random_component->add_child(random_component, fifo_component);
-		fifo_component->add_father(fifo_component, random_component);
+		fifo_component->add_parent(fifo_component, random_component);
 	}
 	starpu_sched_tree_update_workers(t);
 	starpu_sched_ctx_set_policy_data(sched_ctx_id, (void*)t);
@@ -108,7 +108,7 @@ static void initialize_random_prio_prefetching_center_policy(unsigned sched_ctx_
  	t->root = starpu_sched_component_prio_create(NULL);
 	struct starpu_sched_component * random_component = starpu_sched_component_random_create(NULL);
 	t->root->add_child(t->root, random_component);
-	random_component->add_father(random_component, t->root);
+	random_component->add_parent(random_component, t->root);
 
 	struct starpu_prio_data prio_data =
 		{
@@ -124,10 +124,10 @@ static void initialize_random_prio_prefetching_center_policy(unsigned sched_ctx_
 
 		struct starpu_sched_component * prio_component = starpu_sched_component_prio_create(&prio_data);
 		prio_component->add_child(prio_component, worker_component);
-		worker_component->add_father(worker_component, prio_component);
+		worker_component->add_parent(worker_component, prio_component);
 
 		random_component->add_child(random_component, prio_component);
-		prio_component->add_father(prio_component, random_component);
+		prio_component->add_parent(prio_component, random_component);
 	}
 	starpu_sched_tree_update_workers(t);
 	starpu_sched_ctx_set_policy_data(sched_ctx_id, (void*)t);

src/sched_policies/tree_ws.c

@@ -31,7 +31,7 @@ static void initialize_ws_center_policy(unsigned sched_ctx_id)
 		STARPU_ASSERT(worker_component);
 
 		t->root->add_child(t->root, worker_component);
-		worker_component->add_father(worker_component, t->root);
+		worker_component->add_parent(worker_component, t->root);
 	}
 	starpu_sched_tree_update_workers(t);
 	starpu_sched_ctx_set_policy_data(sched_ctx_id, (void*)t);