Bläddra i källkod

Prefixing of src/common/rwlock.h

find . -type f -not -name "*svn*"|xargs sed -i s/"\brw_lock_t\b"/starpu_rw_lock_s/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\brw_lock\b"/starpu_rw_lock_t/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\binit_rw_lock\b"/_starpu_init_rw_lock/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\btake_rw_lock_write\b"/_starpu_take_rw_lock_write/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\btake_rw_lock_read\b"/_starpu_take_rw_lock_read/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\btake_rw_lock_write_try\b"/_starpu_take_rw_lock_write_try/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\btake_rw_lock_read_try\b"/_starpu_take_rw_lock_read_try/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\brelease_rw_lock\b"/_starpu_release_rw_lock/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\brw_lock_is_writer\b"/_starpu_rw_lock_is_writer/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bis_rw_lock_referenced\b"/_starpu_is_rw_lock_referenced/g
Nathalie Furmento 15 år sedan
förälder
incheckning
a5c3eb98e4
2 ändrade filer med 18 tillägg och 18 borttagningar
  1. 8 8
      src/common/rwlock.c
  2. 10 10
      src/common/rwlock.h

+ 8 - 8
src/common/rwlock.c

@@ -20,7 +20,7 @@
 
 #include "rwlock.h"
 
-static void _take_busy_lock(rw_lock *lock)
+static void _take_busy_lock(starpu_rw_lock_t *lock)
 {
 	uint32_t prev;
 	do {
@@ -28,12 +28,12 @@ static void _take_busy_lock(rw_lock *lock)
 	} while (prev);
 }
 
-static void _release_busy_lock(rw_lock *lock)
+static void _release_busy_lock(starpu_rw_lock_t *lock)
 {
 	STARPU_RELEASE(&lock->busy);
 }
 
-void init_rw_lock(rw_lock *lock)
+void _starpu_init_rw_lock(starpu_rw_lock_t *lock)
 {
 	STARPU_ASSERT(lock);
 
@@ -43,7 +43,7 @@ void init_rw_lock(rw_lock *lock)
 }
 
 
-int take_rw_lock_write_try(rw_lock *lock)
+int _starpu_take_rw_lock_write_try(starpu_rw_lock_t *lock)
 {
 	_take_busy_lock(lock);
 	
@@ -64,7 +64,7 @@ int take_rw_lock_write_try(rw_lock *lock)
 	}
 }
 
-int take_rw_lock_read_try(rw_lock *lock)
+int _starpu_take_rw_lock_read_try(starpu_rw_lock_t *lock)
 {
 	_take_busy_lock(lock);
 
@@ -88,7 +88,7 @@ int take_rw_lock_read_try(rw_lock *lock)
 
 
 
-void take_rw_lock_write(rw_lock *lock)
+void _starpu_take_rw_lock_write(starpu_rw_lock_t *lock)
 {
 	do {
 		_take_busy_lock(lock);
@@ -110,7 +110,7 @@ void take_rw_lock_write(rw_lock *lock)
 	} while (1);
 }
 
-void take_rw_lock_read(rw_lock *lock)
+void _starpu_take_rw_lock_read(starpu_rw_lock_t *lock)
 {
 	do {
 		_take_busy_lock(lock);
@@ -133,7 +133,7 @@ void take_rw_lock_read(rw_lock *lock)
 	} while (1);
 }
 
-void release_rw_lock(rw_lock *lock)
+void _starpu_release_rw_lock(starpu_rw_lock_t *lock)
 {
 	_take_busy_lock(lock);
 	/* either writer or reader (exactly one !) */

+ 10 - 10
src/common/rwlock.h

@@ -20,21 +20,21 @@
 #include <stdint.h>
 #include <starpu.h>
 
-typedef struct rw_lock_t {
+typedef struct starpu_rw_lock_s {
 	uint32_t busy;
 	uint8_t writer;
 	uint16_t readercnt;
-} rw_lock;
+} starpu_rw_lock_t;
 
-void init_rw_lock(rw_lock *lock);
-void take_rw_lock_write(rw_lock *lock);
-void take_rw_lock_read(rw_lock *lock);
-int take_rw_lock_write_try(rw_lock *lock);
-int take_rw_lock_read_try(rw_lock *lock);
-void release_rw_lock(rw_lock *lock);
+void _starpu_init_rw_lock(starpu_rw_lock_t *lock);
+void _starpu_take_rw_lock_write(starpu_rw_lock_t *lock);
+void _starpu_take_rw_lock_read(starpu_rw_lock_t *lock);
+int _starpu_take_rw_lock_write_try(starpu_rw_lock_t *lock);
+int _starpu_take_rw_lock_read_try(starpu_rw_lock_t *lock);
+void _starpu_release_rw_lock(starpu_rw_lock_t *lock);
 
 ///* make sure to have the lock before using that function */
-//inline uint8_t rw_lock_is_writer(rw_lock *lock);
-//unsigned is_rw_lock_referenced(rw_lock *lock);
+//inline uint8_t _starpu_rw_lock_is_writer(starpu_rw_lock_t *lock);
+//unsigned _starpu_is_rw_lock_referenced(starpu_rw_lock_t *lock);
 
 #endif