diff options
author | Alessandro Ghedini <alessandro@ghedini.me> | 2015-10-25 17:43:55 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2016-02-26 10:00:36 +0000 |
commit | 71a04cfca03bf6d5a93ad3ffd23e0fb9e0da2919 (patch) | |
tree | f0c49fffc439de585b85ad95f94ebfd50fafce90 /test | |
parent | bdcd83e1272c84f3de576f793ba03fdc2c21a557 (diff) |
Implement new multi-threading API
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'test')
-rw-r--r-- | test/Makefile.in | 12 | ||||
-rw-r--r-- | test/build.info | 6 | ||||
-rwxr-xr-x | test/recipes/90-test_threads.t | 5 | ||||
-rw-r--r-- | test/threadstest.c | 283 |
4 files changed, 302 insertions, 4 deletions
diff --git a/test/Makefile.in b/test/Makefile.in index 0b6938c001..2fb1f49985 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -82,6 +82,7 @@ SSLSKEWITH0PTEST= sslskewith0ptest ASYNCTEST= asynctest DTLSV1LISTENTEST = dtlsv1listentest CTTEST= ct_test +THREADSTEST= threadstest TESTS= alltests @@ -103,7 +104,7 @@ EXE= $(NPTEST)$(EXE_EXT) $(MEMLEAKTEST)$(EXE_EXT) \ $(HEARTBEATTEST)$(EXE_EXT) $(P5_CRPT2_TEST)$(EXE_EXT) \ $(CONSTTIMETEST)$(EXE_EXT) $(VERIFYEXTRATEST)$(EXE_EXT) \ $(CLIENTHELLOTEST)$(EXE_EXT) $(PACKETTEST)$(EXE_EXT) $(ASYNCTEST)$(EXE_EXT) \ - $(DTLSV1LISTENTEST)$(EXE_EXT) $(CTTEST)$(EXE_EXT) + $(DTLSV1LISTENTEST)$(EXE_EXT) $(CTTEST)$(EXE_EXT) $(THREADSTEST)$(EXE_EXT) # $(METHTEST)$(EXE_EXT) @@ -120,7 +121,8 @@ OBJ= $(NPTEST).o $(MEMLEAKTEST).o \ $(EVPTEST).o $(EVPEXTRATEST).o $(IGETEST).o $(V3NAMETEST).o \ $(HEARTBEATTEST).o $(P5_CRPT2_TEST).o \ $(CONSTTIMETEST).o $(VERIFYEXTRATEST).o $(CLIENTHELLOTEST).o \ - $(PACKETTEST).o $(ASYNCTEST).o $(DTLSV1LISTENTEST).o $(CTTEST).o testutil.o + $(PACKETTEST).o $(ASYNCTEST).o $(DTLSV1LISTENTEST).o $(CTTEST).o \ + $(THREADSTEST).o testutil.o SRC= $(NPTEST).c $(MEMLEAKTEST).c \ $(BNTEST).c $(ECTEST).c \ @@ -134,7 +136,8 @@ SRC= $(NPTEST).c $(MEMLEAKTEST).c \ $(EVPTEST).c $(EVPEXTRATEST).c $(IGETEST).c $(V3NAMETEST).c \ $(HEARTBEATTEST).c $(P5_CRPT2_TEST).c \ $(CONSTTIMETEST).c $(VERIFYEXTRATEST).c $(CLIENTHELLOTEST).c \ - $(PACKETTEST).c $(ASYNCTEST).c $(DTLSV1LISTENTEST).c $(CTTEST).c testutil.c + $(PACKETTEST).c $(ASYNCTEST).c $(DTLSV1LISTENTEST).c $(CTTEST).c \ + $(THREADSTEST).c testutil.c HEADER= testutil.h @@ -373,6 +376,9 @@ $(DTLSV1LISTENTEST)$(EXE_EXT): $(DTLSV1LISTENTEST).o $(CTTEST)$(EXE_EXT): $(CTTEST).o testutil.o @target=$(CTTEST) testutil=testutil.o; $(BUILD_CMD) +$(THREADSTEST)$(EXE_EXT): $(THREADSTEST).o $(DLIBCRYPTO) + @target=$(THREADSTEST) $(BUILD_CMD) + dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO) @target=dummytest; $(BUILD_CMD) diff --git a/test/build.info b/test/build.info index f8ce69ea2e..e3b0ee4715 100644 --- a/test/build.info +++ b/test/build.info @@ -13,7 +13,7 @@ PROGRAMS=\ danetest heartbeat_test p5_crpt2_test \ constant_time_test verify_extra_test clienthellotest \ packettest asynctest secmemtest srptest memleaktest \ - dtlsv1listentest ct_test + dtlsv1listentest ct_test threadstest SOURCE[nptest]=nptest.c INCLUDE[nptest]={- rel2abs(catdir($builddir,"../include")) -} ../include @@ -206,3 +206,7 @@ DEPEND[dtlsv1listentest]=../libssl SOURCE[ct_test]=ct_test.c INCLUDE[ct_test]={- rel2abs(catdir($builddir,"../include")) -} ../include DEPEND[ct_test]=../libcrypto + +SOURCE[threadstest]=threadstest.c +INCLUDE[threadstest]={- rel2abs(catdir($builddir,"../include")) -} .. ../include +DEPEND[threadstest]=../libcrypto diff --git a/test/recipes/90-test_threads.t b/test/recipes/90-test_threads.t new file mode 100755 index 0000000000..a08d8b020c --- /dev/null +++ b/test/recipes/90-test_threads.t @@ -0,0 +1,5 @@ +#! /usr/bin/perl + +use OpenSSL::Test::Simple; + +simple_test("test_threads", "threadstest"); diff --git a/test/threadstest.c b/test/threadstest.c new file mode 100644 index 0000000000..e3a9ff5849 --- /dev/null +++ b/test/threadstest.c @@ -0,0 +1,283 @@ +/* ==================================================================== + * Copyright (c) 2016 The OpenSSL Project. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. All advertising materials mentioning features or use of this + * software must display the following acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" + * + * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For written permission, please contact + * openssl-core@openssl.org. + * + * 5. Products derived from this software may not be called "OpenSSL" + * nor may "OpenSSL" appear in their names without prior written + * permission of the OpenSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit (http://www.openssl.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY + * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * ==================================================================== + */ + +#include <stdio.h> + +#include <openssl/crypto.h> +#include "internal/threads.h" + +#if !defined(OPENSSL_THREADS) || defined(CRYPTO_TDEBUG) + +typedef unsigned int thread_t; + +static int run_thread(thread_t *t, void (*f)(void)) +{ + f(); + return 1; +} + +static int wait_for_thread(thread_t thread) +{ + return 1; +} + +#elif defined(OPENSSL_SYS_WINDOWS) + +typedef HANDLE thread_t; + +static DWORD WINAPI thread_run(LPVOID arg) +{ + void (*f)(void); + + *(void **) (&f) = arg; + + f(); + return 0; +} + +static int run_thread(thread_t *t, void (*f)(void)) +{ + *t = CreateThread(NULL, 0, thread_run, *(void **) &f, 0, NULL); + return *t != NULL; +} + +static int wait_for_thread(thread_t thread) +{ + return WaitForSingleObject(thread, INFINITE) == 0; +} + +#else + +typedef pthread_t thread_t; + +static void *thread_run(void *arg) +{ + void (*f)(void); + + *(void **) (&f) = arg; + + f(); + return NULL; +} + +static int run_thread(thread_t *t, void (*f)(void)) +{ + return pthread_create(t, NULL, thread_run, *(void **) &f) == 0; +} + +static int wait_for_thread(thread_t thread) +{ + return pthread_join(thread, NULL) == 0; +} + +#endif + +static int test_lock(void) +{ + CRYPTO_RWLOCK *lock = CRYPTO_THREAD_lock_new(); + + if (!CRYPTO_THREAD_read_lock(lock)) { + fprintf(stderr, "CRYPTO_THREAD_read_lock() failed\n"); + return 0; + } + + if (!CRYPTO_THREAD_unlock(lock)) { + fprintf(stderr, "CRYPTO_THREAD_unlock() failed\n"); + return 0; + } + + CRYPTO_THREAD_lock_free(lock); + + return 1; +} + +static CRYPTO_ONCE once_run = CRYPTO_ONCE_STATIC_INIT; +static unsigned once_run_count = 0; + +static void once_do_run(void) +{ + once_run_count++; +} + +static void once_run_thread_cb(void) +{ + CRYPTO_THREAD_run_once(&once_run, once_do_run); +} + +static int test_once(void) +{ + thread_t thread; + if (!run_thread(&thread, once_run_thread_cb) || + !wait_for_thread(thread)) + { + fprintf(stderr, "run_thread() failed\n"); + return 0; + } + + if (!CRYPTO_THREAD_run_once(&once_run, once_do_run)) { + fprintf(stderr, "CRYPTO_THREAD_run_once() failed\n"); + return 0; + } + + if (once_run_count != 1) { + fprintf(stderr, "once run %u times\n", once_run_count); + return 0; + } + + return 1; +} + +static CRYPTO_THREAD_LOCAL thread_local_key; +static unsigned destructor_run_count = 0; +static int thread_local_thread_cb_ok = 0; + +static void thread_local_destructor(void *arg) +{ + unsigned *count; + + if (arg == NULL) + return; + + count = arg; + + (*count)++; +} + +static void thread_local_thread_cb(void) +{ + void *ptr; + + ptr = CRYPTO_THREAD_get_local(&thread_local_key); + if (ptr != NULL) { + fprintf(stderr, "ptr not NULL\n"); + return; + } + + if (!CRYPTO_THREAD_set_local(&thread_local_key, &destructor_run_count)) { + fprintf(stderr, "CRYPTO_THREAD_set_local() failed\n"); + return; + } + + ptr = CRYPTO_THREAD_get_local(&thread_local_key); + if (ptr != &destructor_run_count) { + fprintf(stderr, "invalid ptr\n"); + return; + } + + thread_local_thread_cb_ok = 1; +} + +static int test_thread_local(void) +{ + thread_t thread; + void *ptr = NULL; + + if (!CRYPTO_THREAD_init_local(&thread_local_key, thread_local_destructor)) { + fprintf(stderr, "CRYPTO_THREAD_init_local() failed\n"); + return 0; + } + + ptr = CRYPTO_THREAD_get_local(&thread_local_key); + if (ptr != NULL) { + fprintf(stderr, "ptr not NULL\n"); + return 0; + } + + if (!run_thread(&thread, thread_local_thread_cb) || + !wait_for_thread(thread)) + { + fprintf(stderr, "run_thread() failed\n"); + return 0; + } + + if (thread_local_thread_cb_ok != 1) { + fprintf(stderr, "thread-local thread callback failed\n"); + return 0; + } + +#if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG) + + ptr = CRYPTO_THREAD_get_local(&thread_local_key); + if (ptr != NULL) { + fprintf(stderr, "ptr not NULL\n"); + return 0; + } + +# if !defined(OPENSSL_SYS_WINDOWS) + if (destructor_run_count != 1) { + fprintf(stderr, "thread-local destructor run %u times\n", + destructor_run_count); + return 0; + } +# endif + +#endif + + if (!CRYPTO_THREAD_cleanup_local(&thread_local_key)) { + fprintf(stderr, "CRYPTO_THREAD_cleanup_local() failed\n"); + return 0; + } + + return 1; +} + +int main(int argc, char **argv) +{ + if (!test_lock()) + return 1; + + if (!test_once()) + return 1; + + if (!test_thread_local()) + return 1; + + printf("PASS\n"); + return 0; +} |