NT portability fix from HEAD

[openldap] / libraries / libldap_r / thr_nt.c

diff --git a/libraries/libldap_r/thr_nt.c b/libraries/libldap_r/thr_nt.c
index 60276ab492f28d59fd0cf80946ff847e4f98f91c..5919ee6d49098f902b8c27aec39fb605fb94dd38 100644 (file)
--- a/libraries/libldap_r/thr_nt.c
+++ b/libraries/libldap_r/thr_nt.c
@@ -1,22 +1,49 @@
-/*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+/* thr_nt.c - wrapper around NT threads */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 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
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
-/* thr_nt.c - wrapper around NT threads */
-
 #include "portable.h"
-#include "ldap_pvt_thread.h"
 
 #if defined( HAVE_NT_THREADS )
 
+#include "ldap_pvt_thread.h"
+
+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
-ldap_pvt_thread_initialize( void )
+ldap_int_thread_destroy( void )
 {
        return 0;
 }
@@ -27,9 +54,21 @@ ldap_pvt_thread_create( ldap_pvt_thread_t * thread,
        void *(*start_routine)( void *),
        void *arg)
 {
-       *thread = (ldap_pvt_thread_t)_beginthread( (void *) start_routine, 
-                                               0, arg );
-        return ( (unsigned long)*thread == -1 ? -1 : 0 );
+       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 
@@ -42,11 +81,20 @@ int
 ldap_pvt_thread_join( ldap_pvt_thread_t thread, void **thread_return )
 {
        DWORD status;
-       status = WaitForSingleObject( thread, INFINITE );
-       if (status == WAIT_FAILED) {
-               return -1;
+       int i;
+
+       for (i=0; i<ntids; i++) {
+               if ( tids[i].tid == thread )
+                       break;
        }
-       return 0;
+       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 
@@ -58,6 +106,7 @@ ldap_pvt_thread_kill( ldap_pvt_thread_t thread, int signo )
 int 
 ldap_pvt_thread_yield( void )
 {
+       Sleep( 0 );
        return 0;
 }
 
@@ -84,18 +133,18 @@ ldap_pvt_thread_cond_signal( ldap_pvt_thread_cond_t *cond )
 
 int 
 ldap_pvt_thread_cond_wait( ldap_pvt_thread_cond_t *cond, 
-                         ldap_pvt_thread_mutex_t *mutex )
+       ldap_pvt_thread_mutex_t *mutex )
 {
-       ReleaseMutex( *mutex );
-       WaitForSingleObject( *cond, INFINITE );
+       SignalObjectAndWait( *mutex, *cond, INFINITE, FALSE );
        WaitForSingleObject( *mutex, INFINITE );
        return( 0 );
 }
 
 int
-ldap_pvt_thread_cond_broadcast( ldap_pvt_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 );
 }
 
@@ -116,8 +165,9 @@ ldap_pvt_thread_mutex_destroy( ldap_pvt_thread_mutex_t *mutex )
 int 
 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 
@@ -131,12 +181,15 @@ int
 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 0;
-       else
-               return 1;
+       return status == WAIT_FAILED || status == WAIT_TIMEOUT
+               ? -1 : 0;
+}
+
+ldap_pvt_thread_t
+ldap_pvt_thread_self( void )
+{
+       return GetCurrentThreadId();
 }
 
 #endif