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

unix, win: consolidate mutex trylock errors

Browse Source 
Fold EAGAIN into EBUSY, and make it the only acceptable error.

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:56:11 +02:00
parent 85adf43e03
commit bd1777fd53
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/unix/thread.c
View File

@ -124,14 +124,14 @@ void uv_mutex_lock(uv_mutex_t* mutex) {
int uv_mutex_trylock(uv_mutex_t* mutex) { int uv_mutex_trylock(uv_mutex_t* mutex) {
int err; int err;
/* FIXME(bnoordhuis) EAGAIN means recursive lock limit reached. Arguably
* a bug, should probably abort rather than return -EAGAIN.
*/
err = pthread_mutex_trylock(mutex); err = pthread_mutex_trylock(mutex);
if (err && err != EBUSY && err != EAGAIN) if (err) {
abort(); if (err != EBUSY && err != EAGAIN)
abort();
return -EBUSY;
}
return -err; return 0;
} }

2
src/win/thread.c
View File

@ -232,7 +232,7 @@ int uv_mutex_trylock(uv_mutex_t* mutex) {
if (TryEnterCriticalSection(mutex)) if (TryEnterCriticalSection(mutex))
return 0; return 0;
else else
return UV_EAGAIN; return UV_EBUSY;
} }