1
0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00

sync: rename m_lock() -> @lock(), r_lock() -> @rlock(), ... (#8443)

This commit is contained in:
Uwe Krüger
2021-01-30 15:23:55 +01:00
committed by GitHub
parent 8dff63b824
commit 058f3ba013
7 changed files with 32 additions and 32 deletions

View File

@ -139,7 +139,7 @@ fn process_in_thread(mut pool PoolProcessor, task_id int) {
if pool.ntask >= ilen {
break
}
pool.ntask_mtx.m_lock()
pool.ntask_mtx.@lock()
idx = pool.ntask
pool.ntask++
pool.ntask_mtx.unlock()

View File

@ -69,8 +69,8 @@ pub fn (mut m RwMutex) init() {
C.pthread_rwlock_init(&m.mutex, &a.attr)
}
// m_lock(), for *manual* mutex handling, since `lock` is a keyword
pub fn (mut m Mutex) m_lock() {
// @lock(), for *manual* mutex handling, since `lock` is a keyword
pub fn (mut m Mutex) @lock() {
C.pthread_mutex_lock(&m.mutex)
}
@ -79,21 +79,21 @@ pub fn (mut m Mutex) unlock() {
}
// RwMutex has separate read- and write locks
pub fn (mut m RwMutex) r_lock() {
pub fn (mut m RwMutex) @rlock() {
C.pthread_rwlock_rdlock(&m.mutex)
}
pub fn (mut m RwMutex) w_lock() {
pub fn (mut m RwMutex) @lock() {
C.pthread_rwlock_wrlock(&m.mutex)
}
// Windows SRWLocks have different function to unlock
// So provide two functions here, too, to have a common interface
pub fn (mut m RwMutex) r_unlock() {
pub fn (mut m RwMutex) runlock() {
C.pthread_rwlock_unlock(&m.mutex)
}
pub fn (mut m RwMutex) w_unlock() {
pub fn (mut m RwMutex) unlock() {
C.pthread_rwlock_unlock(&m.mutex)
}

View File

@ -80,8 +80,8 @@ pub fn (mut m RwMutex) init() {
C.pthread_rwlock_init(&m.mutex, &a.attr)
}
// m_lock(), for *manual* mutex handling, since `lock` is a keyword
pub fn (mut m Mutex) m_lock() {
// @lock(), for *manual* mutex handling, since `lock` is a keyword
pub fn (mut m Mutex) @lock() {
C.pthread_mutex_lock(&m.mutex)
}
@ -90,21 +90,21 @@ pub fn (mut m Mutex) unlock() {
}
// RwMutex has separate read- and write locks
pub fn (mut m RwMutex) r_lock() {
pub fn (mut m RwMutex) @rlock() {
C.pthread_rwlock_rdlock(&m.mutex)
}
pub fn (mut m RwMutex) w_lock() {
pub fn (mut m RwMutex) @lock() {
C.pthread_rwlock_wrlock(&m.mutex)
}
// Windows SRWLocks have different function to unlock
// So provide two functions here, too, to have a common interface
pub fn (mut m RwMutex) r_unlock() {
pub fn (mut m RwMutex) runlock() {
C.pthread_rwlock_unlock(&m.mutex)
}
pub fn (mut m RwMutex) w_unlock() {
pub fn (mut m RwMutex) unlock() {
C.pthread_rwlock_unlock(&m.mutex)
}

View File

@ -57,7 +57,7 @@ pub fn (mut m RwMutex) init() {
C.InitializeSRWLock(&m.mx)
}
pub fn (mut m Mutex) m_lock() {
pub fn (mut m Mutex) @lock() {
C.AcquireSRWLockExclusive(&m.mx)
}
@ -66,21 +66,21 @@ pub fn (mut m Mutex) unlock() {
}
// RwMutex has separate read- and write locks
pub fn (mut m RwMutex) r_lock() {
pub fn (mut m RwMutex) @rlock() {
C.AcquireSRWLockShared(&m.mx)
}
pub fn (mut m RwMutex) w_lock() {
pub fn (mut m RwMutex) @lock() {
C.AcquireSRWLockExclusive(&m.mx)
}
// Windows SRWLocks have different function to unlock
// So provide two functions here, too, to have a common interface
pub fn (mut m RwMutex) r_unlock() {
pub fn (mut m RwMutex) runlock() {
C.ReleaseSRWLockShared(&m.mx)
}
pub fn (mut m RwMutex) w_unlock() {
pub fn (mut m RwMutex) unlock() {
C.ReleaseSRWLockExclusive(&m.mx)
}

View File

@ -30,7 +30,7 @@ pub fn new_waitgroup() &WaitGroup {
// add panics if task count drops below zero.
pub fn (mut wg WaitGroup) add(delta int) {
// protect task_count
wg.task_count_mutex.m_lock()
wg.task_count_mutex.@lock()
defer {
wg.task_count_mutex.unlock()
}