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 4e81b2bad8c6c2eac5adc62cd92b6eab594a58ac..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
@@ -11,155 +12,143 @@
 /* thr_nt.c - wrapper around NT threads */
 
 #include "portable.h"
-#include "ldap_pvt_thread.h"
 
 #if defined( HAVE_NT_THREADS )
 
-int 
-openldap_thread_create( openldap_thread_t * thread, 
-                      openldap_thread_attr_t *attr,
-                      void *(*start_routine)( void *), void *arg)
-{
-       *thread = (openldap_thread_t)_beginthread( (void *) start_routine, 
-                                               0, arg );
-        return ( (unsigned long)*thread == -1 ? -1 : 0 );
-}
-       
-void 
-openldap_thread_exit( void *retval )
-{
-       _endthread( );
-}
+#include "ldap_pvt_thread.h"
 
-int 
-openldap_thread_join( openldap_thread_t thread, void **thread_return )
+/* mingw compiler very sensitive about getting prototypes right */
+typedef unsigned __stdcall thrfunc_t(void *);
+
+int
+ldap_int_thread_initialize( void )
 {
-       DWORD status;
-       status = WaitForSingleObject( thread, INFINITE );
-       if (status == WAIT_FAILED) {
-               return -1;
-       }
        return 0;
 }
 
-int 
-openldap_thread_kill( openldap_thread_t thread, int signo )
+int
+ldap_int_thread_destroy( void )
 {
        return 0;
 }
 
 int 
-openldap_thread_yield( void )
+ldap_pvt_thread_create( ldap_pvt_thread_t * thread, 
+       int detach,
+       void *(*start_routine)( void *),
+       void *arg)
 {
-       return 0;
-}
+       unsigned tid;
+       HANDLE thd;
 
-int 
-openldap_thread_attr_init( openldap_thread_attr_t *attr )
+       thd = (HANDLE) _beginthreadex(NULL, 0, (thrfunc_t *) start_routine,
+                                     arg, 0, &tid);
+
+       *thread = (ldap_pvt_thread_t) thd;
+
+       return thd == NULL ? -1 : 0;
+}
+       
+void 
+ldap_pvt_thread_exit( void *retval )
 {
-       *attr = 0;
-       return( 0 );
+       _endthread( );
 }
 
 int 
-openldap_thread_attr_destroy( openldap_thread_attr_t *attr )
+ldap_pvt_thread_join( ldap_pvt_thread_t thread, void **thread_return )
 {
-       return( 0 );
+       DWORD status;
+       status = WaitForSingleObject( (HANDLE) thread, INFINITE );
+       return status == WAIT_FAILED ? -1 : 0;
 }
 
 int 
-openldap_thread_attr_setdetachstate( openldap_thread_attr_t *attr, int dstate )
+ldap_pvt_thread_kill( ldap_pvt_thread_t thread, int signo )
 {
-       *attr = dstate;
-       return( 0 );
+       return 0;
 }
 
-int
-openldap_thread_attr_getdetachstate( openldap_thread_attr_t *attr, 
-                                    int *detachstate )
+int 
+ldap_pvt_thread_yield( void )
 {
-       *detachstate = *attr;
-       return( 0 );
+       Sleep( 0 );
+       return 0;
 }
 
 int 
-openldap_thread_cond_init( openldap_thread_cond_t *cond, 
-                         openldap_thread_condattr_t *attr )
+ldap_pvt_thread_cond_init( ldap_pvt_thread_cond_t *cond )
 {
        *cond = CreateEvent( NULL, FALSE, FALSE, NULL );
        return( 0 );
 }
 
 int
-openldap_thread_cond_destroy( openldap_thread_cond_t *cv )
+ldap_pvt_thread_cond_destroy( ldap_pvt_thread_cond_t *cv )
 {
        CloseHandle( *cv );
        return( 0 );
 }
 
 int 
-openldap_thread_cond_signal( openldap_thread_cond_t *cond )
+ldap_pvt_thread_cond_signal( ldap_pvt_thread_cond_t *cond )
 {
        SetEvent( *cond );
        return( 0 );
 }
 
 int 
-openldap_thread_cond_wait( openldap_thread_cond_t *cond, 
-                         openldap_thread_mutex_t *mutex )
+ldap_pvt_thread_cond_wait( ldap_pvt_thread_cond_t *cond, 
+       ldap_pvt_thread_mutex_t *mutex )
 {
-       ReleaseMutex( *mutex );
-       WaitForSingleObject( *cond, INFINITE );
+       SignalObjectAndWait( *mutex, *cond, INFINITE, FALSE );
        WaitForSingleObject( *mutex, INFINITE );
        return( 0 );
 }
 
 int
-openldap_thread_cond_broadcast( openldap_thread_cond_t *cv )
+ldap_pvt_thread_cond_broadcast( ldap_pvt_thread_cond_t *cond )
 {
-       SetEvent( *cv );
+       SetEvent( *cond );
        return( 0 );
 }
 
 int 
-openldap_thread_mutex_init( openldap_thread_mutex_t *mutex,
-                          openldap_thread_mutexattr_t *attr )
+ldap_pvt_thread_mutex_init( ldap_pvt_thread_mutex_t *mutex )
 {
        *mutex = CreateMutex( NULL, 0, NULL );
        return ( 0 );
 }
 
 int 
-openldap_thread_mutex_destroy( openldap_thread_mutex_t *mutex )
+ldap_pvt_thread_mutex_destroy( ldap_pvt_thread_mutex_t *mutex )
 {
        CloseHandle( *mutex );
        return ( 0 );   
 }
 
 int 
-openldap_thread_mutex_lock( openldap_thread_mutex_t *mutex )
+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 
-openldap_thread_mutex_unlock( openldap_thread_mutex_t *mutex )
+ldap_pvt_thread_mutex_unlock( ldap_pvt_thread_mutex_t *mutex )
 {
        ReleaseMutex( *mutex );
        return ( 0 );
 }
 
 int
-openldap_thread_mutex_trylock( openldap_thread_mutex_t *mp )
+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