generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PolarSSL: WIN32 threading support for entropy

Browse Source 
Added WIN32 threading support for PolarSSL entropy if
--enable-threaded-resolver config flag is set and process.h can be found.
This commit is contained in:
Willem Sparreboom 2013-01-28 18:55:52 +01:00 committed by Daniel Stenberg
parent c35a10483d
commit f10006ee5f
2 changed files with 45 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/polarssl.c
View File

@ -68,10 +68,10 @@
#include "rawstr.h" #include "rawstr.h"
/* apply threading? */ /* apply threading? */
#if defined(USE_THREADS_POSIX) #if defined(USE_THREADS_POSIX) || defined(USE_THREADS_WIN32)
#define THREADING_SUPPORT #define THREADING_SUPPORT
#include "polarsslthreadlock.h" #include "polarsslthreadlock.h"
#endif /* USE_THREADS_POSIX */ #endif /* USE_THREADS_POSIX || USE_THREADS_WIN32 */
#define _MPRINTF_REPLACE /* use our functions only */ #define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h> #include <curl/mprintf.h>

45
lib/polarsslthreadlock.c
View File

@ -24,13 +24,18 @@
#include <stdio.h> #include <stdio.h>
#include "curl_setup.h" #include "curl_setup.h"
#ifdef USE_POLARSSL #if defined(USE_POLARSSL) && (defined(USE_THREADS_POSIX) || defined(USE_THREADS_WIN32))
#if defined(USE_THREADS_POSIX) #if defined(USE_THREADS_POSIX)
#ifdef HAVE_PTHREAD_H #ifdef HAVE_PTHREAD_H
#include <pthread.h> #include <pthread.h>
#define MUTEX_TYPE pthread_mutex_t #define MUTEX_TYPE pthread_mutex_t
#endif /* HAVE_PTHREAD_H */ #endif /* HAVE_PTHREAD_H */
#elif defined(USE_THREADS_WIN32)
#ifdef HAVE_PROCESS_H
#include <process.h>
#define MUTEX_TYPE HANDLE
#endif /* HAVE_PROCESS_H */
#endif /* USE_THREADS_POSIX */ #endif /* USE_THREADS_POSIX */
#include "polarsslthreadlock.h" #include "polarsslthreadlock.h"
@ -57,6 +62,13 @@ int polarsslthreadlock_thread_setup(void)
if(ret) if(ret)
return 0; /* pthread_mutex_init failed */ return 0; /* pthread_mutex_init failed */
} }
#elif defined(HAVE_PROCESS_H)
for (i = 0; i < NUMT; i++)
{
mutex_buf[i] = CreateMutex(0, FALSE, 0);
if(mutex_buf[i] == 0)
return 0; /* CreateMutex failed */
}
#endif /* HAVE_PTHREAD_H */ #endif /* HAVE_PTHREAD_H */
return 1; /* OK */ return 1; /* OK */
@ -75,8 +87,13 @@ int polarsslthreadlock_thread_cleanup(void)
{ {
ret = pthread_mutex_destroy(&mutex_buf[i]); ret = pthread_mutex_destroy(&mutex_buf[i]);
if(ret) if(ret)
return 0; /* pthread_mutex_destroy failed */ return 0; /* pthread_mutex_destroy failed */
} }
#elif defined(HAVE_PROCESS_H)
for (i = 0; i < NUMT; i++)
ret = CloseHandle(mutex_buf[i]);
if(!ret)
return 0; /* CloseHandle failed */
#endif /* HAVE_PTHREAD_H */ #endif /* HAVE_PTHREAD_H */
free(mutex_buf); free(mutex_buf);
mutex_buf = NULL; mutex_buf = NULL;
@ -93,7 +110,17 @@ int polarsslthreadlock_lock_function(int n)
ret = pthread_mutex_lock(&mutex_buf[n]); ret = pthread_mutex_lock(&mutex_buf[n]);
if(ret) if(ret)
{ {
DEBUGF(fprintf(stderr, "Error: pthread_mutex_lock failed\n")); DEBUGF(fprintf(stderr, "Error: polarsslthreadlock_lock_function failed\n"));
return 0; /* pthread_mutex_lock failed */
}
}
#elif defined(HAVE_PROCESS_H)
if(n < NUMT)
{
ret = (WaitForSingleObject(mutex_buf[n], INFINITE)==WAIT_FAILED?1:0);
if(ret)
{
DEBUGF(fprintf(stderr, "Error: polarsslthreadlock_lock_function failed\n"));
return 0; /* pthread_mutex_lock failed */ return 0; /* pthread_mutex_lock failed */
} }
} }
@ -110,10 +137,20 @@ int polarsslthreadlock_unlock_function(int n)
ret = pthread_mutex_unlock(&mutex_buf[n]); ret = pthread_mutex_unlock(&mutex_buf[n]);
if(ret) if(ret)
{ {
DEBUGF(fprintf(stderr, "Error: pthread_mutex_unlock failed\n")); DEBUGF(fprintf(stderr, "Error: polarsslthreadlock_unlock_function failed\n"));
return 0; /* pthread_mutex_unlock failed */ return 0; /* pthread_mutex_unlock failed */
} }
} }
#elif defined(HAVE_PROCESS_H)
if(n < NUMT)
{
ret = ReleaseMutex(mutex_buf[n]);
if(!ret)
{
DEBUGF(fprintf(stderr, "Error: polarsslthreadlock_unlock_function failed\n"));
return 0; /* pthread_mutex_lock failed */
}
}
#endif /* HAVE_PTHREAD_H */ #endif /* HAVE_PTHREAD_H */
return 1; /* OK */ return 1; /* OK */
} }