Add valx arg to config_parse_add - indicate which value in the current

[openldap] / libraries / libldap_r / thr_nt.c

diff --git a/libraries/libldap_r/thr_nt.c b/libraries/libldap_r/thr_nt.c
index a68d2608e43d8ab2efe551c5c29a0058fb0adfd4..8bae80e9a73d438ed65907f3dcb3e5b8b87b0b35 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-2006 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 *);
@@ -50,7 +69,9 @@ ldap_pvt_thread_create( ldap_pvt_thread_t * thread,
 
        if ( thd ) {
                *thread = (ldap_pvt_thread_t) tid;
-               CloseHandle( thd );
+               tids[ntids].tid = tid;
+               tids[ntids].thd = thd;
+               ntids++;
                rc = 0;
        }
        return rc;
@@ -66,12 +87,19 @@ int
 ldap_pvt_thread_join( ldap_pvt_thread_t thread, void **thread_return )
 {
        DWORD status;
-       HANDLE thd;
-       HANDLE __stdcall OpenThread( int, int, int );
+       int i;
 
-       thd = OpenThread( SYNCHRONIZE, 0, thread );
-       status = WaitForSingleObject( thd, INFINITE );
-       CloseHandle( thd );
+       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;
 }