rename strategies

sched_ctx_hypervisor/src/Makefile.am

@@ -29,8 +29,8 @@ libsched_ctx_hypervisor_la_SOURCES = 			\
 	hypervisor_policies/idle_policy.c		\
 	hypervisor_policies/app_driven_policy.c		\
 	hypervisor_policies/gflops_rate_policy.c	\
-	hypervisor_policies/lp_policy.c			\
-	hypervisor_policies/lp2_policy.c		\
+	hypervisor_policies/feft_lp_policy.c			\
+	hypervisor_policies/teft_lp_policy.c		\
 	hypervisor_policies/ispeed_policy.c		\
 	hypervisor_policies/ispeed_lp_policy.c		\
 	hypervisor_policies/debit_lp_policy.c

sched_ctx_hypervisor/src/hypervisor_policies/lp_policy.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2011, 2012  INRIA
+ * Copyright (C) 2011 - 2013  INRIA
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -19,7 +19,7 @@
 #include <sys/time.h>
 
 #ifdef STARPU_HAVE_GLPK_H
-static void lp_handle_poped_task(unsigned sched_ctx, int worker, struct starpu_task *task, uint32_t footprint)
+static void feft_lp_handle_poped_task(unsigned sched_ctx, int worker, struct starpu_task *task, uint32_t footprint)
 {
 	if(_velocity_gap_btw_ctxs())
 	{
@@ -61,7 +61,7 @@ static void lp_handle_poped_task(unsigned sched_ctx, int worker, struct starpu_t
 		}
 	}
 }
-static void lp_size_ctxs(int *sched_ctxs, int ns, int *workers, int nworkers)
+static void feft_lp_size_ctxs(int *sched_ctxs, int ns, int *workers, int nworkers)
 {
 	int nsched_ctxs = sched_ctxs == NULL ? sched_ctx_hypervisor_get_nsched_ctxs() : ns;
 	int nw = 1;
@@ -122,9 +122,9 @@ static void lp_size_ctxs(int *sched_ctxs, int ns, int *workers, int nworkers)
 	starpu_pthread_mutex_unlock(&act_hypervisor_mutex);
 }
 
-struct sched_ctx_hypervisor_policy lp_policy = {
-	.size_ctxs = lp_size_ctxs,
-	.handle_poped_task = lp_handle_poped_task,
+struct sched_ctx_hypervisor_policy feft_lp_policy = {
+	.size_ctxs = feft_lp_size_ctxs,
+	.handle_poped_task = feft_lp_handle_poped_task,
 	.handle_pushed_task = NULL,
 	.handle_idle_cycle = NULL,
 	.handle_idle_end = NULL,
@@ -132,7 +132,7 @@ struct sched_ctx_hypervisor_policy lp_policy = {
 	.handle_submitted_job = NULL,
 	.end_ctx = NULL,
 	.custom = 0,
-	.name = "lp"
+	.name = "feft_lp"
 };
 
 #endif /* STARPU_HAVE_GLPK_H */

sched_ctx_hypervisor/src/hypervisor_policies/lp2_policy.c

@@ -165,7 +165,7 @@ static void size_if_required()
 	}
 }
 
-static void lp2_handle_submitted_job(struct starpu_codelet *cl, unsigned sched_ctx, uint32_t footprint)
+static void teft_lp_handle_submitted_job(struct starpu_codelet *cl, unsigned sched_ctx, uint32_t footprint)
 {
 	/* count the tasks of the same type */
 	starpu_pthread_mutex_lock(&mutex);
@@ -526,7 +526,7 @@ static struct bound_task_pool* _clone_linked_list(struct bound_task_pool *tp)
 	return tmp_tp;
 }
 
-static void lp2_handle_poped_task(unsigned sched_ctx, int worker, struct starpu_task *task, uint32_t footprint)
+static void teft_lp_handle_poped_task(unsigned sched_ctx, int worker, struct starpu_task *task, uint32_t footprint)
 {
 	struct sched_ctx_hypervisor_wrapper* sc_w = sched_ctx_hypervisor_get_wrapper(sched_ctx);
 
@@ -591,22 +591,22 @@ static void lp2_handle_poped_task(unsigned sched_ctx, int worker, struct starpu_
 }
 
 
-static void lp2_size_ctxs(int *sched_ctxs, int nsched_ctxs , int *workers, int nworkers)
+static void teft_lp_size_ctxs(int *sched_ctxs, int nsched_ctxs , int *workers, int nworkers)
 {
 	sched_ctx_hypervisor_save_size_req(sched_ctxs, nsched_ctxs, workers, nworkers);
 }
 
-struct sched_ctx_hypervisor_policy lp2_policy = {
-	.size_ctxs = lp2_size_ctxs,
-	.handle_poped_task = lp2_handle_poped_task,
+struct sched_ctx_hypervisor_policy teft_lp_policy = {
+	.size_ctxs = teft_lp_size_ctxs,
+	.handle_poped_task = teft_lp_handle_poped_task,
 	.handle_pushed_task = NULL,
 	.handle_idle_cycle = NULL,
 	.handle_idle_end = NULL,
 	.handle_post_exec_hook = NULL,
-	.handle_submitted_job = lp2_handle_submitted_job,
+	.handle_submitted_job = teft_lp_handle_submitted_job,
 	.end_ctx = NULL,
 	.custom = 0,
-	.name = "lp2"
+	.name = "teft_lp"
 };
 
 #endif /* STARPU_HAVE_GLPK_H */

sched_ctx_hypervisor/src/sched_ctx_hypervisor.c

@@ -34,8 +34,8 @@ extern struct sched_ctx_hypervisor_policy idle_policy;
 extern struct sched_ctx_hypervisor_policy app_driven_policy;
 extern struct sched_ctx_hypervisor_policy gflops_rate_policy;
 #ifdef STARPU_HAVE_GLPK_H
-extern struct sched_ctx_hypervisor_policy lp_policy;
-extern struct sched_ctx_hypervisor_policy lp2_policy;
+extern struct sched_ctx_hypervisor_policy feft_lp_policy;
+extern struct sched_ctx_hypervisor_policy teft_lp_policy;
 extern struct sched_ctx_hypervisor_policy ispeed_lp_policy;
 extern struct sched_ctx_hypervisor_policy debit_lp_policy;
 #endif // STARPU_HAVE_GLPK_
@@ -47,8 +47,8 @@ static struct sched_ctx_hypervisor_policy *predefined_policies[] =
         &idle_policy,
 	&app_driven_policy,
 #ifdef STARPU_HAVE_GLPK_H
-	&lp_policy,
-	&lp2_policy,
+	&feft_lp_policy,
+	&teft_lp_policy,
 	&ispeed_lp_policy,
 	&debit_lp_policy,
 #endif // STARPU_HAVE_GLPK_H