浏览代码

workers: turn function starpu_worker_mutex_is_sched_mutex private and hence rename it as _starpu_worker_mutex_is_sched_mutex

Nathalie Furmento 11 年之前
父节点
当前提交
d3b10b1424
共有 4 个文件被更改,包括 10 次插入10 次删除
  1. 0 2
      include/starpu_worker.h
  2. 7 7
      src/common/thread.c
  3. 1 1
      src/core/workers.c
  4. 2 0
      src/core/workers.h

+ 0 - 2
include/starpu_worker.h

@@ -107,8 +107,6 @@ int starpu_worker_get_mp_nodeid(int id);
 
 int starpu_worker_get_nsched_ctxs(int workerid);
 
-unsigned starpu_worker_mutex_is_sched_mutex(int workerid, starpu_pthread_mutex_t *mutex);
-
 struct starpu_tree* starpu_workers_get_tree(void);
 
 #ifdef __cplusplus

+ 7 - 7
src/common/thread.c

@@ -337,8 +337,8 @@ int starpu_pthread_mutex_lock(starpu_pthread_mutex_t *mutex)
 
 	int p_ret = pthread_mutex_lock(mutex);
 	int workerid = starpu_worker_get_id();
-	if(workerid != -1 && starpu_worker_mutex_is_sched_mutex(workerid, mutex))
-		_starpu_worker_set_flag_sched_mutex_locked(workerid, 1);	 
+	if(workerid != -1 && _starpu_worker_mutex_is_sched_mutex(workerid, mutex))
+		_starpu_worker_set_flag_sched_mutex_locked(workerid, 1);
 
 	_STARPU_TRACE_MUTEX_LOCKED();
 
@@ -350,9 +350,9 @@ int starpu_pthread_mutex_unlock(starpu_pthread_mutex_t *mutex)
 	_STARPU_TRACE_UNLOCKING_MUTEX();
 
 	int p_ret = pthread_mutex_unlock(mutex);
-	int workerid = starpu_worker_get_id(); 
-	if(workerid != -1 && starpu_worker_mutex_is_sched_mutex(workerid, mutex)) 
-		_starpu_worker_set_flag_sched_mutex_locked(workerid, 0);	
+	int workerid = starpu_worker_get_id();
+	if(workerid != -1 && _starpu_worker_mutex_is_sched_mutex(workerid, mutex))
+		_starpu_worker_set_flag_sched_mutex_locked(workerid, 0);
 
 	_STARPU_TRACE_MUTEX_UNLOCKED();
 
@@ -368,8 +368,8 @@ int starpu_pthread_mutex_trylock(starpu_pthread_mutex_t *mutex)
 
 	if (!ret)
 	{
-		int workerid = starpu_worker_get_id();	
-		if(workerid != -1 && starpu_worker_mutex_is_sched_mutex(workerid, mutex)) 
+		int workerid = starpu_worker_get_id();
+		if(workerid != -1 && _starpu_worker_mutex_is_sched_mutex(workerid, mutex))
 			_starpu_worker_set_flag_sched_mutex_locked(workerid, 1);
 
 		_STARPU_TRACE_MUTEX_LOCKED();

+ 1 - 1
src/core/workers.c

@@ -1858,7 +1858,7 @@ void _starpu_worker_set_flag_sched_mutex_locked(int workerid, unsigned flag)
 	w->sched_mutex_locked = flag;
 }
 
-unsigned starpu_worker_mutex_is_sched_mutex(int workerid, starpu_pthread_mutex_t *mutex)
+unsigned _starpu_worker_mutex_is_sched_mutex(int workerid, starpu_pthread_mutex_t *mutex)
 {
 	struct _starpu_worker *w = _starpu_get_worker_struct(workerid);
 	return &w->sched_mutex == mutex;

+ 2 - 0
src/core/workers.h

@@ -420,4 +420,6 @@ void _starpu_relock_mutex_if_prev_locked();
 
 void _starpu_worker_set_flag_sched_mutex_locked(int workerid, unsigned flag);
 
+unsigned _starpu_worker_mutex_is_sched_mutex(int workerid, starpu_pthread_mutex_t *mutex);
+
 #endif // __WORKERS_H__