d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More reliably check timeout for pthread_mutex_timedlock.

Browse Source
This commit is contained in:
davidxu 2003-12-09 00:52:28 +00:00
parent e59192102a
commit 1d5e4bd687
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libkse/thread/thr_mutex.c
View File

@ -752,7 +752,7 @@ mutex_lock_common(struct pthread *curthread, pthread_mutex_t *m,
} while (((*m)->m_owner != curthread) && (ret == 0) && } while (((*m)->m_owner != curthread) && (ret == 0) &&
(curthread->interrupted == 0) && (curthread->timeout == 0)); (curthread->interrupted == 0) && (curthread->timeout == 0));
if (ret == 0 && curthread->timeout) if (ret == 0 && (*m)->m_owner != curthread && curthread->timeout)
ret = ETIMEDOUT; ret = ETIMEDOUT;
/* /*

2
lib/libpthread/thread/thr_mutex.c
View File

@ -752,7 +752,7 @@ mutex_lock_common(struct pthread *curthread, pthread_mutex_t *m,
} while (((*m)->m_owner != curthread) && (ret == 0) && } while (((*m)->m_owner != curthread) && (ret == 0) &&
(curthread->interrupted == 0) && (curthread->timeout == 0)); (curthread->interrupted == 0) && (curthread->timeout == 0));
if (ret == 0 && curthread->timeout) if (ret == 0 && (*m)->m_owner != curthread && curthread->timeout)
ret = ETIMEDOUT; ret = ETIMEDOUT;
/* /*