i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move libroot synchronization functions to private namespace

Browse Source 
* Prefix lock functions with __ to mark them as private. Add
  forwarding macros to keep existing code working.

* Avoids symbol name clashes with kernel lock APIs, occuring when
  using kernellandemu-lib in userlandfs. Thanks to Ingo for the
  suggestion.
This commit is contained in:
Julian Harnath
2014-07-13 16:19:08 +02:00
parent 2e75b75292
commit b916156a83
4 changed files with 59 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/shared/locks.h
+41 -18
View File
@@ -21,11 +21,17 @@ typedef struct mutex {
#define MUTEX_FLAG_ADAPTIVE 0x2
#define MUTEX_INITIALIZER(name) { name, 0, 0 }
void mutex_init(mutex *lock, const char *name);
void mutex_init_etc(mutex *lock, const char *name, uint32 flags);
void mutex_destroy(mutex *lock);
status_t mutex_lock(mutex *lock);
void mutex_unlock(mutex *lock);
#define mutex_init(lock, name) __mutex_init(lock, name)
#define mutex_init_etc(lock, name, flags) __mutex_init_etc(lock, name, flags)
#define mutex_destroy(lock) __mutex_destroy(lock)
#define mutex_lock(lock) __mutex_lock(lock)
#define mutex_unlock(lock) __mutex_unlock(lock)
void __mutex_init(mutex *lock, const char *name);
void __mutex_init_etc(mutex *lock, const char *name, uint32 flags);
void __mutex_destroy(mutex *lock);
status_t __mutex_lock(mutex *lock);
void __mutex_unlock(mutex *lock);
typedef struct rw_lock {
@@ -42,13 +48,22 @@ typedef struct rw_lock {
#define RW_LOCK_INITIALIZER(name) { MUTEX_INITIALIZER(name), NULL, \
NULL, -1, 0, 0, 0 }
void rw_lock_init(rw_lock *lock, const char *name);
void rw_lock_init_etc(rw_lock *lock, const char *name, uint32 flags);
void rw_lock_destroy(rw_lock *lock);
status_t rw_lock_read_lock(rw_lock *lock);
status_t rw_lock_read_unlock(rw_lock *lock);
status_t rw_lock_write_lock(rw_lock *lock);
status_t rw_lock_write_unlock(rw_lock *lock);
#define rw_lock_init(lock, name) __rw_lock_init(lock, name)
#define rw_lock_init_etc(lock, name, flags) \
__rw_lock_init_etc(lock, name, flags)
#define rw_lock_destroy(lock) __rw_lock_destroy(lock)
#define rw_lock_read_lock(lock) __rw_lock_read_lock(lock)
#define rw_lock_read_unlock(lock) __rw_lock_read_unlock(lock)
#define rw_lock_write_lock(lock) __rw_lock_write_lock(lock)
#define rw_lock_write_unlock(lock) __rw_lock_write_unlock(lock)
void __rw_lock_init(rw_lock *lock, const char *name);
void __rw_lock_init_etc(rw_lock *lock, const char *name, uint32 flags);
void __rw_lock_destroy(rw_lock *lock);
status_t __rw_lock_read_lock(rw_lock *lock);
status_t __rw_lock_read_unlock(rw_lock *lock);
status_t __rw_lock_write_lock(rw_lock *lock);
status_t __rw_lock_write_unlock(rw_lock *lock);
typedef struct recursive_lock {
@@ -60,13 +75,21 @@ typedef struct recursive_lock {
#define RECURSIVE_LOCK_FLAG_CLONE_NAME MUTEX_FLAG_CLONE_NAME
#define RECURSIVE_LOCK_INITIALIZER(name) { MUTEX_INITIALIZER(name), -1, 0 }
void recursive_lock_init(recursive_lock *lock, const char *name);
void recursive_lock_init_etc(recursive_lock *lock, const char *name,
#define recursive_lock_init(lock, name) __recursive_lock_init(lock, name)
#define recursive_lock_init_etc(lock, name, flags) \
__recursive_lock_init_etc(lock, name, flags)
#define recursive_lock_destroy(lock) __recursive_lock_destroy(lock)
#define recursive_lock_lock(lock) __recursive_lock_lock(lock)
#define recursive_lock_unlock(lock) __recursive_lock_unlock(lock)
#define recursive_lock_get_recursion(lock) __recursive_lock_get_recursion(lock)
void __recursive_lock_init(recursive_lock *lock, const char *name);
void __recursive_lock_init_etc(recursive_lock *lock, const char *name,
uint32 flags);
void recursive_lock_destroy(recursive_lock *lock);
status_t recursive_lock_lock(recursive_lock *lock);
void recursive_lock_unlock(recursive_lock *lock);
int32 recursive_lock_get_recursion(recursive_lock *lock);
void __recursive_lock_destroy(recursive_lock *lock);
status_t __recursive_lock_lock(recursive_lock *lock);
void __recursive_lock_unlock(recursive_lock *lock);
int32 __recursive_lock_get_recursion(recursive_lock *lock);
#define INIT_ONCE_UNINITIALIZED -1