lib/libhttp
1
0
Fork 0
mirror of https://github.com/lammertb/libhttp.git synced 2025-12-22 04:02:04 +03:00
Code Activity

Use unsigned long variable from thread local storage as SSL thread ID.

Browse Source 
See discussion in #200
This commit is contained in:
bel
2015-09-15 20:39:05 +02:00
parent ec0206610d
commit d3b5b24b43
1 changed files with 11 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/civetweb.c
View File

@@ -486,12 +486,10 @@ static int pthread_setspecific(pthread_key_t key, void *value)
return TlsSetValue(key, value) ? 0 : 1; return TlsSetValue(key, value) ? 0 : 1;
} }
#ifdef ENABLE_UNUSED_PTHREAD_FUNCTIONS
static void *pthread_getspecific(pthread_key_t key) static void *pthread_getspecific(pthread_key_t key)
{ {
return TlsGetValue(key); return TlsGetValue(key);
} }
#endif
#if defined(__MINGW32__) #if defined(__MINGW32__)
/* Enable unused function warning again */ /* Enable unused function warning again */
@@ -1149,9 +1147,11 @@ struct mg_connection {
static pthread_key_t sTlsKey; /* Thread local storage index */ static pthread_key_t sTlsKey; /* Thread local storage index */
static int sTlsInit = 0; static int sTlsInit = 0;
static int thread_idx_max = 0;
struct mg_workerTLS { struct mg_workerTLS {
int is_master; int is_master;
unsigned long thread_idx;
#if defined(_WIN32) && !defined(__SYMBIAN32__) #if defined(_WIN32) && !defined(__SYMBIAN32__)
HANDLE pthread_cond_helper_mutex; HANDLE pthread_cond_helper_mutex;
#endif #endif
@@ -2317,7 +2317,8 @@ static int pthread_cond_timedwait(pthread_cond_t *cv,
pthread_mutex_t *mutex, pthread_mutex_t *mutex,
const struct timespec *abstime) const struct timespec *abstime)
{ {
struct mg_workerTLS *tls = (struct mg_workerTLS *)TlsGetValue(sTlsKey); struct mg_workerTLS *tls =
(struct mg_workerTLS *)pthread_getspecific(sTlsKey);
int ok; int ok;
struct timespec tsnow; struct timespec tsnow;
int64_t nsnow, nswaitabs, nswaitrel; int64_t nsnow, nswaitabs, nswaitrel;
@@ -9631,32 +9632,16 @@ ssl_locking_callback(int mode, int mutex_num, const char *file, int line)
} }
#ifndef pthread_t_LARGER_THAN_unsigned_long
/* Must be set if sizeof(pthread_t) > sizeof(unsigned long) */ /* Must be set if sizeof(pthread_t) > sizeof(unsigned long) */
static unsigned long ssl_id_callback(void) static unsigned long ssl_id_callback(void)
{ {
#if defined _WIN32 struct mg_workerTLS *tls =
/* Win32 thread IDs are DWORDs */ (struct mg_workerTLS *)pthread_getspecific(sTlsKey);
return (unsigned long)GetCurrentThreadId(); if (tls == NULL) {
#else return 0;
/* CRYPTO_set_id_callback() assumes thread IDs can be represented by }
* unsigned long. See return tls->thread_idx;
* https://www.openssl.org/docs/manmaster/crypto/threads.html#HISTORY */
/* TODO(high): Deal with sizeof(pthread_t) > sizeof(unsigned long) in
* another way. Using the new openSSL API would cause an in incompatibility
* with systems running the old SSL library. Maybe the entire function is
* not required at all, since the default function will work?
mg_static_assert(sizeof(pthread_t) <= sizeof(unsigned long),
"Thread-ID data type size check"
" - set pthread_t_LARGER_THAN_unsigned_long");
*/
return (unsigned long)pthread_self();
#endif
} }
#endif
#if !defined(NO_SSL_DL) #if !defined(NO_SSL_DL)
@@ -9751,11 +9736,7 @@ static int initialize_ssl(struct mg_context *ctx)
} }
CRYPTO_set_locking_callback(&ssl_locking_callback); CRYPTO_set_locking_callback(&ssl_locking_callback);
#ifndef pthread_t_LARGER_THAN_unsigned_long
/* Cannot use this function if sizeof(pthread_t) > sizeof(unsigned long) */
CRYPTO_set_id_callback(&ssl_id_callback); CRYPTO_set_id_callback(&ssl_id_callback);
#endif
return 1; return 1;
} }
@@ -10794,6 +10775,7 @@ static void *worker_thread_run(void *thread_func_param)
mg_set_thread_name("worker"); mg_set_thread_name("worker");
tls.is_master = 0; tls.is_master = 0;
tls.thread_idx = (unsigned)mg_atomic_inc(&thread_idx_max);
#if defined(_WIN32) && !defined(__SYMBIAN32__) #if defined(_WIN32) && !defined(__SYMBIAN32__)
tls.pthread_cond_helper_mutex = CreateEvent(NULL, FALSE, FALSE, NULL); tls.pthread_cond_helper_mutex = CreateEvent(NULL, FALSE, FALSE, NULL);
#endif #endif