Update copyright statements

[openldap] / libraries / libldap_r / thr_nt.c

diff --git a/libraries/libldap_r/thr_nt.c b/libraries/libldap_r/thr_nt.c
index 8d79a5e2a8c9d673f60a29707cf75c4173e0f1f4..6ebb0ccce8b42a2fbbdd3ad41dd900aea854c50b 100644 (file)
--- a/libraries/libldap_r/thr_nt.c
+++ b/libraries/libldap_r/thr_nt.c
@@ -1,5 +1,6 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2002 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted only
@@ -16,14 +17,17 @@
 
 #include "ldap_pvt_thread.h"
 
+/* mingw compiler very sensitive about getting prototypes right */
+typedef unsigned __stdcall thrfunc_t(void *);
+
 int
-ldap_pvt_thread_initialize( void )
+ldap_int_thread_initialize( void )
 {
        return 0;
 }
 
 int
-ldap_pvt_thread_destroy( void )
+ldap_int_thread_destroy( void )
 {
        return 0;
 }
@@ -34,9 +38,15 @@ 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;
+
+       thd = (HANDLE) _beginthreadex(NULL, 0, (thrfunc_t *) start_routine,
+                                     arg, 0, &tid);
+
+       *thread = (ldap_pvt_thread_t) thd;
+
+       return thd == NULL ? -1 : 0;
 }
        
 void 
@@ -50,10 +60,7 @@ ldap_pvt_thread_join( ldap_pvt_thread_t thread, void **thread_return )
 {
        DWORD status;
        status = WaitForSingleObject( (HANDLE) thread, INFINITE );
-       if (status == WAIT_FAILED) {
-               return -1;
-       }
-       return 0;
+       return status == WAIT_FAILED ? -1 : 0;
 }
 
 int 
@@ -65,6 +72,7 @@ ldap_pvt_thread_kill( ldap_pvt_thread_t thread, int signo )
 int 
 ldap_pvt_thread_yield( void )
 {
+       Sleep( 0 );
        return 0;
 }
 
@@ -91,18 +99,17 @@ 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 );
+       SetEvent( *cond );
        return( 0 );
 }
 
@@ -123,8 +130,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 
@@ -138,12 +146,9 @@ 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;
 }
 
 #endif