Skip to content

TS-2271: Support plugins which use libraries which create threads and use OpenSSL #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
hessu wants to merge 2 commits into from
Closed

TS-2271: Support plugins which use libraries which create threads and use OpenSSL #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d414fa2
TS-2271: Change the OpenSSL init + callbacks to use raw pthread funct…
hessu Dec 30, 2013
0c49035
TS-2271: Let TSHttpTxnReenable work gracefully when it's called from …
hessu Dec 30, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions iocore/net/SSLUtils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ struct ssl_ticket_key_t
};

static int ssl_session_ticket_index = 0;
static ProxyMutex ** sslMutexArray;
static pthread_mutex_t *mutex_buf = NULL;
static bool open_ssl_initialized = false;

struct ats_file_bio
Expand All @@ -106,11 +106,15 @@ struct ats_file_bio
ats_file_bio& operator=(const ats_file_bio&);
};

/* Using pthread thread ID and mutex functions directly, instead of
* ATS this_ethread / ProxyMutex, so that other linked libraries
* may use pthreads and openssl without confusing us here. (TS-2271).
*/

static unsigned long
SSL_pthreads_thread_id()
{
EThread *eth = this_ethread();
return (unsigned long) (eth->id);
return (unsigned long)pthread_self();
}

static void
Expand All @@ -119,9 +123,9 @@ SSL_locking_callback(int mode, int type, const char * /* file ATS_UNUSED */, int
ink_assert(type < CRYPTO_num_locks());

if (mode & CRYPTO_LOCK) {
MUTEX_TAKE_LOCK(sslMutexArray[type], this_ethread());
pthread_mutex_lock(&mutex_buf[type]);
} else if (mode & CRYPTO_UNLOCK) {
MUTEX_UNTAKE_LOCK(sslMutexArray[type], this_ethread());
pthread_mutex_unlock(&mutex_buf[type]);
} else {
Debug("ssl", "invalid SSL locking mode 0x%x", mode);
ink_assert(0);
Expand Down Expand Up @@ -298,10 +302,10 @@ SSLInitializeLibrary()
SSL_load_error_strings();
SSL_library_init();

sslMutexArray = (ProxyMutex **) OPENSSL_malloc(CRYPTO_num_locks() * sizeof(ProxyMutex *));
mutex_buf = (pthread_mutex_t *) OPENSSL_malloc(CRYPTO_num_locks() * sizeof(pthread_mutex_t));

for (int i = 0; i < CRYPTO_num_locks(); i++) {
sslMutexArray[i] = new_ProxyMutex();
pthread_mutex_init(&mutex_buf[i], NULL);
}

CRYPTO_set_locking_callback(SSL_locking_callback);
Expand Down
6 changes: 5 additions & 1 deletion proxy/InkAPI.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5516,10 +5516,14 @@ TSHttpTxnReenable(TSHttpTxn txnp, TSEvent event)
HttpSM *sm = (HttpSM *) txnp;
EThread *eth = this_ethread();

// TS-2271: If this function is being executed on a thread which was not
// created using the ATS EThread API, eth will be NULL, and the
// continuation needs to be called back on a REGULAR thread.
//
// If this function is being executed on a thread created by the API
// which is DEDICATED, the continuation needs to be called back on a
// REGULAR thread.
if (eth->tt != REGULAR) {
if (eth == NULL || eth->tt != REGULAR) {
eventProcessor.schedule_imm(NEW(new TSHttpSMCallback(sm, event)), ET_NET);
} else {
MUTEX_TRY_LOCK(trylock, sm->mutex, eth);
Expand Down