mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-02-23 14:42:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move BIO index lock creation

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Rich Salz 2016-08-20 19:06:43 -04:00
parent 6b1f413c3a
commit 5a7ad1f08b
5 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/bio/b_addr.c
View File

@ -19,7 +19,6 @@
#include <ctype.h> #include <ctype.h>
CRYPTO_RWLOCK *bio_lookup_lock; CRYPTO_RWLOCK *bio_lookup_lock;
extern CRYPTO_RWLOCK *bio_type_lock;
static CRYPTO_ONCE bio_lookup_init = CRYPTO_ONCE_STATIC_INIT; static CRYPTO_ONCE bio_lookup_init = CRYPTO_ONCE_STATIC_INIT;
/* /*
@ -606,8 +605,7 @@ static int addrinfo_wrap(int family, int socktype,
DEFINE_RUN_ONCE_STATIC(do_bio_lookup_init) DEFINE_RUN_ONCE_STATIC(do_bio_lookup_init)
{ {
bio_lookup_lock = CRYPTO_THREAD_lock_new(); bio_lookup_lock = CRYPTO_THREAD_lock_new();
bio_type_lock = CRYPTO_THREAD_lock_new(); return bio_lookup_lock != NULL;
return bio_lookup_lock != NULL && bio_type_lock != NULL;
} }
/*- /*-

1
crypto/bio/bio_err.c
View File

@ -29,6 +29,7 @@ static ERR_STRING_DATA BIO_str_functs[] = {
{ERR_FUNC(BIO_F_BIO_CTRL), "BIO_ctrl"}, {ERR_FUNC(BIO_F_BIO_CTRL), "BIO_ctrl"},
{ERR_FUNC(BIO_F_BIO_GETS), "BIO_gets"}, {ERR_FUNC(BIO_F_BIO_GETS), "BIO_gets"},
{ERR_FUNC(BIO_F_BIO_GET_HOST_IP), "BIO_get_host_ip"}, {ERR_FUNC(BIO_F_BIO_GET_HOST_IP), "BIO_get_host_ip"},
{ERR_FUNC(BIO_F_BIO_GET_NEW_INDEX), "BIO_get_new_index"},
{ERR_FUNC(BIO_F_BIO_GET_PORT), "BIO_get_port"}, {ERR_FUNC(BIO_F_BIO_GET_PORT), "BIO_get_port"},
{ERR_FUNC(BIO_F_BIO_LISTEN), "BIO_listen"}, {ERR_FUNC(BIO_F_BIO_LISTEN), "BIO_listen"},
{ERR_FUNC(BIO_F_BIO_LOOKUP), "BIO_lookup"}, {ERR_FUNC(BIO_F_BIO_LOOKUP), "BIO_lookup"},

2
crypto/bio/bio_lib.c
View File

@ -594,7 +594,7 @@ void bio_cleanup(void)
bio_sock_cleanup_int(); bio_sock_cleanup_int();
CRYPTO_THREAD_lock_free(bio_lookup_lock); CRYPTO_THREAD_lock_free(bio_lookup_lock);
bio_lookup_lock = NULL; bio_lookup_lock = NULL;
#endif
CRYPTO_THREAD_lock_free(bio_type_lock); CRYPTO_THREAD_lock_free(bio_type_lock);
bio_type_lock = NULL; bio_type_lock = NULL;
#endif
} }

16
crypto/bio/bio_meth.c
View File

@ -8,14 +8,26 @@
*/ */
#include "bio_lcl.h" #include "bio_lcl.h"
#include <internal/thread_once.h>
CRYPTO_RWLOCK *bio_type_lock; CRYPTO_RWLOCK *bio_type_lock = NULL;
static int bio_count = BIO_TYPE_START; static CRYPTO_ONCE bio_type_init = CRYPTO_ONCE_STATIC_INIT;
DEFINE_RUN_ONCE_STATIC(do_bio_type_init)
{
bio_type_lock = CRYPTO_THREAD_lock_new();
return bio_type_lock != NULL;
}
int BIO_get_new_index() int BIO_get_new_index()
{ {
static int bio_count = BIO_TYPE_START;
int newval; int newval;
if (!RUN_ONCE(&bio_type_init, do_bio_type_init)) {
BIOerr(BIO_F_BIO_GET_NEW_INDEX, ERR_R_MALLOC_FAILURE);
return -1;
}
if (!CRYPTO_atomic_add(&bio_count, 1, &newval, bio_type_lock)) if (!CRYPTO_atomic_add(&bio_count, 1, &newval, bio_type_lock))
return -1; return -1;
return newval; return newval;

1
include/openssl/bio.h
View File

@ -779,6 +779,7 @@ int ERR_load_BIO_strings(void);
# define BIO_F_BIO_CTRL 103 # define BIO_F_BIO_CTRL 103
# define BIO_F_BIO_GETS 104 # define BIO_F_BIO_GETS 104
# define BIO_F_BIO_GET_HOST_IP 106 # define BIO_F_BIO_GET_HOST_IP 106
# define BIO_F_BIO_GET_NEW_INDEX 102
# define BIO_F_BIO_GET_PORT 107 # define BIO_F_BIO_GET_PORT 107
# define BIO_F_BIO_LISTEN 139 # define BIO_F_BIO_LISTEN 139
# define BIO_F_BIO_LOOKUP 135 # define BIO_F_BIO_LOOKUP 135