diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2015-12-24 16:07:21 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2016-01-11 17:50:27 +0000 |
commit | 63c75cd688352b83afd7f874b89139e282647046 (patch) | |
tree | 98d1484260069de69440e4f53c8f7406aa1a3140 | |
parent | 62d0577e0d5e3703436d0fba362d516481291810 (diff) |
Add lh_doall inlining
Reviewed-by: Rich Salz <rsalz@openssl.org>
-rw-r--r-- | crypto/conf/conf_api.c | 3 | ||||
-rw-r--r-- | crypto/engine/eng_table.c | 5 | ||||
-rw-r--r-- | crypto/objects/o_names.c | 4 | ||||
-rw-r--r-- | crypto/objects/obj_dat.c | 10 | ||||
-rw-r--r-- | include/openssl/lhash.h | 15 | ||||
-rw-r--r-- | include/openssl/safestack.h | 12 | ||||
-rwxr-xr-x | util/mkstack.pl | 1 |
7 files changed, 11 insertions, 39 deletions
diff --git a/crypto/conf/conf_api.c b/crypto/conf/conf_api.c index 408e49725c..177807556f 100644 --- a/crypto/conf/conf_api.c +++ b/crypto/conf/conf_api.c @@ -75,7 +75,6 @@ static void value_free_hash_doall_arg(CONF_VALUE *a, static void value_free_stack_doall(CONF_VALUE *a); static IMPLEMENT_LHASH_DOALL_ARG_FN(value_free_hash, CONF_VALUE, LHASH_OF(CONF_VALUE)) -static IMPLEMENT_LHASH_DOALL_FN(value_free_stack, CONF_VALUE) /* Up until OpenSSL 0.9.5a, this was get_section */ CONF_VALUE *_CONF_get_section(const CONF *conf, const char *section) @@ -210,7 +209,7 @@ void _CONF_free_data(CONF *conf) * with */ - lh_CONF_VALUE_doall(conf->data, LHASH_DOALL_FN(value_free_stack)); + lh_CONF_VALUE_doall(conf->data, value_free_stack_doall); lh_CONF_VALUE_free(conf->data); } diff --git a/crypto/engine/eng_table.c b/crypto/engine/eng_table.c index 220d632bda..ad15f3a51c 100644 --- a/crypto/engine/eng_table.c +++ b/crypto/engine/eng_table.c @@ -219,14 +219,11 @@ static void int_cleanup_cb_doall(ENGINE_PILE *p) OPENSSL_free(p); } -static IMPLEMENT_LHASH_DOALL_FN(int_cleanup_cb, ENGINE_PILE) - void engine_table_cleanup(ENGINE_TABLE **table) { CRYPTO_w_lock(CRYPTO_LOCK_ENGINE); if (*table) { - lh_ENGINE_PILE_doall(&(*table)->piles, - LHASH_DOALL_FN(int_cleanup_cb)); + lh_ENGINE_PILE_doall(&(*table)->piles, int_cleanup_cb_doall); lh_ENGINE_PILE_free(&(*table)->piles); *table = NULL; } diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c index f7216f210e..d63575dc84 100644 --- a/crypto/objects/o_names.c +++ b/crypto/objects/o_names.c @@ -320,8 +320,6 @@ static void names_lh_free_doall(OBJ_NAME *onp) OBJ_NAME_remove(onp->name, onp->type); } -static IMPLEMENT_LHASH_DOALL_FN(names_lh_free, OBJ_NAME) - static void name_funcs_free(NAME_FUNCS *ptr) { OPENSSL_free(ptr); @@ -338,7 +336,7 @@ void OBJ_NAME_cleanup(int type) down_load = lh_OBJ_NAME_get_down_load(names_lh); lh_OBJ_NAME_set_down_load(names_lh, 0); - lh_OBJ_NAME_doall(names_lh, LHASH_DOALL_FN(names_lh_free)); + lh_OBJ_NAME_doall(names_lh, names_lh_free_doall); if (type < 0) { lh_OBJ_NAME_free(names_lh); sk_NAME_FUNCS_pop_free(name_funcs_stack, name_funcs_free); diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c index cbd6e346c1..3983ebe770 100644 --- a/crypto/objects/obj_dat.c +++ b/crypto/objects/obj_dat.c @@ -199,10 +199,6 @@ static void cleanup3_doall(ADDED_OBJ *a) OPENSSL_free(a); } -static IMPLEMENT_LHASH_DOALL_FN(cleanup1, ADDED_OBJ) -static IMPLEMENT_LHASH_DOALL_FN(cleanup2, ADDED_OBJ) -static IMPLEMENT_LHASH_DOALL_FN(cleanup3, ADDED_OBJ) - /* * The purpose of obj_cleanup_defer is to avoid EVP_cleanup() attempting to * use freed up OIDs. If necessary the actual freeing up of OIDs is delayed. @@ -224,9 +220,9 @@ void OBJ_cleanup(void) if (added == NULL) return; lh_ADDED_OBJ_set_down_load(added, 0); - lh_ADDED_OBJ_doall(added, LHASH_DOALL_FN(cleanup1)); /* zero counters */ - lh_ADDED_OBJ_doall(added, LHASH_DOALL_FN(cleanup2)); /* set counters */ - lh_ADDED_OBJ_doall(added, LHASH_DOALL_FN(cleanup3)); /* free objects */ + lh_ADDED_OBJ_doall(added, cleanup1_doall); /* zero counters */ + lh_ADDED_OBJ_doall(added, cleanup2_doall); /* set counters */ + lh_ADDED_OBJ_doall(added, cleanup3_doall); /* free objects */ lh_ADDED_OBJ_free(added); added = NULL; } diff --git a/include/openssl/lhash.h b/include/openssl/lhash.h index 057c831dd8..20d799bd6d 100644 --- a/include/openssl/lhash.h +++ b/include/openssl/lhash.h @@ -113,15 +113,6 @@ typedef void (*LHASH_DOALL_ARG_FN_TYPE) (void *, void *); return name##_cmp(a,b); } # define LHASH_COMP_FN(name) name##_LHASH_COMP -/* Third: "doall" functions */ -# define DECLARE_LHASH_DOALL_FN(name, o_type) \ - void name##_LHASH_DOALL(void *); -# define IMPLEMENT_LHASH_DOALL_FN(name, o_type) \ - void name##_LHASH_DOALL(void *arg) { \ - o_type *a = arg; \ - name##_doall(a); } -# define LHASH_DOALL_FN(name) name##_LHASH_DOALL - /* Fourth: "doall_arg" functions */ # define DECLARE_LHASH_DOALL_ARG_FN(name, o_type, a_type) \ void name##_LHASH_DOALL_ARG(void *, void *); @@ -246,13 +237,17 @@ void lh_node_usage_stats_bio(const _LHASH *lh, BIO *out); { \ lh_set_down_load((_LHASH *)lh, dl); \ } \ + static inline void lh_##type##_doall(LHASH_OF(type) *lh, \ + void (*doall)(type *)) \ + { \ + lh_doall((_LHASH *)lh, (LHASH_DOALL_FN_TYPE)doall); \ + } \ LHASH_OF(type) # define CHECKED_LHASH_OF(type,lh) \ ((_LHASH *)CHECKED_PTR_OF(LHASH_OF(type),lh)) /* Define wrapper functions. */ -# define LHM_lh_doall(type, lh,fn) lh_doall(CHECKED_LHASH_OF(type, lh), fn) # define LHM_lh_doall_arg(type, lh, fn, arg_type, arg) \ lh_doall_arg(CHECKED_LHASH_OF(type, lh), fn, CHECKED_PTR_OF(arg_type, arg)) diff --git a/include/openssl/safestack.h b/include/openssl/safestack.h index 43493fc1e0..c6adbbee19 100644 --- a/include/openssl/safestack.h +++ b/include/openssl/safestack.h @@ -231,51 +231,39 @@ DEFINE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void) */ -# define lh_ADDED_OBJ_doall(lh,fn) LHM_lh_doall(ADDED_OBJ,lh,fn) # define lh_ADDED_OBJ_doall_arg(lh,fn,arg_type,arg) \ LHM_lh_doall_arg(ADDED_OBJ,lh,fn,arg_type,arg) -# define lh_APP_INFO_doall(lh,fn) LHM_lh_doall(APP_INFO,lh,fn) # define lh_APP_INFO_doall_arg(lh,fn,arg_type,arg) \ LHM_lh_doall_arg(APP_INFO,lh,fn,arg_type,arg) -# define lh_CONF_VALUE_doall(lh,fn) LHM_lh_doall(CONF_VALUE,lh,fn) # define lh_CONF_VALUE_doall_arg(lh,fn,arg_type,arg) \ LHM_lh_doall_arg(CONF_VALUE,lh,fn,arg_type,arg) -# define lh_ENGINE_PILE_doall(lh,fn) LHM_lh_doall(ENGINE_PILE,lh,fn) # define lh_ENGINE_PILE_doall_arg(lh,fn,arg_type,arg) \ LHM_lh_doall_arg(ENGINE_PILE,lh,fn,arg_type,arg) -# define lh_ERR_STATE_doall(lh,fn) LHM_lh_doall(ERR_STATE,lh,fn) # define lh_ERR_STATE_doall_arg(lh,fn,arg_type,arg) \ LHM_lh_doall_arg(ERR_STATE,lh,fn,arg_type,arg) -# define lh_ERR_STRING_DATA_doall(lh,fn) LHM_lh_doall(ERR_STRING_DATA,lh,fn) # define lh_ERR_STRING_DATA_doall_arg(lh,fn,arg_type,arg) \ LHM_lh_doall_arg(ERR_STRING_DATA,lh,fn,arg_type,arg) -# define lh_FUNCTION_doall(lh,fn) LHM_lh_doall(FUNCTION,lh,fn) # define lh_FUNCTION_doall_arg(lh,fn,arg_type,arg) \ LHM_lh_doall_arg(FUNCTION,lh,fn,arg_type,arg) -# define lh_MEM_doall(lh,fn) LHM_lh_doall(MEM,lh,fn) # define lh_MEM_doall_arg(lh,fn,arg_type,arg) \ LHM_lh_doall_arg(MEM,lh,fn,arg_type,arg) -# define lh_OBJ_NAME_doall(lh,fn) LHM_lh_doall(OBJ_NAME,lh,fn) # define lh_OBJ_NAME_doall_arg(lh,fn,arg_type,arg) \ LHM_lh_doall_arg(OBJ_NAME,lh,fn,arg_type,arg) -# define lh_OPENSSL_CSTRING_doall(lh,fn) LHM_lh_doall(OPENSSL_CSTRING,lh,fn) # define lh_OPENSSL_CSTRING_doall_arg(lh,fn,arg_type,arg) \ LHM_lh_doall_arg(OPENSSL_CSTRING,lh,fn,arg_type,arg) -# define lh_OPENSSL_STRING_doall(lh,fn) LHM_lh_doall(OPENSSL_STRING,lh,fn) # define lh_OPENSSL_STRING_doall_arg(lh,fn,arg_type,arg) \ LHM_lh_doall_arg(OPENSSL_STRING,lh,fn,arg_type,arg) -# define lh_SSL_SESSION_doall(lh,fn) LHM_lh_doall(SSL_SESSION,lh,fn) # define lh_SSL_SESSION_doall_arg(lh,fn,arg_type,arg) \ LHM_lh_doall_arg(SSL_SESSION,lh,fn,arg_type,arg) diff --git a/util/mkstack.pl b/util/mkstack.pl index e188840595..fb8412b508 100755 --- a/util/mkstack.pl +++ b/util/mkstack.pl @@ -275,7 +275,6 @@ foreach $type_thing (sort @lhashlst) { my $lc_tt = lc $type_thing; $new_stackfile .= <<EOF; -# define lh_${type_thing}_doall(lh,fn) LHM_lh_doall(${type_thing},lh,fn) # define lh_${type_thing}_doall_arg(lh,fn,arg_type,arg) \\ LHM_lh_doall_arg(${type_thing},lh,fn,arg_type,arg) EOF |