Browse Source

renaming of field names in struct starpu_jobq_s: they do not need to be prefixed by _starpu_

Nathalie Furmento 15 years ago
parent
commit
da9954f6ac

+ 3 - 3
src/core/mechanisms/queues.h

@@ -29,9 +29,9 @@ struct starpu_jobq_s {
 	void *queue; 
 
 	/* some methods to manipulate the previous queue */
-	int (*_starpu_push_task)(struct starpu_jobq_s *, starpu_job_t);
+	int (*push_task)(struct starpu_jobq_s *, starpu_job_t);
 	int (*push_prio_task)(struct starpu_jobq_s *, starpu_job_t);
-	struct starpu_job_s* (*_starpu_pop_task)(struct starpu_jobq_s *);
+	struct starpu_job_s* (*pop_task)(struct starpu_jobq_s *);
 
 	/* returns the number of tasks that were retrieved 
  	 * the function is reponsible for allocating the output but the driver
@@ -39,7 +39,7 @@ struct starpu_jobq_s {
  	 *
  	 * NB : this function is non blocking
  	 * */
-	struct starpu_job_list_s *(*_starpu_pop_every_task)(struct starpu_jobq_s *, uint32_t);
+	struct starpu_job_list_s *(*pop_every_task)(struct starpu_jobq_s *, uint32_t);
 
 	/* what are the driver that may pop job from that queue ? */
 	uint32_t who;

+ 3 - 3
src/core/policies/deque_modeling_policy.c

@@ -157,10 +157,10 @@ static struct starpu_jobq_s *init_dm_fifo(void)
 
 	q = _starpu_create_fifo();
 
-	q->_starpu_push_task = dm_push_task; 
+	q->push_task = dm_push_task; 
 	q->push_prio_task = dm_push_prio_task; 
-	q->_starpu_pop_task = dm_pop_task;
-	q->_starpu_pop_every_task = dm_pop_every_task;
+	q->pop_task = dm_pop_task;
+	q->pop_every_task = dm_pop_every_task;
 	q->who = 0;
 
 	queue_array[nworkers++] = q;

+ 2 - 2
src/core/policies/deque_modeling_policy_data_aware.c

@@ -196,9 +196,9 @@ static struct starpu_jobq_s *init_dmda_fifo(void)
 
 	q = _starpu_create_fifo();
 
-	q->_starpu_push_task = dmda_push_task; 
+	q->push_task = dmda_push_task; 
 	q->push_prio_task = dmda_push_prio_task; 
-	q->_starpu_pop_task = dmda_pop_task;
+	q->pop_task = dmda_pop_task;
 	q->who = 0;
 
 	queue_array[nworkers++] = q;

+ 3 - 3
src/core/policies/eager_central_policy.c

@@ -31,11 +31,11 @@ static void init_central_queue_design(void)
 
 	_starpu_init_fifo_queues_mechanisms();
 
-	jobq->_starpu_push_task = _starpu_fifo_push_task;
+	jobq->push_task = _starpu_fifo_push_task;
 	jobq->push_prio_task = _starpu_fifo_push_prio_task;
-	jobq->_starpu_pop_task = _starpu_fifo_pop_task;
+	jobq->pop_task = _starpu_fifo_pop_task;
 
-	jobq->_starpu_pop_every_task = _starpu_fifo_pop_every_task;
+	jobq->pop_every_task = _starpu_fifo_pop_every_task;
 }
 
 static void deinit_central_queue_design(void)

+ 2 - 2
src/core/policies/eager_central_priority_policy.c

@@ -27,9 +27,9 @@ static void init_priority_queue_design(void)
 	_starpu_init_priority_queues_mechanisms();
 
 	/* we always use priorities in that policy */
-	jobq->_starpu_push_task = _starpu_priority_push_task;
+	jobq->push_task = _starpu_priority_push_task;
 	jobq->push_prio_task = _starpu_priority_push_task;
-	jobq->_starpu_pop_task = _starpu_priority_pop_task;
+	jobq->pop_task = _starpu_priority_pop_task;
 }
 
 static void deinit_priority_queue_design(void)

+ 2 - 2
src/core/policies/no_prio_policy.c

@@ -31,10 +31,10 @@ static void init_no_prio_design(void)
 
 	_starpu_init_fifo_queues_mechanisms();
 
-	jobq->_starpu_push_task = _starpu_fifo_push_task;
+	jobq->push_task = _starpu_fifo_push_task;
 	/* no priority in that policy, let's be stupid here */
 	jobq->push_prio_task = _starpu_fifo_push_task;
-	jobq->_starpu_pop_task = _starpu_fifo_pop_task;
+	jobq->pop_task = _starpu_fifo_pop_task;
 }
 
 static struct starpu_jobq_s *func_init_central_queue(void)

+ 2 - 2
src/core/policies/random_policy.c

@@ -85,9 +85,9 @@ static struct starpu_jobq_s *init_random_fifo(void)
 
 	q = _starpu_create_fifo();
 
-	q->_starpu_push_task = random_push_task; 
+	q->push_task = random_push_task; 
 	q->push_prio_task = random_push_prio_task; 
-	q->_starpu_pop_task = random_pop_task;
+	q->pop_task = random_pop_task;
 	q->who = 0;
 
 	queue_array[nworkers++] = q;

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

@@ -230,17 +230,17 @@ int _starpu_push_task(starpu_job_t j, unsigned job_is_already_locked)
 		return _starpu_push_local_task(worker, j);
 	}
 	else {
-		STARPU_ASSERT(queue->_starpu_push_task);
+		STARPU_ASSERT(queue->push_task);
 
-		return queue->_starpu_push_task(queue, j);
+		return queue->push_task(queue, j);
 	}
 }
 
 struct starpu_job_s * _starpu_pop_task_from_queue(struct starpu_jobq_s *queue)
 {
-	STARPU_ASSERT(queue->_starpu_pop_task);
+	STARPU_ASSERT(queue->pop_task);
 
-	struct starpu_job_s *j = queue->_starpu_pop_task(queue);
+	struct starpu_job_s *j = queue->pop_task(queue);
 
 	return j;
 }
@@ -254,9 +254,9 @@ struct starpu_job_s * _starpu_pop_task(void)
 
 struct starpu_job_list_s * _starpu_pop_every_task_from_queue(struct starpu_jobq_s *queue, uint32_t where)
 {
-	STARPU_ASSERT(queue->_starpu_pop_every_task);
+	STARPU_ASSERT(queue->pop_every_task);
 
-	struct starpu_job_list_s *list = queue->_starpu_pop_every_task(queue, where);
+	struct starpu_job_list_s *list = queue->pop_every_task(queue, where);
 
 	return list;
 }

+ 2 - 2
src/core/policies/work_stealing_policy.c

@@ -164,9 +164,9 @@ static struct starpu_jobq_s *init_ws_deque(void)
 
 	q = _starpu_create_deque();
 
-	q->_starpu_push_task = _starpu_deque_push_task; 
+	q->push_task = _starpu_deque_push_task; 
 	q->push_prio_task = _starpu_deque_push_prio_task; 
-	q->_starpu_pop_task = ws_pop_task;
+	q->pop_task = ws_pop_task;
 	q->who = 0;
 
 	queue_array[nworkers++] = q;