rename:

	struct starpu_prio_data				-->	struct starpu_sched_component_prio_data
	struct starpu_mct_data				--> 	struct starpu_sched_component_mct_data
	struct starpu_perfmodel_select_data		-->	struct starpu_sched_component_perfmodel_select_data

	starpu_sched_component_create_recipe		-->	starpu_sched_component_composed_recipe_create
	starpu_sched_component_create_recipe_singleton	-->	starpu_sched_component_composed_recipe_create_singleton
	starpu_sched_component_recipe_add		--> 	starpu_sched_component_composed_recipe_add
	starpu_destroy_composed_sched_component_recipe	-->	starpu_sched_component_composed_recipe_destroy

doc/doxygen/chapters/api/modularized_scheduler.doxy

@@ -248,7 +248,7 @@ The actual scheduler
 @name Flow-control Prio Component API
 \ingroup API_Modularized_Scheduler
 
-\fn struct starpu_sched_component *starpu_sched_component_prio_create(struct starpu_sched_tree *tree, struct starpu_prio_data *prio_data)
+\fn struct starpu_sched_component *starpu_sched_component_prio_create(struct starpu_sched_tree *tree, struct starpu_sched_component_prio_data *prio_data)
 \ingroup API_Modularized_Scheduler
 todo
 
@@ -307,7 +307,7 @@ todo
 @name Resource-mapping MCT Component API
 \ingroup API_Modularized_Scheduler
 
-\fn struct starpu_sched_component *starpu_sched_component_mct_create(struct starpu_sched_tree *tree, struct starpu_mct_data *mct_data)
+\fn struct starpu_sched_component *starpu_sched_component_mct_create(struct starpu_sched_tree *tree, struct starpu_sched_component_mct_data *mct_data)
 \ingroup API_Modularized_Scheduler
 create a component with mct_data paremeters. the mct component doesnt
 do anything but pushing tasks on no_perf_model_component and
@@ -320,7 +320,7 @@ todo
 @name Resource-mapping Heft Component API
 \ingroup API_Modularized_Scheduler
 
-\fn struct starpu_sched_component *starpu_sched_component_heft_create(struct starpu_sched_tree *tree, struct starpu_mct_data *mct_data)
+\fn struct starpu_sched_component *starpu_sched_component_heft_create(struct starpu_sched_tree *tree, struct starpu_sched_component_mct_data *mct_data)
 \ingroup API_Modularized_Scheduler
 	 this component perform a heft scheduling
 
@@ -341,7 +341,7 @@ todo
 @name Special-purpose Perfmodel_Select Component API
 \ingroup API_Modularized_Scheduler
 
-\fn struct starpu_sched_component *starpu_sched_component_perfmodel_select_create(struct starpu_sched_tree *tree, struct starpu_perfmodel_select_data *perfmodel_select_data)
+\fn struct starpu_sched_component *starpu_sched_component_perfmodel_select_create(struct starpu_sched_tree *tree, struct starpu_sched_component_perfmodel_select_data *perfmodel_select_data)
 \ingroup API_Modularized_Scheduler
 todo
 
@@ -356,19 +356,19 @@ todo
 \ingroup API_Modularized_Scheduler
 	parameters for starpu_sched_component_composed_component_create
 
-\fn struct starpu_sched_component_composed_recipe *starpu_sched_component_create_recipe(void)
+\fn struct starpu_sched_component_composed_recipe *starpu_sched_component_composed_recipe_create(void)
 \ingroup API_Modularized_Scheduler
 	 return an empty recipe for a composed component, it should not be used without modification
 
-\fn struct starpu_sched_component_composed_recipe *starpu_sched_component_create_recipe_singleton(struct starpu_sched_component *(*create_component)(struct starpu_sched_tree *tree, void *arg), void *arg)
+\fn struct starpu_sched_component_composed_recipe *starpu_sched_component_composed_recipe_create_singleton(struct starpu_sched_component *(*create_component)(struct starpu_sched_tree *tree, void *arg), void *arg)
 \ingroup API_Modularized_Scheduler
 	 return a recipe to build a composed component with a \p create_component
 
-\fn void starpu_sched_component_recipe_add(struct starpu_sched_component_composed_recipe *recipe, struct starpu_sched_component *(*create_component)(struct starpu_sched_tree *tree, void *arg), void *arg)
+\fn void starpu_sched_component_composed_recipe_add(struct starpu_sched_component_composed_recipe *recipe, struct starpu_sched_component *(*create_component)(struct starpu_sched_tree *tree, void *arg), void *arg)
 \ingroup API_Modularized_Scheduler
 	 add \p create_component under all previous components in recipe
 
-\fn void starpu_destroy_composed_sched_component_recipe(struct starpu_sched_component_composed_recipe *)
+\fn void starpu_sched_component_composed_recipe_destroy(struct starpu_sched_component_composed_recipe *)
 \ingroup API_Modularized_Scheduler
 	 destroy composed_sched_component, this should be done after starpu_sched_component_composed_component_create was called
 

include/starpu_sched_component.h

@@ -118,12 +118,12 @@ struct starpu_fifo_data
 struct starpu_sched_component *starpu_sched_component_fifo_create(struct starpu_sched_tree *tree, struct starpu_fifo_data *fifo_data);
 int starpu_sched_component_is_fifo(struct starpu_sched_component *component);
 
-struct starpu_prio_data
+struct starpu_sched_component_prio_data
 {
 	unsigned ntasks_threshold;
 	double exp_len_threshold;
 };
-struct starpu_sched_component *starpu_sched_component_prio_create(struct starpu_sched_tree *tree, struct starpu_prio_data *prio_data);
+struct starpu_sched_component *starpu_sched_component_prio_create(struct starpu_sched_tree *tree, struct starpu_sched_component_prio_data *prio_data);
 int starpu_sched_component_is_prio(struct starpu_sched_component *component);
 
 struct starpu_sched_component *starpu_sched_component_work_stealing_create(struct starpu_sched_tree *tree, void *arg STARPU_ATTRIBUTE_UNUSED);
@@ -139,35 +139,35 @@ int starpu_sched_component_is_eager(struct starpu_sched_component *);
 struct starpu_sched_component *starpu_sched_component_eager_calibration_create(struct starpu_sched_tree *tree, void *arg STARPU_ATTRIBUTE_UNUSED);
 int starpu_sched_component_is_eager_calibration(struct starpu_sched_component *);
 
-struct starpu_mct_data
+struct starpu_sched_component_mct_data
 {
 	double alpha;
 	double beta;
 	double gamma;
 	double idle_power;
 };
-struct starpu_sched_component *starpu_sched_component_mct_create(struct starpu_sched_tree *tree, struct starpu_mct_data *mct_data);
+struct starpu_sched_component *starpu_sched_component_mct_create(struct starpu_sched_tree *tree, struct starpu_sched_component_mct_data *mct_data);
 int starpu_sched_component_is_mct(struct starpu_sched_component *component);
 
-struct starpu_sched_component *starpu_sched_component_heft_create(struct starpu_sched_tree *tree, struct starpu_mct_data *mct_data);
+struct starpu_sched_component *starpu_sched_component_heft_create(struct starpu_sched_tree *tree, struct starpu_sched_component_mct_data *mct_data);
 int starpu_sched_component_is_heft(struct starpu_sched_component *component);
 
 struct starpu_sched_component *starpu_sched_component_best_implementation_create(struct starpu_sched_tree *tree, void *arg STARPU_ATTRIBUTE_UNUSED);
 
-struct starpu_perfmodel_select_data
+struct starpu_sched_component_perfmodel_select_data
 {
 	struct starpu_sched_component *calibrator_component;
 	struct starpu_sched_component *no_perfmodel_component;
 	struct starpu_sched_component *perfmodel_component;
 };
-struct starpu_sched_component *starpu_sched_component_perfmodel_select_create(struct starpu_sched_tree *tree, struct starpu_perfmodel_select_data *perfmodel_select_data);
+struct starpu_sched_component *starpu_sched_component_perfmodel_select_create(struct starpu_sched_tree *tree, struct starpu_sched_component_perfmodel_select_data *perfmodel_select_data);
 int starpu_sched_component_is_perfmodel_select(struct starpu_sched_component *component);
 
 struct starpu_sched_component_composed_recipe;
-struct starpu_sched_component_composed_recipe *starpu_sched_component_create_recipe(void);
-struct starpu_sched_component_composed_recipe *starpu_sched_component_create_recipe_singleton(struct starpu_sched_component *(*create_component)(struct starpu_sched_tree *tree, void *arg), void *arg);
-void starpu_sched_component_recipe_add(struct starpu_sched_component_composed_recipe *recipe, struct starpu_sched_component *(*create_component)(struct starpu_sched_tree *tree, void *arg), void *arg);
-void starpu_destroy_composed_sched_component_recipe(struct starpu_sched_component_composed_recipe *);
+struct starpu_sched_component_composed_recipe *starpu_sched_component_composed_recipe_create(void);
+struct starpu_sched_component_composed_recipe *starpu_sched_component_composed_recipe_create_singleton(struct starpu_sched_component *(*create_component)(struct starpu_sched_tree *tree, void *arg), void *arg);
+void starpu_sched_component_composed_recipe_add(struct starpu_sched_component_composed_recipe *recipe, struct starpu_sched_component *(*create_component)(struct starpu_sched_tree *tree, void *arg), void *arg);
+void starpu_sched_component_composed_recipe_destroy(struct starpu_sched_component_composed_recipe *);
 struct starpu_sched_component *starpu_sched_component_composed_component_create(struct starpu_sched_tree *tree, struct starpu_sched_component_composed_recipe *recipe);
 
 #ifdef STARPU_HAVE_HWLOC

src/sched_policies/component_composed.c

@@ -34,14 +34,14 @@ struct starpu_sched_component_composed_recipe
 };
 
 
-struct starpu_sched_component_composed_recipe * starpu_sched_component_create_recipe(void)
+struct starpu_sched_component_composed_recipe * starpu_sched_component_composed_recipe_create(void)
 {
 	struct starpu_sched_component_composed_recipe * recipe = malloc(sizeof(*recipe));
 	recipe->list = fun_create_component_list_new();
 	return recipe;
 }
 
-void starpu_sched_component_recipe_add(struct starpu_sched_component_composed_recipe * recipe,
+void starpu_sched_component_composed_recipe_add(struct starpu_sched_component_composed_recipe * recipe,
 				       struct starpu_sched_component *(*create_component)(struct starpu_sched_tree *tree, void * arg),
 				       void * arg)
 {
@@ -50,14 +50,14 @@ void starpu_sched_component_recipe_add(struct starpu_sched_component_composed_re
 	e->arg = arg;
 	fun_create_component_list_push_back(recipe->list, e);
 }
-struct starpu_sched_component_composed_recipe * starpu_sched_component_create_recipe_singleton(struct starpu_sched_component *(*create_component)(struct starpu_sched_tree *tree, void * arg),
+struct starpu_sched_component_composed_recipe * starpu_sched_component_composed_recipe_create_singleton(struct starpu_sched_component *(*create_component)(struct starpu_sched_tree *tree, void * arg),
 										      void * arg)
 {
-	struct starpu_sched_component_composed_recipe * r = starpu_sched_component_create_recipe();
-	starpu_sched_component_recipe_add(r, create_component, arg);
+	struct starpu_sched_component_composed_recipe * r = starpu_sched_component_composed_recipe_create();
+	starpu_sched_component_composed_recipe_add(r, create_component, arg);
 	return r;
 }
-void starpu_destroy_composed_sched_component_recipe(struct starpu_sched_component_composed_recipe * recipe)
+void starpu_sched_component_composed_recipe_destroy(struct starpu_sched_component_composed_recipe * recipe)
 {
 	if(!recipe)
 		return;

src/sched_policies/component_heft.c

@@ -223,7 +223,7 @@ int starpu_sched_component_is_heft(struct starpu_sched_component * component)
 	return component->push_task == heft_push_task;
 }
 
-struct starpu_sched_component * starpu_sched_component_heft_create(struct starpu_sched_tree *tree, struct starpu_mct_data * params)
+struct starpu_sched_component * starpu_sched_component_heft_create(struct starpu_sched_tree *tree, struct starpu_sched_component_mct_data * params)
 {
 	struct starpu_sched_component * component = starpu_sched_component_create(tree);
 	struct _starpu_mct_data *mct_data = starpu_mct_init_parameters(params);

src/sched_policies/component_mct.c

@@ -115,7 +115,7 @@ int starpu_sched_component_is_mct(struct starpu_sched_component * component)
 	return component->push_task == mct_push_task;
 }
 
-struct starpu_sched_component * starpu_sched_component_mct_create(struct starpu_sched_tree *tree, struct starpu_mct_data * params)
+struct starpu_sched_component * starpu_sched_component_mct_create(struct starpu_sched_tree *tree, struct starpu_sched_component_mct_data * params)
 {
 	struct starpu_sched_component * component = starpu_sched_component_create(tree);
 	struct _starpu_mct_data *data = starpu_mct_init_parameters(params);

src/sched_policies/component_perfmodel_select.c

@@ -66,7 +66,7 @@ int starpu_sched_component_is_perfmodel_select(struct starpu_sched_component * c
 	return component->push_task == perfmodel_select_push_task;
 }
 
-struct starpu_sched_component * starpu_sched_component_perfmodel_select_create(struct starpu_sched_tree *tree, struct starpu_perfmodel_select_data * params)
+struct starpu_sched_component * starpu_sched_component_perfmodel_select_create(struct starpu_sched_tree *tree, struct starpu_sched_component_perfmodel_select_data * params)
 {
 	STARPU_ASSERT(params);
 	STARPU_ASSERT(params->calibrator_component && params->no_perfmodel_component && params->perfmodel_component);

src/sched_policies/component_prio.c

@@ -254,7 +254,7 @@ int starpu_sched_component_is_prio(struct starpu_sched_component * component)
 	return component->push_task == prio_push_task;
 }
 
-struct starpu_sched_component * starpu_sched_component_prio_create(struct starpu_sched_tree *tree, struct starpu_prio_data * params)
+struct starpu_sched_component * starpu_sched_component_prio_create(struct starpu_sched_tree *tree, struct starpu_sched_component_prio_data * params)
 {
 	struct starpu_sched_component * component = starpu_sched_component_create(tree);
 	struct _starpu_prio_data * data = malloc(sizeof(*data));

src/sched_policies/helper_mct.c

@@ -48,7 +48,7 @@ static const float idle_power_minimum=0;
 static const float idle_power_maximum=10000.0;
 #endif /* !STARPU_USE_TOP */
 
-struct _starpu_mct_data *starpu_mct_init_parameters(struct starpu_mct_data *params)
+struct _starpu_mct_data *starpu_mct_init_parameters(struct starpu_sched_component_mct_data *params)
 {
 	struct _starpu_mct_data * data = malloc(sizeof(*data));
 	if (params)

src/sched_policies/helper_mct.h

@@ -22,7 +22,7 @@ struct _starpu_mct_data
 	double idle_power;
 };
 
-struct _starpu_mct_data *starpu_mct_init_parameters(struct starpu_mct_data *params);
+struct _starpu_mct_data *starpu_mct_init_parameters(struct starpu_sched_component_mct_data *params);
 
 int starpu_mct_compute_expected_times(struct starpu_sched_component *component, struct starpu_task *task,
 		double *estimated_lengths, double *estimated_transfer_length, double *estimated_ends_with_task,

src/sched_policies/hierarchical_heft.c

@@ -3,9 +3,9 @@
 
 static struct  starpu_sched_component_composed_recipe *  recipe_for_worker(enum starpu_worker_archtype a STARPU_ATTRIBUTE_UNUSED)
 {
-	struct starpu_sched_component_composed_recipe * r = starpu_sched_component_create_recipe();
-	starpu_sched_component_recipe_add(r, starpu_sched_component_best_implementation_create, NULL);
-	starpu_sched_component_recipe_add(r, starpu_sched_component_fifo_create, NULL);
+	struct starpu_sched_component_composed_recipe * r = starpu_sched_component_composed_recipe_create();
+	starpu_sched_component_composed_recipe_add(r, starpu_sched_component_best_implementation_create, NULL);
+	starpu_sched_component_composed_recipe_add(r, starpu_sched_component_fifo_create, NULL);
 	return r;
 }
 
@@ -30,20 +30,20 @@ static void initialize_heft_center_policy(unsigned sched_ctx_id)
 		.calibrating_component_create = starpu_sched_component_random_create,
 		.arg_calibrating_component = NULL,
 	};
-	struct starpu_sched_component_composed_recipe * r = starpu_sched_component_create_recipe();
-	starpu_sched_component_recipe_add(r,(struct starpu_sched_component * (*)(void*))starpu_sched_component_heft_create,&heft_data);
+	struct starpu_sched_component_composed_recipe * r = starpu_sched_component_composed_recipe_create();
+	starpu_sched_component_composed_recipe_add(r,(struct starpu_sched_component * (*)(void*))starpu_sched_component_heft_create,&heft_data);
 	specs.hwloc_machine_composed_sched_component = r;
 
-	r = starpu_sched_component_create_recipe();
-	starpu_sched_component_recipe_add(r, starpu_sched_component_best_implementation_create, NULL);
-	starpu_sched_component_recipe_add(r, starpu_sched_component_fifo_create ,NULL);
+	r = starpu_sched_component_composed_recipe_create();
+	starpu_sched_component_composed_recipe_add(r, starpu_sched_component_best_implementation_create, NULL);
+	starpu_sched_component_composed_recipe_add(r, starpu_sched_component_fifo_create ,NULL);
 
 	specs.hwloc_component_composed_sched_component = r;
 	specs.worker_composed_sched_component = recipe_for_worker;
 
 	struct starpu_sched_tree *t = starpu_sched_component_make_scheduler(sched_ctx_id, specs);
 
-	starpu_destroy_composed_sched_component_recipe(specs.hwloc_machine_composed_sched_component);
+	starpu_sched_component_composed_recipe_destroy(specs.hwloc_machine_composed_sched_component);
 
 
 	starpu_sched_tree_update_workers(t);

src/sched_policies/modular_heft.c

@@ -88,7 +88,7 @@ static void initialize_heft_center_policy(unsigned sched_ctx_id)
 	struct starpu_sched_component * no_perfmodel_component = starpu_sched_component_eager_create(t, NULL);
 	struct starpu_sched_component * calibrator_component = starpu_sched_component_eager_calibration_create(t, NULL);
 	
-	struct starpu_perfmodel_select_data perfmodel_select_data =
+	struct starpu_sched_component_perfmodel_select_data perfmodel_select_data =
 		{
 			.calibrator_component = calibrator_component,
 			.no_perfmodel_component = no_perfmodel_component,
@@ -106,7 +106,7 @@ static void initialize_heft_center_policy(unsigned sched_ctx_id)
 	perfmodel_select_component->add_child(perfmodel_select_component, no_perfmodel_component);
 	no_perfmodel_component->add_parent(no_perfmodel_component, perfmodel_select_component);
 
-	struct starpu_prio_data prio_data =
+	struct starpu_sched_component_prio_data prio_data =
 		{
 			.ntasks_threshold = ntasks_threshold,
 			.exp_len_threshold = exp_len_threshold,

src/sched_policies/modular_heft2.c

@@ -52,7 +52,7 @@ static void initialize_heft2_center_policy(unsigned sched_ctx_id)
 	struct starpu_sched_component * no_perfmodel_component = starpu_sched_component_eager_create(t, NULL);
 	struct starpu_sched_component * calibrator_component = starpu_sched_component_eager_create(t, NULL);
 	
-	struct starpu_perfmodel_select_data perfmodel_select_data =
+	struct starpu_sched_component_perfmodel_select_data perfmodel_select_data =
 		{
 			.calibrator_component = calibrator_component,
 			.no_perfmodel_component = no_perfmodel_component,
@@ -73,7 +73,7 @@ static void initialize_heft2_center_policy(unsigned sched_ctx_id)
 	perfmodel_select_component->add_child(perfmodel_select_component, no_perfmodel_component);
 	no_perfmodel_component->add_parent(no_perfmodel_component, perfmodel_select_component);
 
-	struct starpu_prio_data prio_data =
+	struct starpu_sched_component_prio_data prio_data =
 		{
 			.ntasks_threshold = ntasks_threshold,
 			.exp_len_threshold = exp_len_threshold,

src/sched_policies/modular_prio_prefetching.c

@@ -40,7 +40,7 @@ static void initialize_prio_prefetching_center_policy(unsigned sched_ctx_id)
 	t->root->add_child(t->root, eager_component);
 	eager_component->add_parent(eager_component, t->root);
 
-	struct starpu_prio_data prio_data =
+	struct starpu_sched_component_prio_data prio_data =
 		{
 			.ntasks_threshold = ntasks_threshold,
 			.exp_len_threshold = exp_len_threshold,

src/sched_policies/modular_random_prefetching.c

@@ -110,7 +110,7 @@ static void initialize_random_prio_prefetching_center_policy(unsigned sched_ctx_
 	t->root->add_child(t->root, random_component);
 	random_component->add_parent(random_component, t->root);
 
-	struct starpu_prio_data prio_data =
+	struct starpu_sched_component_prio_data prio_data =
 		{
 			.ntasks_threshold = ntasks_threshold,
 			.exp_len_threshold = exp_len_threshold,

src/sched_policies/scheduler_maker.c

@@ -200,7 +200,7 @@ static void set_worker_leaf(struct starpu_sched_component * root, struct starpu_
 		component = tmp;
 		
 	}
-	starpu_destroy_composed_sched_component_recipe(recipe);
+	starpu_sched_component_composed_recipe_destroy(recipe);
 	starpu_sched_component_add_parent(worker_component, component);
 	component->add_child(component, worker_component);
 }