[patch] Updated patch - moves proposed changes from ssl_private.h to ssl.c

tcnative-1.1.20_dynamic_locks.patch (text/plain), 5.15 KB, created by Daniel Ruggeri on 2010-03-29 14:11:08 UTC

(hide)

Description: Updated patch - moves proposed changes from ssl_private.h to ssl.c

Filename:

MIME Type:

Creator: Daniel Ruggeri

Created: 2010-03-29 14:11:08 UTC

Size: 5.15 KB

patch

obsolete

>diff -Nru tomcat-native-1.1.20-src/jni/native/src/ssl.c tomcat-native-1.1.20-src-dynamic_callbacks/jni/native/src/ssl.c >--- tomcat-native-1.1.20-src/jni/native/src/ssl.c 2009-09-15 10:38:21.000000000 -0500 >+++ tomcat-native-1.1.20-src-dynamic_callbacks/jni/native/src/ssl.c 2010-03-29 08:59:05.110783100 -0500 >@@ -215,6 +215,12 @@ > UNREFERENCED(data); > CRYPTO_set_locking_callback(NULL); > CRYPTO_set_id_callback(NULL); >+ CRYPTO_set_dynlock_create_callback(NULL); >+ CRYPTO_set_dynlock_lock_callback(NULL); >+ CRYPTO_set_dynlock_destroy_callback(NULL); >+ >+ dynlockpool = NULL; >+ > /* Let the registered mutex cleanups do their own thing > */ > return APR_SUCCESS; >@@ -235,6 +241,14 @@ > CRYPTO_set_id_callback(ssl_thread_id); > CRYPTO_set_locking_callback(ssl_thread_lock); > >+ /* Set up dynamic locking scaffolding for OpenSSL to use at its >+ * convenience. >+ */ >+ dynlockpool = p; >+ CRYPTO_set_dynlock_create_callback(ssl_dyn_create_function); >+ CRYPTO_set_dynlock_lock_callback(ssl_dyn_lock_function); >+ CRYPTO_set_dynlock_destroy_callback(ssl_dyn_destroy_function); >+ > apr_pool_cleanup_register(p, NULL, ssl_thread_cleanup, > apr_pool_cleanup_null); > } >@@ -404,6 +418,9 @@ > OPENSSL_load_builtin_modules(); > #endif > >+ /* Initialize thread support */ >+ ssl_thread_setup(tcn_global_pool); >+ > #ifndef OPENSSL_NO_ENGINE > if (J2S(engine)) { > ENGINE *ee = NULL; >@@ -457,8 +474,6 @@ > apr_pool_cleanup_register(tcn_global_pool, NULL, > ssl_init_cleanup, > apr_pool_cleanup_null); >- /* Initialize thread support */ >- ssl_thread_setup(tcn_global_pool); > TCN_FREE_CSTRING(engine); > return (jint)APR_SUCCESS; > } >@@ -919,3 +934,119 @@ > } > > #endif >+ >+/* Global reference to the pool used by the dynamic mutexes */ >+apr_pool_t *dynlockpool; >+ >+/* Dynamic lock structure */ >+struct CRYPTO_dynlock_value { >+ apr_pool_t *pool; >+ const char* file; >+ int line; >+ apr_thread_mutex_t *mutex; >+}; >+ >+/** >+ * Dynamic lock callback functions >+ */ >+static struct CRYPTO_dynlock_value *ssl_dyn_create_function(const char *file, int line); >+static void ssl_dyn_lock_function(int mode, struct CRYPTO_dynlock_value *l, const char *file, int line); >+static void ssl_dyn_destroy_function(struct CRYPTO_dynlock_value *l, const char *file, int line); >+ >+/* >+ * Dynamic lock creation callback >+ */ >+static struct CRYPTO_dynlock_value *ssl_dyn_create_function(const char *file, >+ int line) >+{ >+ struct CRYPTO_dynlock_value *value; >+ apr_pool_t *p; >+ apr_status_t rv; >+ >+ /* >+ * We need a pool to allocate our mutex. Since we can't clear >+ * allocated memory from a pool, create a subpool that we can blow >+ * away in the destruction callback. >+ */ >+ rv = apr_pool_create(&p, dynlockpool); >+ if (rv != APR_SUCCESS) { >+ fprintf(stderr, "Failed to create subpool for dynamic lock"); >+ return NULL; >+ } >+ >+ /* >+ fprintf(stderr, "Creating dynamic lock"); >+ */ >+ >+ value = (struct CRYPTO_dynlock_value *)apr_palloc(p, >+ sizeof(struct CRYPTO_dynlock_value)); >+ if (!value) { >+ fprintf(stderr, "Failed to allocate dynamic lock structure"); >+ return NULL; >+ } >+ >+ value->pool = p; >+ /* Keep our own copy of the place from which we were created, >+ using our own pool. */ >+ value->file = apr_pstrdup(p, file); >+ value->line = line; >+ rv = apr_thread_mutex_create(&(value->mutex), APR_THREAD_MUTEX_DEFAULT, >+ p); >+ if (rv != APR_SUCCESS) { >+ fprintf(stderr, "Failed to create thread mutex for dynamic lock"); >+ apr_pool_destroy(p); >+ return NULL; >+ } >+ return value; >+} >+ >+/* >+ * Dynamic locking and unlocking function >+ */ >+ >+static void ssl_dyn_lock_function(int mode, struct CRYPTO_dynlock_value *l, >+ const char *file, int line) >+{ >+ apr_status_t rv; >+ >+ if (mode & CRYPTO_LOCK) { >+ /* >+ fprintf(stderr, "Acquiring mutex %s:%d", l->file, l->line); >+ */ >+ rv = apr_thread_mutex_lock(l->mutex); >+ /* >+ fprintf(stderr, "Mutex %s:%d acquired!", l->file, l->line); >+ */ >+ } >+ else { >+ /* >+ fprintf(stderr, "Releasing mutex %s:%d", l->file, l->line); >+ */ >+ rv = apr_thread_mutex_unlock(l->mutex); >+ /* >+ fprintf(stderr, "Mutex %s:%d released!", l->file, l->line); >+ */ >+ } >+} >+ >+/* >+ * Dynamic lock destruction callback >+ */ >+static void ssl_dyn_destroy_function(struct CRYPTO_dynlock_value *l, >+ const char *file, int line) >+{ >+ apr_status_t rv; >+ >+ /* >+ fprintf(stderr, "Destroying dynamic lock %s:%d", l->file, l->line); >+ */ >+ rv = apr_thread_mutex_destroy(l->mutex); >+ if (rv != APR_SUCCESS) { >+ fprintf(stderr, "Failed to destroy mutex for dynamic lock %s:%d", l->file, l->line); >+ } >+ >+ /* Trust that whomever owned the CRYPTO_dynlock_value we were >+ * passed has no future use for it... >+ */ >+ apr_pool_destroy(l->pool); >+} View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]