浏览代码

Prefixing of src/core/mechanisms/priority_queues.h

 find . -type f -not -name "*svn*"|xargs sed -i s/"\bpriority_jobq_s\b"/starpu_priority_jobq_s/g
 find . -type f -not -name "*svn*"|xargs sed -i s/"\bcreate_priority_jobq\b"/_starpu_create_priority_jobq/g
 find . -type f -not -name "*svn*"|xargs sed -i s/"\binit_priority_queues_mechanisms\b"/_starpu_init_priority_queues_mechanisms/g
 find . -type f -not -name "*svn*"|xargs sed -i s/"\bpriority_push_task\b"/_starpu_priority_push_task/g
 find . -type f -not -name "*svn*"|xargs sed -i s/"\bpriority_pop_task\b"/_starpu_priority_pop_task/g
Nathalie Furmento 15 年之前
父节点
当前提交
721571e533

+ 8 - 8
src/core/mechanisms/priority_queues.c

@@ -28,7 +28,7 @@
 static pthread_cond_t *sched_cond;
 static pthread_mutex_t *sched_mutex;
 
-void init_priority_queues_mechanisms(void)
+void _starpu_init_priority_queues_mechanisms(void)
 {
 	struct starpu_sched_policy_s *sched = _starpu_get_sched_policy();
 
@@ -37,15 +37,15 @@ void init_priority_queues_mechanisms(void)
 	sched_mutex = &sched->sched_activity_mutex;
 }
 
-struct jobq_s *create_priority_jobq(void)
+struct jobq_s *_starpu_create_priority_jobq(void)
 {
 	struct jobq_s *q;
 
 	q = malloc(sizeof(struct jobq_s));
 
-	struct priority_jobq_s *central_queue;
+	struct starpu_priority_jobq_s *central_queue;
 	
-	central_queue = malloc(sizeof(struct priority_jobq_s));
+	central_queue = malloc(sizeof(struct starpu_priority_jobq_s));
 	q->queue = central_queue;
 
 	pthread_mutex_init(&q->activity_mutex, NULL);
@@ -63,10 +63,10 @@ struct jobq_s *create_priority_jobq(void)
 	return q;
 }
 
-int priority_push_task(struct jobq_s *q, starpu_job_t j)
+int _starpu_priority_push_task(struct jobq_s *q, starpu_job_t j)
 {
 	STARPU_ASSERT(q);
-	struct priority_jobq_s *queue = q->queue;
+	struct starpu_priority_jobq_s *queue = q->queue;
 
 	/* if anyone is blocked on the entire machine, wake it up */
 	pthread_mutex_lock(sched_mutex);
@@ -90,12 +90,12 @@ int priority_push_task(struct jobq_s *q, starpu_job_t j)
 	return 0;
 }
 
-starpu_job_t priority_pop_task(struct jobq_s *q)
+starpu_job_t _starpu_priority_pop_task(struct jobq_s *q)
 {
 	starpu_job_t j = NULL;
 
 	STARPU_ASSERT(q);
-	struct priority_jobq_s *queue = q->queue;
+	struct starpu_priority_jobq_s *queue = q->queue;
 
 	/* block until some event happens */
 	pthread_mutex_lock(&q->activity_mutex);

+ 5 - 5
src/core/mechanisms/priority_queues.h

@@ -23,7 +23,7 @@
 
 #define NPRIO_LEVELS	((STARPU_MAX_PRIO) - (STARPU_MIN_PRIO) + 1)
 
-struct priority_jobq_s {
+struct starpu_priority_jobq_s {
 	/* the actual lists 
 	 *	jobq[p] is for priority [p - STARPU_MIN_PRIO] */
 	starpu_job_list_t jobq[NPRIO_LEVELS];
@@ -32,11 +32,11 @@ struct priority_jobq_s {
 	unsigned total_njobs;
 };
 
-struct jobq_s *create_priority_jobq(void);
-void init_priority_queues_mechanisms(void);
+struct jobq_s *_starpu_create_priority_jobq(void);
+void _starpu_init_priority_queues_mechanisms(void);
 
-int priority_push_task(struct jobq_s *q, starpu_job_t task);
+int _starpu_priority_push_task(struct jobq_s *q, starpu_job_t task);
 
-starpu_job_t priority_pop_task(struct jobq_s *q);
+starpu_job_t _starpu_priority_pop_task(struct jobq_s *q);
 
 #endif // __PRIORITY_QUEUES_H__

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

@@ -22,14 +22,14 @@ static struct jobq_s *jobq;
 static void init_priority_queue_design(void)
 {
 	/* only a single queue (even though there are several internaly) */
-	jobq = create_priority_jobq();
+	jobq = _starpu_create_priority_jobq();
 
-	init_priority_queues_mechanisms();
+	_starpu_init_priority_queues_mechanisms();
 
 	/* we always use priorities in that policy */
-	jobq->_starpu_push_task = priority_push_task;
-	jobq->push_prio_task = priority_push_task;
-	jobq->_starpu_pop_task = priority_pop_task;
+	jobq->_starpu_push_task = _starpu_priority_push_task;
+	jobq->push_prio_task = _starpu_priority_push_task;
+	jobq->_starpu_pop_task = _starpu_priority_pop_task;
 }
 
 static struct jobq_s *func_init_priority_queue(void)