diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-30 13:22:44 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-30 13:22:44 (GMT) |
commit | 9e9f96879d760850794a191988a205fbf1a3957d (patch) | |
tree | bc7afacf87ac7f5d4d4e71923ea44a6cefef14b8 /src/H5TS.c | |
parent | 5b7788f3ececa7efa6b91c4d0806e672ed724d14 (diff) | |
download | hdf5-9e9f96879d760850794a191988a205fbf1a3957d.zip hdf5-9e9f96879d760850794a191988a205fbf1a3957d.tar.gz hdf5-9e9f96879d760850794a191988a205fbf1a3957d.tar.bz2 |
[svn-r15295] Description:
Merge revisions 15130:15210 from trunk into metadata journaling branch
Tested on:
FreeBSD/32 6.2 (duty) in debug mode
FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'src/H5TS.c')
-rw-r--r-- | src/H5TS.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -146,7 +146,7 @@ H5TS_mutex_lock(H5TS_mutex_t *mutex) if (ret_value) return ret_value; - if(mutex->lock_count && pthread_equal(pthread_self(), mutex->owner_thread)) { + if(mutex->lock_count && pthread_equal(HDpthread_self(), mutex->owner_thread)) { /* already owned by self - increment count */ mutex->lock_count++; } else { @@ -155,7 +155,7 @@ H5TS_mutex_lock(H5TS_mutex_t *mutex) pthread_cond_wait(&mutex->cond_var, &mutex->atomic_lock); /* After we've received the signal, take ownership of the mutex */ - mutex->owner_thread = pthread_self(); + mutex->owner_thread = HDpthread_self(); mutex->lock_count = 1; } |