瀏覽代碼

Replace calls to pthread_* by calls to _STARPU_PHTREAD_*.

[Coccinelle] use_starpu_pthread_macros.cocci
Cyril Roelandt 13 年之前
父節點
當前提交
c7ced8364b
共有 3 個文件被更改,包括 10 次插入9 次删除
  1. 4 4
      src/core/dependencies/tags.c
  2. 2 1
      src/core/sched_policy.c
  3. 4 4
      src/datawizard/memory_nodes.c

+ 4 - 4
src/core/dependencies/tags.c

@@ -83,11 +83,11 @@ void starpu_tag_remove(starpu_tag_t id)
 {
 	struct _starpu_tag *tag;
 
-	pthread_rwlock_wrlock(&tag_global_rwlock);
+	_STARPU_PTHREAD_RWLOCK_WRLOCK(&tag_global_rwlock);
 
 	tag = (struct _starpu_tag *) _starpu_htbl_remove_tag(tag_htbl, id);
 
-	pthread_rwlock_unlock(&tag_global_rwlock);
+	_STARPU_PTHREAD_RWLOCK_UNLOCK(&tag_global_rwlock);
 
 	if (tag)
 	{
@@ -120,7 +120,7 @@ void starpu_tag_remove(starpu_tag_t id)
 
 static struct _starpu_tag *gettag_struct(starpu_tag_t id)
 {
-	pthread_rwlock_wrlock(&tag_global_rwlock);
+	_STARPU_PTHREAD_RWLOCK_WRLOCK(&tag_global_rwlock);
 
 	/* search if the tag is already declared or not */
 	struct _starpu_tag *tag;
@@ -137,7 +137,7 @@ static struct _starpu_tag *gettag_struct(starpu_tag_t id)
 		STARPU_ASSERT(old == NULL);
 	}
 
-	pthread_rwlock_unlock(&tag_global_rwlock);
+	_STARPU_PTHREAD_RWLOCK_UNLOCK(&tag_global_rwlock);
 
 	return tag;
 }

+ 2 - 1
src/core/sched_policy.c

@@ -512,7 +512,8 @@ void _starpu_wait_on_sched_event(void)
 	if (_starpu_machine_is_running())
 	{
 #ifndef STARPU_NON_BLOCKING_DRIVERS
-		pthread_cond_wait(worker->sched_cond, worker->sched_mutex);
+		_STARPU_PTHREAD_COND_WAIT(worker->sched_cond,
+					  worker->sched_mutex);
 #endif
 	}
 

+ 4 - 4
src/datawizard/memory_nodes.c

@@ -129,7 +129,7 @@ void _starpu_memory_node_register_condition(pthread_cond_t *cond, pthread_mutex_
 	unsigned cond_id;
 	unsigned nconds_total, nconds;
 
-	pthread_rwlock_wrlock(&descr.conditions_rwlock);
+	_STARPU_PTHREAD_RWLOCK_WRLOCK(&descr.conditions_rwlock);
 
 	/* we only insert the queue if it's not already in the list */
 	nconds = descr.condition_count[nodeid];
@@ -140,7 +140,7 @@ void _starpu_memory_node_register_condition(pthread_cond_t *cond, pthread_mutex_
 			STARPU_ASSERT(descr.conditions_attached_to_node[nodeid][cond_id].mutex == mutex);
 
 			/* the condition is already in the list */
-			pthread_rwlock_unlock(&descr.conditions_rwlock);
+			_STARPU_PTHREAD_RWLOCK_UNLOCK(&descr.conditions_rwlock);
 			return;
 		}
 	}
@@ -157,7 +157,7 @@ void _starpu_memory_node_register_condition(pthread_cond_t *cond, pthread_mutex_
 		if (descr.conditions_all[cond_id].cond == cond)
 		{
 			/* the queue is already in the global list */
-			pthread_rwlock_unlock(&descr.conditions_rwlock);
+			_STARPU_PTHREAD_RWLOCK_UNLOCK(&descr.conditions_rwlock);
 			return;
 		}
 	}
@@ -167,7 +167,7 @@ void _starpu_memory_node_register_condition(pthread_cond_t *cond, pthread_mutex_
 	descr.conditions_all[nconds_total].mutex = mutex;
 	descr.total_condition_count++;
 
-	pthread_rwlock_unlock(&descr.conditions_rwlock);
+	_STARPU_PTHREAD_RWLOCK_UNLOCK(&descr.conditions_rwlock);
 }
 
 unsigned starpu_worker_get_memory_node(unsigned workerid)