Extract code from critical section

Author: andrewkdinh

source/evp_hash.c

@@ -45,9 +45,9 @@ typedef enum {
 } hash_algorithm_type;
 
 static unsigned char data[DATA_SIZE];
-static int deprecated_api = 0;
 static int update_times = 1;
 static int hash_algorithm = -1;
+static const EVP_MD *evp_md = NULL;
 
 int hash_deprecated()
 {
@@ -128,50 +128,34 @@ int hash_evp(EVP_MD_CTX *mctx, const EVP_MD *evp_md)
     return 1;
 }
 
-void do_hash(size_t num)
+void do_hash_deprecated(size_t num)
 {
     OSSL_TIME time;
-    EVP_MD_CTX *mctx = NULL; 
-    const EVP_MD *evp_md = NULL;
 
-    counts[num] = 0;
-
-    if (!deprecated_api) {
-        switch (hash_algorithm) {
-        case SHA1_ALG:
-            evp_md = EVP_sha1();
-            break;
-        case SHA224_ALG:
-            evp_md = EVP_sha224();
-            break;
-        case SHA256_ALG:
-            evp_md = EVP_sha256();
-            break;
-        case SHA384_ALG:
-            evp_md = EVP_sha384();
-            break;
-        case SHA512_ALG:
-            evp_md = EVP_sha512();
-            break;
-        default:
+    do {
+        if (!hash_deprecated()) {
             err = 1;
             return;
         }
 
-        if ((mctx = EVP_MD_CTX_new()) == NULL)
-            return;
-    }
+        counts[num]++;
+        time = ossl_time_now();
+    } while (time.t < max_time.t);
+}
+
+void do_hash_evp(size_t num)
+{
+    OSSL_TIME time;
+    EVP_MD_CTX *mctx = EVP_MD_CTX_new();
+
+    if (mctx == NULL)
+        return;
 
     do {
-        if (deprecated_api) {
-            if (!hash_deprecated())
-                err = 1;
-        } else if (!hash_evp(mctx, evp_md)) {
+        if (!hash_evp(mctx, evp_md)) {
             err = 1;
-        }
-
-        if (err)
             goto err;
+        }
 
         counts[num]++;
         time = ossl_time_now();
@@ -197,7 +181,7 @@ int main(int argc, char *argv[])
     OSSL_TIME duration;
     size_t total_count = 0;
     double av;
-    int terse = 0;
+    int terse = 0, deprecated_api = 0;
     int j, opt, rc = EXIT_FAILURE;
 
     while ((opt = getopt(argc, argv, "htx")) != -1) {
@@ -258,15 +242,37 @@ int main(int argc, char *argv[])
 
     max_time = ossl_time_add(ossl_time_now(), ossl_seconds2time(RUN_TIME));
 
-    counts = OPENSSL_malloc(sizeof(size_t) * threadcount);
+    counts = OPENSSL_zalloc(sizeof(size_t) * threadcount);
     if (counts == NULL) {
         fprintf(stderr, "Failed to create counts array\n");
         goto out;
     }
 
-    if (!perflib_run_multi_thread_test(do_hash, threadcount, &duration)) {
-        fprintf(stderr, "Failed to run the test\n");
-        goto out;
+    if (deprecated_api) {
+        err = !perflib_run_multi_thread_test(do_hash_deprecated, threadcount, &duration) || err;
+    } else {
+        switch (hash_algorithm) {
+        case SHA1_ALG:
+            evp_md = EVP_sha1();
+            break;
+        case SHA224_ALG:
+            evp_md = EVP_sha224();
+            break;
+        case SHA256_ALG:
+            evp_md = EVP_sha256();
+            break;
+        case SHA384_ALG:
+            evp_md = EVP_sha384();
+            break;
+        case SHA512_ALG:
+            evp_md = EVP_sha512();
+            break;
+        default:
+            err = 1;
+            goto out;
+        }
+
+        err = !perflib_run_multi_thread_test(do_hash_evp, threadcount, &duration) || err;
     }
 
     if (err) {