[svn-r19367] Purpose:

    Add windows threads support to HDF5.

Description:

    Added calls to the windows threads library to the H5TS layer, and wrapped
    most calls to either pthreads or windows threads library with portable
    H5TS-style defines. Modified tests to use portable function definitions
    as well.

    This can be configured via CMake with the HDF5_ENABLE_THREADSAFE
    option, and should work on windows vista and later operating systems.

Tested:

    h5committest, plus threadsafe with pthreads on jam and amani,
    and tested on a Windows Vista VM with threadsafe using windows threads.

1 files changed, 66 insertions, 5 deletions

diff --git a/src/H5TSprivate.h b/src/H5TSprivate.h
index 0d0b620..964dcf3 100644
--- a/src/H5TSprivate.h
+++ b/src/H5TSprivate.h
@@ -33,30 +33,91 @@
 #include "H5TSpublic.h"		/*Public API prototypes */
 #endif /* LATER */
 
+#ifdef H5_HAVE_WIN_THREADS
+
 /* Library level data structures */
 
+/* Mutexes, Threads, and Attributes */
+typedef struct H5TS_mutex_struct {
+	CRITICAL_SECTION CriticalSection;
+} H5TS_mutex_t;
+typedef CRITICAL_SECTION H5TS_mutex_simple_t;
+typedef HANDLE H5TS_thread_t;
+typedef HANDLE H5TS_attr_t;
+typedef DWORD H5TS_key_t;
+typedef INIT_ONCE H5TS_once_t;
+
+/* Defines */
+/* not used on windows side, but need to be defined to something */
+#define H5TS_SCOPE_SYSTEM 0
+#define H5TS_SCOPE_PROCESS 0
+
+/* Functions */
+#define H5TS_get_thread_local_value(key)	TlsGetValue( key )
+#define H5TS_set_thread_local_value(key, value)	TlsSetValue( key, value )
+#define H5TS_attr_init(attr_ptr) 0
+#define H5TS_attr_setscope(attr_ptr, scope) 0
+#define H5TS_attr_destroy(attr_ptr) 0
+#define H5TS_wait_for_thread(thread) WaitForSingleObject(thread, INFINITE)
+#define H5TS_mutex_init(mutex) InitializeCriticalSection(mutex)
+#define H5TS_mutex_lock_simple(mutex) EnterCriticalSection(mutex)
+#define H5TS_mutex_unlock_simple(mutex) LeaveCriticalSection(mutex)
+
+H5_DLL BOOL CALLBACK 
+H5TS_win32_first_thread_init(PINIT_ONCE InitOnce, PVOID Parameter, PVOID *lpContex);
+
+#else /* H5_HAVE_WIN_THREADS */
+
+/* Library level data structures */
+
+/* Mutexes, Threads, and Attributes */
 typedef struct H5TS_mutex_struct {
     pthread_t owner_thread;		/* current lock owner */
     pthread_mutex_t atomic_lock;	/* lock for atomicity of new mechanism */
     pthread_cond_t cond_var;		/* condition variable */
     unsigned int lock_count;
 } H5TS_mutex_t;
+typedef pthread_t      H5TS_thread_t;
+typedef pthread_attr_t H5TS_attr_t;
+typedef pthread_mutex_t H5TS_mutex_simple_t;
+typedef pthread_key_t  H5TS_key_t;
+typedef pthread_once_t H5TS_once_t;
+
+/* Scope Definitions */
+#define H5TS_SCOPE_SYSTEM PTHREAD_SCOPE_SYSTEM
+#define H5TS_SCOPE_PROCESS PTHREAD_SCOPE_PROCESS
+
+/* Functions */
+#define H5TS_get_thread_local_value(key)	pthread_getspecific( key )
+#define H5TS_set_thread_local_value(key, value)	pthread_setspecific( key, value )
+#define H5TS_attr_init(attr_ptr) pthread_attr_init((attr_ptr))
+#define H5TS_attr_setscope(attr_ptr, scope) pthread_attr_setscope(attr_ptr, scope)
+#define H5TS_attr_destroy(attr_ptr) pthread_attr_destroy(attr_ptr)
+#define H5TS_wait_for_thread(thread) pthread_join(thread, NULL)
+#define H5TS_mutex_init(mutex) pthread_mutex_init(mutex, NULL)
+#define H5TS_mutex_lock_simple(mutex) pthread_mutex_lock(mutex)
+#define H5TS_mutex_unlock_simple(mutex) pthread_mutex_unlock(mutex)
 
-/* Extern global variables */
-extern pthread_once_t H5TS_first_init_g;
-extern pthread_key_t H5TS_errstk_key_g;
-extern pthread_key_t H5TS_funcstk_key_g;
+#endif /* H5_HAVE_WIN_THREADS */
+
+/* External global variables */
+extern H5TS_once_t H5TS_first_init_g;
+extern H5TS_key_t H5TS_errstk_key_g;
+extern H5TS_key_t H5TS_funcstk_key_g;
 
 #if defined c_plusplus || defined __cplusplus
 extern      "C"
 {
 #endif	/* c_plusplus || __cplusplus */
 
-H5_DLL void H5TS_first_thread_init(void);
+H5_DLL void   H5TS_first_thread_init(void);
 H5_DLL herr_t H5TS_mutex_lock(H5TS_mutex_t *mutex);
 H5_DLL herr_t H5TS_mutex_unlock(H5TS_mutex_t *mutex);
 H5_DLL herr_t H5TS_cancel_count_inc(void);
 H5_DLL herr_t H5TS_cancel_count_dec(void);
+H5_DLL H5TS_thread_t H5TS_create_thread(void * func, H5TS_attr_t * attr, void *udata);
+
+
 
 #if defined c_plusplus || defined __cplusplus
 }