X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap_r%2Fthr_nt.c;h=5c2ae4178c1b23898c9c857bffd7a32e663cdafa;hb=e7448a42cfa6b191717f7917533b59d6220fef83;hp=0f774e5629e0cccdcfcb6a453ea4829ea8cf19bd;hpb=325a12e25d02b073ab8028fa8b4df6014d0edb7c;p=openldap
diff --git a/libraries/libldap_r/thr_nt.c b/libraries/libldap_r/thr_nt.c
index 0f774e5629..5c2ae4178c 100644
--- a/libraries/libldap_r/thr_nt.c
+++ b/libraries/libldap_r/thr_nt.c
@@ -1,21 +1,46 @@
+/* thr_nt.c - wrapper around NT threads */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2012 The OpenLDAP Foundation.
* All rights reserved.
*
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License. A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
+ * 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
+ * .
*/
-/* thr_nt.c - wrapper around NT threads */
-
#include "portable.h"
#if defined( HAVE_NT_THREADS )
-#include "ldap_pvt_thread.h"
+#define _WIN32_WINNT 0x0400
+#include
+#include
+
+#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 *);
int
ldap_int_thread_initialize( void )
@@ -35,16 +60,21 @@ ldap_pvt_thread_create( ldap_pvt_thread_t * thread,
void *(*start_routine)( void *),
void *arg)
{
- unsigned long tid
+ unsigned tid;
HANDLE thd;
+ int rc = -1;
- thd = _beginthreadex( NULL, 0,
- (LPTHREAD_START_ROUTINE) start_routine, arg,
- 0, &tid );
+ 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
@@ -57,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 ) return -1;
+
+ status = WaitForSingleObject( tids[i].thd, INFINITE );
+ for (; i