ITS#4112

[openldap] / libraries / libldap_r / thr_nt.c

diff --git a/libraries/libldap_r/thr_nt.c b/libraries/libldap_r/thr_nt.c
index a5b22cf966fcedd801c5e2fdf9ea2bdeb560c6ae..29416fa85e0071b2f6915987bd27d0608d1dcc97 100644 (file)
--- a/libraries/libldap_r/thr_nt.c
+++ b/libraries/libldap_r/thr_nt.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -18,7 +18,26 @@
 
 #if defined( HAVE_NT_THREADS )
 
-#include "ldap_pvt_thread.h"
+#define _WIN32_WINNT 0x0400
+#include <windows.h>
+#include <process.h>
+
+#include "ldap_pvt_thread.h" /* Get the thread interface */
+#define LDAP_THREAD_IMPLEMENTATION
+#include "ldap_thr_debug.h"     /* May rename the symbols defined below */
+
+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 *);
@@ -43,13 +62,19 @@ ldap_pvt_thread_create( ldap_pvt_thread_t * thread,
 {
        unsigned tid;
        HANDLE thd;
+       int rc = -1;
 
        thd = (HANDLE) _beginthreadex(NULL, LDAP_PVT_THREAD_STACK_SIZE, (thrfunc_t *) start_routine,
                                      arg, 0, &tid);
 
-       *thread = (ldap_pvt_thread_t) thd;
-
-       return thd == NULL ? -1 : 0;
+       if ( thd ) {
+               *thread = (ldap_pvt_thread_t) tid;
+               tids[ntids].tid = tid;
+               tids[ntids].thd = thd;
+               ntids++;
+               rc = 0;
+       }
+       return rc;
 }
        
 void 
@@ -62,7 +87,19 @@ int
 ldap_pvt_thread_join( ldap_pvt_thread_t thread, void **thread_return )
 {
        DWORD status;
-       status = WaitForSingleObject( (HANDLE) thread, INFINITE );
+       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;
 }
 
@@ -158,7 +195,40 @@ ldap_pvt_thread_mutex_trylock( ldap_pvt_thread_mutex_t *mp )
 ldap_pvt_thread_t
 ldap_pvt_thread_self( void )
 {
-       return GetCurrentThread();
+       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;
+       }
+}
+
+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