Просмотр исходного кода

Some structure field had the same name as a function, for the sake of
consistency, we don't prefix structure fields with an underscore.

Cédric Augonnet лет назад: 15
Родитель
Сommit
354725247a

+ 1 - 1
src/core/policies/deque-modeling-policy-data-aware.c

@@ -252,7 +252,7 @@ static struct starpu_jobq_s *get_local_queue_dmda(struct starpu_sched_policy_s *
 struct starpu_sched_policy_s _starpu_sched_dmda_policy = {
 	.init_sched = initialize_dmda_policy,
 	.deinit_sched = deinitialize_dmda_policy,
-	._starpu_get_local_queue = get_local_queue_dmda,
+	.starpu_get_local_queue = get_local_queue_dmda,
 	.policy_name = "dmda",
 	.policy_description = "data-aware performance model"
 };

+ 1 - 1
src/core/policies/deque-modeling-policy.c

@@ -208,7 +208,7 @@ static struct starpu_jobq_s *get_local_queue_dm(struct starpu_sched_policy_s *po
 struct starpu_sched_policy_s _starpu_sched_dm_policy = {
 	.init_sched = initialize_dm_policy,
 	.deinit_sched = deinitialize_dm_policy,
-	._starpu_get_local_queue = get_local_queue_dm,
+	.starpu_get_local_queue = get_local_queue_dm,
 	.policy_name = "dm",
 	.policy_description = "performance model"
 };

+ 1 - 1
src/core/policies/eager-central-policy.c

@@ -75,7 +75,7 @@ static struct starpu_jobq_s *get_local_queue_eager(struct starpu_sched_policy_s
 struct starpu_sched_policy_s _starpu_sched_eager_policy = {
 	.init_sched = initialize_eager_center_policy,
 	.deinit_sched = deinitialize_eager_center_policy,
-	._starpu_get_local_queue = get_local_queue_eager,
+	.starpu_get_local_queue = get_local_queue_eager,
 	.policy_name = "eager",
 	.policy_description = "greedy policy"
 };

+ 1 - 1
src/core/policies/eager-central-priority-policy.c

@@ -67,7 +67,7 @@ static struct starpu_jobq_s *get_local_queue_eager_priority(struct starpu_sched_
 struct starpu_sched_policy_s _starpu_sched_prio_policy = {
 	.init_sched = initialize_eager_center_priority_policy,
 	.deinit_sched = deinitialize_eager_center_priority_policy,
-	._starpu_get_local_queue = get_local_queue_eager_priority,
+	.starpu_get_local_queue = get_local_queue_eager_priority,
 	.policy_name = "prio",
 	.policy_description = "eager (with priorities)"
 };

+ 1 - 1
src/core/policies/no-prio-policy.c

@@ -59,7 +59,7 @@ static struct starpu_jobq_s *get_local_queue_no_prio(struct starpu_sched_policy_
 struct starpu_sched_policy_s _starpu_sched_no_prio_policy = {
 	.init_sched = initialize_no_prio_policy,
 	.deinit_sched = NULL,
-	._starpu_get_local_queue = get_local_queue_no_prio,
+	.starpu_get_local_queue = get_local_queue_no_prio,
 	.policy_name = "no-prio",
 	.policy_description = "eager without priority"
 };

+ 1 - 1
src/core/policies/random-policy.c

@@ -122,7 +122,7 @@ static struct starpu_jobq_s *get_local_queue_random(struct starpu_sched_policy_s
 struct starpu_sched_policy_s _starpu_sched_random_policy = {
 	.init_sched = initialize_random_policy,
 	.deinit_sched = NULL,
-	._starpu_get_local_queue = get_local_queue_random,
+	.starpu_get_local_queue = get_local_queue_random,
 	.policy_name = "random",
 	.policy_description = "weighted random"
 };

+ 5 - 5
src/core/policies/sched_policy.c

@@ -77,7 +77,7 @@ static void load_sched_policy(struct starpu_sched_policy_s *sched_policy)
 
 	policy.init_sched = sched_policy->init_sched;
 	policy.deinit_sched = sched_policy->deinit_sched;
-	policy._starpu_get_local_queue = sched_policy->_starpu_get_local_queue;
+	policy.starpu_get_local_queue = sched_policy->starpu_get_local_queue;
 
 	pthread_cond_init(&policy.sched_activity_cond, NULL);
 	pthread_mutex_init(&policy.sched_activity_mutex, NULL);
@@ -185,7 +185,7 @@ void _starpu_deinit_sched_policy(struct starpu_machine_config_s *config)
 /* the generic interface that call the proper underlying implementation */
 int _starpu_push_task(starpu_job_t j)
 {
-	struct starpu_jobq_s *queue = policy._starpu_get_local_queue(&policy);
+	struct starpu_jobq_s *queue = policy.starpu_get_local_queue(&policy);
 
 	/* in case there is no codelet associated to the task (that's a control
 	 * task), we directly execute its callback and enforce the
@@ -228,7 +228,7 @@ struct starpu_job_s * _starpu_pop_task_from_queue(struct starpu_jobq_s *queue)
 
 struct starpu_job_s * _starpu_pop_task(void)
 {
-	struct starpu_jobq_s *queue = policy._starpu_get_local_queue(&policy);
+	struct starpu_jobq_s *queue = policy.starpu_get_local_queue(&policy);
 
 	return _starpu_pop_task_from_queue(queue);
 }
@@ -245,14 +245,14 @@ struct starpu_job_list_s * _starpu_pop_every_task_from_queue(struct starpu_jobq_
 /* pop every task that can be executed on "where" (eg. GORDON) */
 struct starpu_job_list_s *_starpu_pop_every_task(uint32_t where)
 {
-	struct starpu_jobq_s *queue = policy._starpu_get_local_queue(&policy);
+	struct starpu_jobq_s *queue = policy.starpu_get_local_queue(&policy);
 
 	return _starpu_pop_every_task_from_queue(queue, where);
 }
 
 void _starpu_wait_on_sched_event(void)
 {
-	struct starpu_jobq_s *q = policy._starpu_get_local_queue(&policy);
+	struct starpu_jobq_s *q = policy.starpu_get_local_queue(&policy);
 
 	pthread_mutex_lock(&q->activity_mutex);
 

+ 1 - 1
src/core/policies/sched_policy.h

@@ -35,7 +35,7 @@ struct starpu_sched_policy_s {
 	void (*deinit_sched)(struct starpu_machine_config_s *, struct starpu_sched_policy_s *);
 
 	/* anyone can request which queue it is associated to */
-	struct starpu_jobq_s *(*_starpu_get_local_queue)(struct starpu_sched_policy_s *);
+	struct starpu_jobq_s *(*starpu_get_local_queue)(struct starpu_sched_policy_s *);
 
 	/* name of the policy (optionnal) */
 	const char *policy_name;

+ 1 - 1
src/core/policies/work-stealing-policy.c

@@ -202,7 +202,7 @@ static struct starpu_jobq_s *get_local_queue_ws(struct starpu_sched_policy_s *po
 struct starpu_sched_policy_s _starpu_sched_ws_policy = {
 	.init_sched = initialize_ws_policy,
 	.deinit_sched = NULL,
-	._starpu_get_local_queue = get_local_queue_ws,
+	.starpu_get_local_queue = get_local_queue_ws,
 	.policy_name = "ws",
 	.policy_description = "work stealing"
 };

+ 1 - 1
src/drivers/cpu/driver_cpu.c

@@ -140,7 +140,7 @@ void *_starpu_cpu_worker(void *arg)
 	int res;
 
 	struct starpu_sched_policy_s *policy = _starpu_get_sched_policy();
-	struct starpu_jobq_s *queue = policy->_starpu_get_local_queue(policy);
+	struct starpu_jobq_s *queue = policy->starpu_get_local_queue(policy);
 	unsigned memnode = cpu_arg->memory_node;
 
 	while (_starpu_machine_is_running())

+ 1 - 1
src/drivers/cuda/driver_cuda.c

@@ -222,7 +222,7 @@ void *_starpu_cuda_worker(void *arg)
 	int res;
 
 	struct starpu_sched_policy_s *policy = _starpu_get_sched_policy();
-	struct starpu_jobq_s *queue = policy->_starpu_get_local_queue(policy);
+	struct starpu_jobq_s *queue = policy->starpu_get_local_queue(policy);
 	unsigned memnode = args->memory_node;
 	
 	while (_starpu_machine_is_running())