X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap_r%2Fthr_nt.c;h=5c2ae4178c1b23898c9c857bffd7a32e663cdafa;hb=e7448a42cfa6b191717f7917533b59d6220fef83;hp=8592ce6633265a5b88e57891aa250085f208bede;hpb=0c1cb93c69ead8e2eadef1b70daa54125455ec78;p=openldap

diff --git a/libraries/libldap_r/thr_nt.c b/libraries/libldap_r/thr_nt.c
index 8592ce6633..5c2ae4178c 100644
--- a/libraries/libldap_r/thr_nt.c
+++ b/libraries/libldap_r/thr_nt.c
@@ -1,155 +1,234 @@
-/* thrnt.c - wrapper around NT threads */
+/* thr_nt.c - wrapper around NT threads */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2012 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
 
 #include "portable.h"
-#include "ldap_pvt_thread.h"
 
 #if defined( HAVE_NT_THREADS )
 
-int 
-openldap_thread_create( openldap_thread_t * thread, 
-		       openldap_thread_attr_t *attr,
-		       void *(*start_routine)( void *), void *arg)
-{
-	*thread = (openldap_thread_t)_beginthread( (void *) start_routine, 
-						0, arg );
-	 return ( (unsigned long)*thread == -1 ? -1 : 0 );
-}
-	
-void 
-openldap_thread_exit( void *retval )
-{
-	_endthread( );
-}
+#define _WIN32_WINNT 0x0400
+#include <windows.h>
+#include <process.h>
 
-int 
-openldap_thread_join( openldap_thread_t thread, void **thread_return )
-{
-	DWORD status;
-	status = WaitForSingleObject( thread, INFINITE );
-	if (status == WAIT_FAILED) {
-		return -1;
-	}
-	return 0;
-}
+#include "ldap_pvt_thread.h" /* Get the thread interface */
+#define LDAP_THREAD_IMPLEMENTATION
+#include "ldap_thr_debug.h"	 /* May rename the symbols defined below */
 
-int 
-openldap_thread_kill( openldap_thread_t thread, int signo )
+typedef struct ldap_int_thread_s {
+	long tid;
+	HANDLE thd;
+} ldap_int_thread_s;
+
+#ifndef NT_MAX_THREADS
+#define NT_MAX_THREADS	1024
+#endif
+
+static ldap_int_thread_s tids[NT_MAX_THREADS];
+static int ntids;
+
+
+/* mingw compiler very sensitive about getting prototypes right */
+typedef unsigned __stdcall thrfunc_t(void *);
+
+int
+ldap_int_thread_initialize( void )
 {
 	return 0;
 }
 
-int 
-openldap_thread_yield( void )
+int
+ldap_int_thread_destroy( void )
 {
 	return 0;
 }
 
 int 
-openldap_thread_attr_init( openldap_thread_attr_t *attr )
+ldap_pvt_thread_create( ldap_pvt_thread_t * thread, 
+	int detach,
+	void *(*start_routine)( void *),
+	void *arg)
+{
+	unsigned tid;
+	HANDLE thd;
+	int rc = -1;
+
+	thd = (HANDLE) _beginthreadex(NULL, LDAP_PVT_THREAD_STACK_SIZE, (thrfunc_t *) start_routine,
+				      arg, 0, &tid);
+
+	if ( thd ) {
+		*thread = (ldap_pvt_thread_t) tid;
+		tids[ntids].tid = tid;
+		tids[ntids].thd = thd;
+		ntids++;
+		rc = 0;
+	}
+	return rc;
+}
+	
+void 
+ldap_pvt_thread_exit( void *retval )
 {
-	*attr = 0;
-	return( 0 );
+	_endthread( );
 }
 
 int 
-openldap_thread_attr_destroy( openldap_thread_attr_t *attr )
+ldap_pvt_thread_join( ldap_pvt_thread_t thread, void **thread_return )
 {
-	return( 0 );
+	DWORD status;
+	int i;
+
+	for (i=0; i<ntids; i++) {
+		if ( tids[i].tid == thread )
+			break;
+	}
+	if ( i > ntids ) return -1;
+
+	status = WaitForSingleObject( tids[i].thd, INFINITE );
+	for (; i<ntids; i++) {
+		tids[i] = tids[i+1];
+	}
+	ntids--;
+	return status == WAIT_FAILED ? -1 : 0;
 }
 
 int 
-openldap_thread_attr_setdetachstate( openldap_thread_attr_t *attr, int dstate )
+ldap_pvt_thread_kill( ldap_pvt_thread_t thread, int signo )
 {
-	*attr = dstate;
-	return( 0 );
+	return 0;
 }
 
-int
-openldap_thread_attr_getdetachstate( openldap_thread_attr_t *attr, 
-				     int *detachstate )
+int 
+ldap_pvt_thread_yield( void )
 {
-	*detachstate = *attr;
-	return( 0 );
+	Sleep( 0 );
+	return 0;
 }
 
 int 
-openldap_thread_cond_init( openldap_thread_cond_t *cond, 
-			  openldap_thread_condattr_t *attr )
+ldap_pvt_thread_cond_init( ldap_pvt_thread_cond_t *cond )
 {
 	*cond = CreateEvent( NULL, FALSE, FALSE, NULL );
 	return( 0 );
 }
 
 int
-openldap_thread_cond_destroy( openldap_thread_cond_t *cv )
+ldap_pvt_thread_cond_destroy( ldap_pvt_thread_cond_t *cv )
 {
 	CloseHandle( *cv );
 	return( 0 );
 }
 
 int 
-openldap_thread_cond_signal( openldap_thread_cond_t *cond )
+ldap_pvt_thread_cond_signal( ldap_pvt_thread_cond_t *cond )
 {
 	SetEvent( *cond );
 	return( 0 );
 }
 
 int 
-openldap_thread_cond_wait( openldap_thread_cond_t *cond, 
-			  openldap_thread_mutex_t *mutex )
+ldap_pvt_thread_cond_wait( ldap_pvt_thread_cond_t *cond, 
+	ldap_pvt_thread_mutex_t *mutex )
 {
-	ReleaseMutex( *mutex );
-	WaitForSingleObject( *cond, INFINITE );
+	SignalObjectAndWait( *mutex, *cond, INFINITE, FALSE );
 	WaitForSingleObject( *mutex, INFINITE );
 	return( 0 );
 }
 
 int
-openldap_thread_cond_broadcast( openldap_thread_cond_t *cv )
+ldap_pvt_thread_cond_broadcast( ldap_pvt_thread_cond_t *cond )
 {
-	SetEvent( *cv );
+	while ( WaitForSingleObject( *cond, 0 ) == WAIT_TIMEOUT )
+		SetEvent( *cond );
 	return( 0 );
 }
 
 int 
-openldap_thread_mutex_init( openldap_thread_mutex_t *mutex,
-			   openldap_thread_mutexattr_t *attr )
+ldap_pvt_thread_mutex_init( ldap_pvt_thread_mutex_t *mutex )
 {
 	*mutex = CreateMutex( NULL, 0, NULL );
 	return ( 0 );
 }
 
 int 
-openldap_thread_mutex_destroy( openldap_thread_mutex_t *mutex )
+ldap_pvt_thread_mutex_destroy( ldap_pvt_thread_mutex_t *mutex )
 {
 	CloseHandle( *mutex );
 	return ( 0 );	
 }
 
 int 
-openldap_thread_mutex_lock( openldap_thread_mutex_t *mutex )
+ldap_pvt_thread_mutex_lock( ldap_pvt_thread_mutex_t *mutex )
 {
-	WaitForSingleObject( *mutex, INFINITE );
-	return ( 0 );
+	DWORD status;
+	status = WaitForSingleObject( *mutex, INFINITE );
+	return status == WAIT_FAILED ? -1 : 0;
 }
 
 int 
-openldap_thread_mutex_unlock( openldap_thread_mutex_t *mutex )
+ldap_pvt_thread_mutex_unlock( ldap_pvt_thread_mutex_t *mutex )
 {
 	ReleaseMutex( *mutex );
 	return ( 0 );
 }
 
 int
-openldap_thread_mutex_trylock( openldap_thread_mutex_t *mp )
+ldap_pvt_thread_mutex_trylock( ldap_pvt_thread_mutex_t *mp )
 {
 	DWORD status;
-
 	status = WaitForSingleObject( *mp, 0 );
-	if ( (status == WAIT_FAILED) || (status == WAIT_TIMEOUT) )
+	return status == WAIT_FAILED || status == WAIT_TIMEOUT
+		? -1 : 0;
+}
+
+ldap_pvt_thread_t
+ldap_pvt_thread_self( void )
+{
+	return GetCurrentThreadId();
+}
+
+int
+ldap_pvt_thread_key_create( ldap_pvt_thread_key_t *keyp )
+{
+	DWORD key = TlsAlloc();
+	if ( key != TLS_OUT_OF_INDEXES ) {
+		*keyp = key;
 		return 0;
-	else
-		return 1;
+	} else {
+		return -1;
+	}
+}
+
+int
+ldap_pvt_thread_key_destroy( ldap_pvt_thread_key_t key )
+{
+	/* TlsFree returns 0 on failure */
+	return( TlsFree( key ) == 0 );
+}
+
+int
+ldap_pvt_thread_key_setdata( ldap_pvt_thread_key_t key, void *data )
+{
+	return ( TlsSetValue( key, data ) == 0 );
+}
+
+int
+ldap_pvt_thread_key_getdata( ldap_pvt_thread_key_t key, void **data )
+{
+	void *ptr = TlsGetValue( key );
+	*data = ptr;
+	return( ptr ? GetLastError() : 0 );
 }
 
 #endif