diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2013-04-16 16:34:40 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2013-04-16 16:34:40 +1000 |
| commit | 5c6abf9ad964f6c398614afd188741b7966abb76 (patch) | |
| tree | 1f460588cfc7ceb910f294e0339ea03ea1042ee9 /src/os_posix/os_thread.c | |
| parent | 79e1d652494d6a4df59cb149b50537bf692df6be (diff) | |
| download | mongo-5c6abf9ad964f6c398614afd188741b7966abb76.tar.gz | |
Changes based on Alex's review.
Diffstat (limited to 'src/os_posix/os_thread.c')
| -rw-r--r-- | src/os_posix/os_thread.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/os_posix/os_thread.c b/src/os_posix/os_thread.c index 8a597d56037..492ee6467f1 100644 --- a/src/os_posix/os_thread.c +++ b/src/os_posix/os_thread.c @@ -32,16 +32,8 @@ __wt_thread_join(WT_SESSION_IMPL *session, pthread_t tid) { WT_DECL_RET; -#if 0 && defined(HAVE_PTHREAD_TIMEDJOIN_NP) - struct timespec abstime; - - WT_RET(__wt_epoch(session, &abstime)); - abstime.tv_sec += 60; /* Wait a max of 60 seconds. */ - ret = pthread_timedjoin_np(tid, NULL, &abstime); -#else - ret = pthread_join(tid, NULL); -#endif - if (ret == 0) + if ((ret = pthread_join(tid, NULL)) == 0) return (0); + WT_RET_MSG(session, ret, "pthread_join"); } |