Skip to content
Permalink
Browse files

polarssl_threadlock: remove conditionally unused code

Make functions no-ops if neither both USE_THREADS_POSIX and
HAVE_PTHREAD_H nor both USE_THREADS_WIN32 and HAVE_PROCESS_H are
defined. Previously, if only one of them was defined, there was either
code compiled that did nothing useful or the wrong header included for
the functions used.

Also, move POLARSSL_MUTEX_T define to implementation file as it's not
used externally.

Closes #3739
  • Loading branch information...
MarcelRaad committed Apr 5, 2019
1 parent d250ed4 commit bb0b10135caf58f82ee9e9d38f400880a7e5c9cc
Showing with 23 additions and 29 deletions.
  1. +21 −22 lib/vtls/polarssl_threadlock.c
  2. +2 −7 lib/vtls/polarssl_threadlock.h
@@ -23,16 +23,15 @@
#include "curl_setup.h"

#if (defined(USE_POLARSSL) || defined(USE_MBEDTLS)) && \
(defined(USE_THREADS_POSIX) || defined(USE_THREADS_WIN32))

#if defined(USE_THREADS_POSIX)
# ifdef HAVE_PTHREAD_H
# include <pthread.h>
# endif
#elif defined(USE_THREADS_WIN32)
# ifdef HAVE_PROCESS_H
# include <process.h>
# endif
((defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)) || \
(defined(USE_THREADS_WIN32) && defined(HAVE_PROCESS_H)))

#if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)
# include <pthread.h>
# define POLARSSL_MUTEX_T pthread_mutex_t
#elif defined(USE_THREADS_WIN32) && defined(HAVE_PROCESS_H)
# include <process.h>
# define POLARSSL_MUTEX_T HANDLE
#endif

#include "polarssl_threadlock.h"
@@ -56,19 +55,19 @@ int Curl_polarsslthreadlock_thread_setup(void)
if(!mutex_buf)
return 0; /* error, no number of threads defined */

#ifdef HAVE_PTHREAD_H
#if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)
for(i = 0; i < NUMT; i++) {
ret = pthread_mutex_init(&mutex_buf[i], NULL);
if(ret)
return 0; /* pthread_mutex_init failed */
}
#elif defined(HAVE_PROCESS_H)
#elif defined(USE_THREADS_WIN32) && 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 /* USE_THREADS_POSIX && HAVE_PTHREAD_H */

return 1; /* OK */
}
@@ -81,19 +80,19 @@ int Curl_polarsslthreadlock_thread_cleanup(void)
if(!mutex_buf)
return 0; /* error, no threads locks defined */

#ifdef HAVE_PTHREAD_H
#if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)
for(i = 0; i < NUMT; i++) {
ret = pthread_mutex_destroy(&mutex_buf[i]);
if(ret)
return 0; /* pthread_mutex_destroy failed */
}
#elif defined(HAVE_PROCESS_H)
#elif defined(USE_THREADS_WIN32) && 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 /* USE_THREADS_POSIX && HAVE_PTHREAD_H */
free(mutex_buf);
mutex_buf = NULL;

@@ -103,7 +102,7 @@ int Curl_polarsslthreadlock_thread_cleanup(void)
int Curl_polarsslthreadlock_lock_function(int n)
{
int ret;
#ifdef HAVE_PTHREAD_H
#if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)
if(n < NUMT) {
ret = pthread_mutex_lock(&mutex_buf[n]);
if(ret) {
@@ -112,7 +111,7 @@ int Curl_polarsslthreadlock_lock_function(int n)
return 0; /* pthread_mutex_lock failed */
}
}
#elif defined(HAVE_PROCESS_H)
#elif defined(USE_THREADS_WIN32) && defined(HAVE_PROCESS_H)
if(n < NUMT) {
ret = (WaitForSingleObject(mutex_buf[n], INFINITE) == WAIT_FAILED?1:0);
if(ret) {
@@ -121,14 +120,14 @@ int Curl_polarsslthreadlock_lock_function(int n)
return 0; /* pthread_mutex_lock failed */
}
}
#endif /* HAVE_PTHREAD_H */
#endif /* USE_THREADS_POSIX && HAVE_PTHREAD_H */
return 1; /* OK */
}

int Curl_polarsslthreadlock_unlock_function(int n)
{
int ret;
#ifdef HAVE_PTHREAD_H
#if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)
if(n < NUMT) {
ret = pthread_mutex_unlock(&mutex_buf[n]);
if(ret) {
@@ -137,7 +136,7 @@ int Curl_polarsslthreadlock_unlock_function(int n)
return 0; /* pthread_mutex_unlock failed */
}
}
#elif defined(HAVE_PROCESS_H)
#elif defined(USE_THREADS_WIN32) && defined(HAVE_PROCESS_H)
if(n < NUMT) {
ret = ReleaseMutex(mutex_buf[n]);
if(!ret) {
@@ -146,7 +145,7 @@ int Curl_polarsslthreadlock_unlock_function(int n)
return 0; /* pthread_mutex_lock failed */
}
}
#endif /* HAVE_PTHREAD_H */
#endif /* USE_THREADS_POSIX && HAVE_PTHREAD_H */
return 1; /* OK */
}

@@ -26,13 +26,8 @@

#if (defined USE_POLARSSL) || (defined USE_MBEDTLS)

#if defined(USE_THREADS_POSIX)
# define POLARSSL_MUTEX_T pthread_mutex_t
#elif defined(USE_THREADS_WIN32)
# define POLARSSL_MUTEX_T HANDLE
#endif

#if defined(USE_THREADS_POSIX) || defined(USE_THREADS_WIN32)
#if (defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)) || \
(defined(USE_THREADS_WIN32) && defined(HAVE_PROCESS_H))

int Curl_polarsslthreadlock_thread_setup(void);
int Curl_polarsslthreadlock_thread_cleanup(void);

0 comments on commit bb0b101

Please sign in to comment.
You can’t perform that action at this time.