Prefixing of src/core/mechanisms/fifo_queues.h

find . -type f -not -name "*svn*"|xargs sed -i s/"\bfifo_jobq_s\b"/starpu_fifo_jobq_s/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bcreate_fifo\b"/_starpu_create_fifo/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bfifo_push_task\b"/_starpu_fifo_push_task/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bfifo_push_prio_task\b"/_starpu_fifo_push_prio_task/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bfifo_pop_task\b"/_starpu_fifo_pop_task/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bfifo_pop_every_task\b"/_starpu_fifo_pop_every_task/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\binit_fifo_queues_mechanisms\b"/_starpu_init_fifo_queues_mechanisms/g

src/core/mechanisms/fifo_queues.c

@@ -25,7 +25,7 @@ static unsigned total_number_of_jobs;
 static pthread_cond_t *sched_cond;
 static pthread_mutex_t *sched_mutex;
 
-void init_fifo_queues_mechanisms(void)
+void _starpu_init_fifo_queues_mechanisms(void)
 {
 	total_number_of_jobs = 0;
 
@@ -36,7 +36,7 @@ void init_fifo_queues_mechanisms(void)
 	sched_mutex = &sched->sched_activity_mutex;
 }
 
-struct jobq_s *create_fifo(void)
+struct jobq_s *_starpu_create_fifo(void)
 {
 	struct jobq_s *jobq;
 	jobq = malloc(sizeof(struct jobq_s));
@@ -44,8 +44,8 @@ struct jobq_s *create_fifo(void)
 	pthread_mutex_init(&jobq->activity_mutex, NULL);
 	pthread_cond_init(&jobq->activity_cond, NULL);
 
-	struct fifo_jobq_s *fifo;
-	fifo = malloc(sizeof(struct fifo_jobq_s));
+	struct starpu_fifo_jobq_s *fifo;
+	fifo = malloc(sizeof(struct starpu_fifo_jobq_s));
 
 	/* note that not all mechanisms (eg. the semaphore) have to be used */
 	fifo->jobq = starpu_job_list_new();
@@ -61,11 +61,11 @@ struct jobq_s *create_fifo(void)
 	return jobq;
 }
 
-int fifo_push_prio_task(struct jobq_s *q, starpu_job_t task)
+int _starpu_fifo_push_prio_task(struct jobq_s *q, starpu_job_t task)
 {
 #ifndef STARPU_NO_PRIO
 	STARPU_ASSERT(q);
-	struct fifo_jobq_s *fifo_queue = q->queue;
+	struct starpu_fifo_jobq_s *fifo_queue = q->queue;
 
 	/* if anyone is blocked on the entire machine, wake it up */
 	pthread_mutex_lock(sched_mutex);
@@ -86,14 +86,14 @@ int fifo_push_prio_task(struct jobq_s *q, starpu_job_t task)
 
 	return 0;
 #else
-	return fifo_push_task(q, task);
+	return _starpu_fifo_push_task(q, task);
 #endif
 }
 
-int fifo_push_task(struct jobq_s *q, starpu_job_t task)
+int _starpu_fifo_push_task(struct jobq_s *q, starpu_job_t task)
 {
 	STARPU_ASSERT(q);
-	struct fifo_jobq_s *fifo_queue = q->queue;
+	struct starpu_fifo_jobq_s *fifo_queue = q->queue;
 
 	/* if anyone is blocked on the entire machine, wake it up */
 	pthread_mutex_lock(sched_mutex);
@@ -115,12 +115,12 @@ int fifo_push_task(struct jobq_s *q, starpu_job_t task)
 	return 0;
 }
 
-starpu_job_t fifo_pop_task(struct jobq_s *q)
+starpu_job_t _starpu_fifo_pop_task(struct jobq_s *q)
 {
 	starpu_job_t j = NULL;
 
 	STARPU_ASSERT(q);
-	struct fifo_jobq_s *fifo_queue = q->queue;
+	struct starpu_fifo_jobq_s *fifo_queue = q->queue;
 
 	if (fifo_queue->njobs == 0)
 		return NULL;
@@ -146,13 +146,13 @@ starpu_job_t fifo_pop_task(struct jobq_s *q)
 }
 
 /* pop every task that can be executed on the calling driver */
-struct starpu_job_list_s * fifo_pop_every_task(struct jobq_s *q, uint32_t where)
+struct starpu_job_list_s * _starpu_fifo_pop_every_task(struct jobq_s *q, uint32_t where)
 {
 	struct starpu_job_list_s *new_list, *old_list;
 	unsigned size;
 	
 	STARPU_ASSERT(q);
-	struct fifo_jobq_s *fifo_queue = q->queue;
+	struct starpu_fifo_jobq_s *fifo_queue = q->queue;
 
 	pthread_mutex_lock(&q->activity_mutex);
 

src/core/mechanisms/fifo_queues.h

@@ -19,7 +19,7 @@
 
 #include <core/mechanisms/queues.h>
 
-struct fifo_jobq_s {
+struct starpu_fifo_jobq_s {
 	/* the actual list */
 	starpu_job_list_t jobq;
 
@@ -35,14 +35,14 @@ struct fifo_jobq_s {
 	double exp_len;
 };
 
-struct jobq_s *create_fifo(void);
+struct jobq_s *_starpu_create_fifo(void);
 
-int fifo_push_task(struct jobq_s *q, starpu_job_t task);
-int fifo_push_prio_task(struct jobq_s *q, starpu_job_t task);
+int _starpu_fifo_push_task(struct jobq_s *q, starpu_job_t task);
+int _starpu_fifo_push_prio_task(struct jobq_s *q, starpu_job_t task);
 
-starpu_job_t fifo_pop_task(struct jobq_s *q);
-struct starpu_job_list_s * fifo_pop_every_task(struct jobq_s *q, uint32_t where);
+starpu_job_t _starpu_fifo_pop_task(struct jobq_s *q);
+struct starpu_job_list_s * _starpu_fifo_pop_every_task(struct jobq_s *q, uint32_t where);
 
-void init_fifo_queues_mechanisms(void);
+void _starpu_init_fifo_queues_mechanisms(void);
 
 #endif // __FIFO_QUEUES_H__

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

@@ -28,9 +28,9 @@ static starpu_job_t dmda_pop_task(struct jobq_s *q)
 {
 	struct starpu_job_s *j;
 
-	j = fifo_pop_task(q);
+	j = _starpu_fifo_pop_task(q);
 	if (j) {
-		struct fifo_jobq_s *fifo = q->queue;
+		struct starpu_fifo_jobq_s *fifo = q->queue;
 		double model = j->predicted;
 	
 		fifo->exp_len -= model;
@@ -58,7 +58,7 @@ static void update_data_requests(struct jobq_s *q, struct starpu_task *task)
 static int _dmda_push_task(struct jobq_s *q __attribute__ ((unused)) , starpu_job_t j, unsigned prio)
 {
 	/* find the queue */
-	struct fifo_jobq_s *fifo;
+	struct starpu_fifo_jobq_s *fifo;
 	unsigned worker;
 	int best = -1;
 	
@@ -172,9 +172,9 @@ static int _dmda_push_task(struct jobq_s *q __attribute__ ((unused)) , starpu_jo
 		_starpu_prefetch_task_input_on_node(task, queue_array[best]->memory_node);
 
 	if (prio) {
-		return fifo_push_prio_task(queue_array[best], j);
+		return _starpu_fifo_push_prio_task(queue_array[best], j);
 	} else {
-		return fifo_push_task(queue_array[best], j);
+		return _starpu_fifo_push_task(queue_array[best], j);
 	}
 }
 
@@ -195,7 +195,7 @@ static struct jobq_s *init_dmda_fifo(void)
 {
 	struct jobq_s *q;
 
-	q = create_fifo();
+	q = _starpu_create_fifo();
 
 	q->_starpu_push_task = dmda_push_task; 
 	q->push_prio_task = dmda_push_prio_task; 
@@ -224,7 +224,7 @@ static void initialize_dmda_policy(struct starpu_machine_config_s *config,
 	if (strval_beta)
 		beta = atof(strval_beta);
 
-	setup_queues(init_fifo_queues_mechanisms, init_dmda_fifo, config);
+	setup_queues(_starpu_init_fifo_queues_mechanisms, init_dmda_fifo, config);
 }
 
 static struct jobq_s *get_local_queue_dmda(struct starpu_sched_policy_s *policy __attribute__ ((unused)))

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

@@ -26,9 +26,9 @@ static starpu_job_t dm_pop_task(struct jobq_s *q)
 {
 	struct starpu_job_s *j;
 
-	j = fifo_pop_task(q);
+	j = _starpu_fifo_pop_task(q);
 	if (j) {
-		struct fifo_jobq_s *fifo = q->queue;
+		struct starpu_fifo_jobq_s *fifo = q->queue;
 		double model = j->predicted;
 	
 		fifo->exp_len -= model;
@@ -43,14 +43,14 @@ static struct starpu_job_list_s *dm_pop_every_task(struct jobq_s *q, uint32_t wh
 {
 	struct starpu_job_list_s *new_list;
 
-	new_list = fifo_pop_every_task(q, where);
+	new_list = _starpu_fifo_pop_every_task(q, where);
 	if (new_list) {
 		starpu_job_itor_t i;
 		for(i = starpu_job_list_begin(new_list);
 			i != starpu_job_list_end(new_list);
 			i = starpu_job_list_next(i))
 		{
-			struct fifo_jobq_s *fifo = q->queue;
+			struct starpu_fifo_jobq_s *fifo = q->queue;
 			double model = i->predicted;
 	
 			fifo->exp_len -= model;
@@ -67,7 +67,7 @@ static struct starpu_job_list_s *dm_pop_every_task(struct jobq_s *q, uint32_t wh
 static int _dm_push_task(struct jobq_s *q __attribute__ ((unused)), starpu_job_t j, unsigned prio)
 {
 	/* find the queue */
-	struct fifo_jobq_s *fifo;
+	struct starpu_fifo_jobq_s *fifo;
 	unsigned worker;
 	int best = -1;
 
@@ -133,9 +133,9 @@ static int _dm_push_task(struct jobq_s *q __attribute__ ((unused)), starpu_job_t
 		_starpu_prefetch_task_input_on_node(task, queue_array[best]->memory_node);
 
 	if (prio) {
-		return fifo_push_prio_task(queue_array[best], j);
+		return _starpu_fifo_push_prio_task(queue_array[best], j);
 	} else {
-		return fifo_push_task(queue_array[best], j);
+		return _starpu_fifo_push_task(queue_array[best], j);
 	}
 }
 
@@ -156,7 +156,7 @@ static struct jobq_s *init_dm_fifo(void)
 {
 	struct jobq_s *q;
 
-	q = create_fifo();
+	q = _starpu_create_fifo();
 
 	q->_starpu_push_task = dm_push_task; 
 	q->push_prio_task = dm_push_prio_task; 
@@ -182,7 +182,7 @@ static void initialize_dm_policy(struct starpu_machine_config_s *config,
 	fprintf(stderr, "Using prefetch ? %s\n", use_prefetch?"yes":"no");
 #endif
 
-	setup_queues(init_fifo_queues_mechanisms, init_dm_fifo, config);
+	setup_queues(_starpu_init_fifo_queues_mechanisms, init_dm_fifo, config);
 }
 
 static struct jobq_s *get_local_queue_dm(struct starpu_sched_policy_s *policy __attribute__ ((unused)))

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

@@ -27,15 +27,15 @@ static struct jobq_s *jobq;
 static void init_central_queue_design(void)
 {
 	/* there is only a single queue in that trivial design */
-	jobq = create_fifo();
+	jobq = _starpu_create_fifo();
 
-	init_fifo_queues_mechanisms();
+	_starpu_init_fifo_queues_mechanisms();
 
-	jobq->_starpu_push_task = fifo_push_task;
-	jobq->push_prio_task = fifo_push_prio_task;
-	jobq->_starpu_pop_task = fifo_pop_task;
+	jobq->_starpu_push_task = _starpu_fifo_push_task;
+	jobq->push_prio_task = _starpu_fifo_push_prio_task;
+	jobq->_starpu_pop_task = _starpu_fifo_pop_task;
 
-	jobq->_starpu_pop_every_task = fifo_pop_every_task;
+	jobq->_starpu_pop_every_task = _starpu_fifo_pop_every_task;
 }
 
 static struct jobq_s *func_init_central_queue(void)

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

@@ -27,14 +27,14 @@ static struct jobq_s *jobq;
 static void init_no_prio_design(void)
 {
 	/* there is only a single queue in that trivial design */
-	jobq = create_fifo();
+	jobq = _starpu_create_fifo();
 
-	init_fifo_queues_mechanisms();
+	_starpu_init_fifo_queues_mechanisms();
 
-	jobq->_starpu_push_task = fifo_push_task;
+	jobq->_starpu_push_task = _starpu_fifo_push_task;
 	/* no priority in that policy, let's be stupid here */
-	jobq->push_prio_task = fifo_push_task;
-	jobq->_starpu_pop_task = fifo_pop_task;
+	jobq->push_prio_task = _starpu_fifo_push_task;
+	jobq->_starpu_pop_task = _starpu_fifo_pop_task;
 }
 
 static struct jobq_s *func_init_central_queue(void)

src/core/policies/random-policy.c

@@ -24,7 +24,7 @@ static starpu_job_t random_pop_task(struct jobq_s *q)
 {
 	struct starpu_job_s *j;
 
-	j = fifo_pop_task(q);
+	j = _starpu_fifo_pop_task(q);
 
 	return j;
 }
@@ -32,7 +32,7 @@ static starpu_job_t random_pop_task(struct jobq_s *q)
 static int _random_push_task(struct jobq_s *q __attribute__ ((unused)), starpu_job_t task, unsigned prio)
 {
 	/* find the queue */
-	struct fifo_jobq_s *fifo;
+	struct starpu_fifo_jobq_s *fifo;
 	unsigned worker;
 
 	unsigned selected = 0;
@@ -63,9 +63,9 @@ static int _random_push_task(struct jobq_s *q __attribute__ ((unused)), starpu_j
 	fifo = queue_array[selected]->queue;
 
 	if (prio) {
-		return fifo_push_prio_task(queue_array[selected], task);
+		return _starpu_fifo_push_prio_task(queue_array[selected], task);
 	} else {
-		return fifo_push_task(queue_array[selected], task);
+		return _starpu_fifo_push_task(queue_array[selected], task);
 	}
 }
 
@@ -83,7 +83,7 @@ static struct jobq_s *init_random_fifo(void)
 {
 	struct jobq_s *q;
 
-	q = create_fifo();
+	q = _starpu_create_fifo();
 
 	q->_starpu_push_task = random_push_task; 
 	q->push_prio_task = random_push_prio_task; 
@@ -102,7 +102,7 @@ static void initialize_random_policy(struct starpu_machine_config_s *config,
 
 	starpu_srand48(time(NULL));
 
-	setup_queues(init_fifo_queues_mechanisms, init_random_fifo, config);
+	setup_queues(_starpu_init_fifo_queues_mechanisms, init_random_fifo, config);
 }
 
 static struct jobq_s *get_local_queue_random(struct starpu_sched_policy_s *policy __attribute__ ((unused)))