diff options
| author | Scott Wegner <swegner@hdfgroup.org> | 2008-06-06 19:10:20 (GMT) |
|---|---|---|
| committer | Scott Wegner <swegner@hdfgroup.org> | 2008-06-06 19:10:20 (GMT) |
| commit | 720a985115244e2e075aa632847fdf2e46bc48bd (patch) | |
| tree | 8b380a566e459f962331f1e2d7a89b9315f73e2a /src/H5Eint.c | |
| parent | 0b5f34bfa659d0cde87a1f120843f8003ee2a81b (diff) | |
| download | hdf5-720a985115244e2e075aa632847fdf2e46bc48bd.zip hdf5-720a985115244e2e075aa632847fdf2e46bc48bd.tar.gz hdf5-720a985115244e2e075aa632847fdf2e46bc48bd.tar.bz2 | |
[svn-r15163] Purpose: Create new HDpthread_self and HDpthread_self_ulong macros
Description:
On Windows, the pthread_self function cannot be used to print the returned thread ID for debugging. Instead, we need a separate function, GetCurrentThreadId. To eliminate some Windows ifdef's in the code, we create two new function macros which can be used by all platforms. It is conditionally defined in H5win32defs.h, and globally in H5private.h.
Tested:
VS2005 w/ pthreads on WinXP
kagiso w/ pthreads
Diffstat (limited to 'src/H5Eint.c')
| -rw-r--r-- | src/H5Eint.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/H5Eint.c b/src/H5Eint.c index 34290a4..e0fa482 100644 --- a/src/H5Eint.c +++ b/src/H5Eint.c @@ -275,13 +275,7 @@ H5E_walk1_cb(int n, H5E_error1_t *err_desc, void *client_data) fprintf(stream, "thread 0"); } /* end block */ #elif defined(H5_HAVE_THREADSAFE) -#ifdef _WIN32 - /* use GetCurrentThreadId because pthread_self return cannot be cast */ - /* as an unsigned long on Windows */ - fprintf(stream, "thread %lu", (unsigned long)GetCurrentThreadId()); -#else - fprintf(stream, "thread %lu", (unsigned long)pthread_self()); -#endif + fprintf(stream, "thread %lu", HDpthread_self_ulong()); #else fprintf(stream, "thread 0"); #endif @@ -397,13 +391,7 @@ H5E_walk2_cb(unsigned n, const H5E_error2_t *err_desc, void *client_data) fprintf(stream, "thread 0"); } /* end block */ #elif defined(H5_HAVE_THREADSAFE) -#ifdef _WIN32 - /* use GetCurrentThreadId because pthread_self return cannot be cast */ - /* as an unsigned long on Windows */ - fprintf(stream, "thread %lu", (unsigned long)GetCurrentThreadId()); -#else - fprintf(stream, "thread %lu", (unsigned long)pthread_self()); -#endif + fprintf(stream, "thread %lu", HDpthread_self_ulong()); #else fprintf(stream, "thread 0"); #endif |