luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unix: consolidate rwlock tryrdlock trywrlock errors

Browse Source 
Fold EAGAIN and EBUSY into EBUSY. This makes it consistent across all
Unix platforms and Windows.

Refs: https://github.com/libuv/libuv/pull/525
PR-URL: https://github.com/libuv/libuv/pull/535
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
This commit is contained in:
Saúl Ibarra Corretgé 2015-09-21 23:06:50 +02:00
parent 029a43997d
commit 85adf43e03
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/unix/thread.c
View File

@ -162,10 +162,13 @@ int uv_rwlock_tryrdlock(uv_rwlock_t* rwlock) {
int err; int err;
err = pthread_rwlock_tryrdlock(rwlock); err = pthread_rwlock_tryrdlock(rwlock);
if (err && err != EBUSY && err != EAGAIN) if (err) {
if (err != EBUSY && err != EAGAIN)
abort(); abort();
return -EBUSY;
}
return -err; return 0;
} }
@ -185,10 +188,13 @@ int uv_rwlock_trywrlock(uv_rwlock_t* rwlock) {
int err; int err;
err = pthread_rwlock_trywrlock(rwlock); err = pthread_rwlock_trywrlock(rwlock);
if (err && err != EBUSY && err != EAGAIN) if (err) {
if (err != EBUSY && err != EAGAIN)
abort(); abort();
return -EBUSY;
}
return -err; return 0;
} }