rsasign: run threads for a constant time

Fixes: openssl/project#1258

Signed-off-by: Norbert Pocs <[email protected]>

Reviewed-by: Saša Nedvědický <[email protected]>
Reviewed-by: Neil Horman <[email protected]>
(Merged from #32)

Author: jogme

source/rsasign.c

@@ -24,12 +24,14 @@
 #include <openssl/crypto.h>
 #include "perflib/perflib.h"
 
-#define NUM_CALLS_PER_TEST         100000
+#define RUN_TIME 5
 
-size_t num_calls;
 int err = 0;
 EVP_PKEY *rsakey = NULL;
 
+size_t *counts;
+OSSL_TIME max_time;
+
 static const char *rsakeypem =
     "-----BEGIN PRIVATE KEY-----\n"
     "MIIBVwIBADANBgkqhkiG9w0BAQEFAASCAUEwggE9AgEAAkEAwmjwpbuKfvtBTAiQ\n"
@@ -46,41 +48,38 @@ static const char *tbs = "0123456789abcdefghij"; /* Length of SHA1 digest */
 
 static int threadcount;
 
-static OSSL_TIME *times = NULL;
-
 void do_rsasign(size_t num)
 {
-    size_t i;
     unsigned char sig[64];
     EVP_PKEY_CTX *ctx = EVP_PKEY_CTX_new(rsakey, NULL);
     size_t siglen = sizeof(sig);
-    OSSL_TIME start, end;
+    OSSL_TIME time;
 
-    start = ossl_time_now();
+    counts[num] = 0;
 
-    for (i = 0; i < num_calls / threadcount; i++) {
+    do {
         if (EVP_PKEY_sign_init(ctx) <= 0
-                || EVP_PKEY_sign(ctx, sig, &siglen, tbs, SHA_DIGEST_LENGTH) <= 0) {
+                || EVP_PKEY_sign(ctx, sig, &siglen, (const unsigned char*)tbs,
+                                 SHA_DIGEST_LENGTH) <= 0) {
             err = 1;
             break;
         }
-    }
-
-    end = ossl_time_now();
-    times[num] = ossl_time_subtract(end, start);
+        counts[num]++;
+        time = ossl_time_now();
+    } while(time.t < max_time.t);
 
     EVP_PKEY_CTX_free(ctx);
 }
 
 int main(int argc, char *argv[])
 {
     OSSL_TIME duration;
-    OSSL_TIME ttime;
+    size_t total_count = 0;
     double avcalltime;
     int terse = 0;
     BIO *membio = NULL;
     int rc = EXIT_FAILURE;
-    size_t i;
+    int i;
     int opt;
 
     while ((opt = getopt(argc, argv, "t")) != -1) {
@@ -104,9 +103,6 @@ int main(int argc, char *argv[])
         printf("threadcount must be > 0\n");
         return EXIT_FAILURE;
     }
-    num_calls = NUM_CALLS_PER_TEST;
-    if (NUM_CALLS_PER_TEST % threadcount > 0) /* round up */
-        num_calls += threadcount - NUM_CALLS_PER_TEST % threadcount;
 
     assert(strlen(tbs) == SHA_DIGEST_LENGTH);
     membio = BIO_new_mem_buf(rsakeypem, strlen(rsakeypem));
@@ -121,12 +117,14 @@ int main(int argc, char *argv[])
         goto out;
     }
 
-    times = OPENSSL_malloc(sizeof(OSSL_TIME) * threadcount);
-    if (times == NULL) {
-        printf("Failed to create times array\n");
+    counts = OPENSSL_malloc(sizeof(size_t) * threadcount);
+    if (counts == NULL) {
+        printf("Failed to create counts array\n");
         goto out;
     }
 
+    max_time = ossl_time_add(ossl_time_now(), ossl_seconds2time(RUN_TIME));
+
     if (!perflib_run_multi_thread_test(do_rsasign, threadcount, &duration)) {
         printf("Failed to run the test\n");
         goto out;
@@ -137,11 +135,10 @@ int main(int argc, char *argv[])
         goto out;
     }
 
-    ttime = times[0];
-    for (i = 1; i < threadcount; i++)
-        ttime = ossl_time_add(ttime, times[i]);
+    for (i = 0; i < threadcount; i++)
+        total_count += counts[i];
 
-    avcalltime = ((double)ossl_time2ticks(ttime) / num_calls) / (double)OSSL_TIME_US;
+    avcalltime = (double)RUN_TIME * 1e6 * threadcount / total_count;
 
     if (terse)
         printf("%lf\n", avcalltime);
@@ -153,6 +150,6 @@ int main(int argc, char *argv[])
 
 out:
     EVP_PKEY_free(rsakey);
-    OPENSSL_free(times);
+    OPENSSL_free(counts);
     return rc;
 }