Commit da8501e 1 parent 9207a00 commit da8501e Copy full SHA for da8501e
File tree 2 files changed +7
-7
lines changed
2 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -124,14 +124,14 @@ void uv_mutex_lock(uv_mutex_t* mutex) {
124
124
int uv_mutex_trylock (uv_mutex_t * mutex ) {
125
125
int err ;
126
126
127
- /* FIXME(bnoordhuis) EAGAIN means recursive lock limit reached. Arguably
128
- * a bug, should probably abort rather than return -EAGAIN.
129
- */
130
127
err = pthread_mutex_trylock (mutex );
131
- if (err && err != EBUSY && err != EAGAIN )
132
- abort ();
128
+ if (err ) {
129
+ if (err != EBUSY && err != EAGAIN )
130
+ abort ();
131
+ return - EBUSY ;
132
+ }
133
133
134
- return - err ;
134
+ return 0 ;
135
135
}
136
136
137
137
Original file line number Diff line number Diff line change @@ -211,7 +211,7 @@ int uv_mutex_trylock(uv_mutex_t* mutex) {
211
211
if (TryEnterCriticalSection (mutex ))
212
212
return 0 ;
213
213
else
214
- return UV_EAGAIN ;
214
+ return UV_EBUSY ;
215
215
}
216
216
217
217
You can’t perform that action at this time.
0 commit comments