summaryrefslogtreecommitdiffstats
path: root/apps/s_server.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-11-13 23:54:44 +0000
committerMatt Caswell <matt@openssl.org>2015-11-20 23:39:30 +0000
commit68487a9b0631d27be9a1f4565e7e652ae9cb6aad (patch)
treef08b9aedfa12d06d5602f2422def273b96f7ea2c /apps/s_server.c
parent27949c353e68825f119410f8fd73ae1d667581c7 (diff)
Convert __thread to pthreads for Thread Local Storage
In theory the pthreads approach for Thread Local Storage should be more portable. This also changes some APIs in order to accommodate this change. In particular ASYNC_init_pool is renamed ASYNC_init_thread and ASYNC_free_pool is renamed ASYNC_cleanup_thread. Also introduced ASYNC_init and ASYNC_cleanup. Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'apps/s_server.c')
-rw-r--r--apps/s_server.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/s_server.c b/apps/s_server.c
index c90b700af3..fd8035de99 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -1660,7 +1660,7 @@ int s_server_main(int argc, char *argv[])
if (async) {
SSL_CTX_set_mode(ctx, SSL_MODE_ASYNC);
- ASYNC_init_pool(0, 0);
+ ASYNC_init(1, 0, 0);
}
#ifndef OPENSSL_NO_SRTP
@@ -1974,7 +1974,7 @@ int s_server_main(int argc, char *argv[])
BIO_free(bio_s_msg);
bio_s_msg = NULL;
if (async) {
- ASYNC_free_pool();
+ ASYNC_cleanup(1);
}
return (ret);
}