feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Fixes for benchmark after buffers were moved into thread. Needed THREAD_LS_T and fixed benchmark alloc failure cleanup.

Browse Source
This commit is contained in:
David Garske
2017-09-22 11:35:46 -07:00
parent 218f944984
commit eec5f9bb41
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
wolfcrypt/benchmark/benchmark.c
View File

@@ -407,8 +407,8 @@ static THREAD_LS_T int devId = INVALID_DEVID;
#define BENCH_SIZE bench_size #define BENCH_SIZE bench_size
/* globals for cipher tests */ /* globals for cipher tests */
static byte* bench_plain = NULL; static THREAD_LS_T byte* bench_plain = NULL;
static byte* bench_cipher = NULL; static THREAD_LS_T byte* bench_cipher = NULL;
static const XGEN_ALIGN byte bench_key_buf[] = static const XGEN_ALIGN byte bench_key_buf[] =
{ {
@@ -424,8 +424,8 @@ static const XGEN_ALIGN byte bench_iv_buf[] =
0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,
0x11,0x21,0x31,0x41,0x51,0x61,0x71,0x81 0x11,0x21,0x31,0x41,0x51,0x61,0x71,0x81
}; };
static byte* bench_key = (byte*)bench_key_buf; static THREAD_LS_T byte* bench_key = NULL;
static byte* bench_iv = (byte*)bench_iv_buf; static THREAD_LS_T byte* bench_iv = NULL;
#ifdef WOLFSSL_STATIC_MEMORY #ifdef WOLFSSL_STATIC_MEMORY
#ifdef BENCH_EMBEDDED #ifdef BENCH_EMBEDDED
@@ -712,9 +712,10 @@ static void* benchmarks_do(void* args)
if (bench_plain == NULL || bench_cipher == NULL) { if (bench_plain == NULL || bench_cipher == NULL) {
XFREE(bench_plain, HEAP_HINT, DYNAMIC_TYPE_WOLF_BIGINT); XFREE(bench_plain, HEAP_HINT, DYNAMIC_TYPE_WOLF_BIGINT);
XFREE(bench_cipher, HEAP_HINT, DYNAMIC_TYPE_WOLF_BIGINT); XFREE(bench_cipher, HEAP_HINT, DYNAMIC_TYPE_WOLF_BIGINT);
bench_plain = bench_cipher = NULL;
printf("Benchmark block buffer alloc failed!\n"); printf("Benchmark block buffer alloc failed!\n");
return NULL; goto exit;
} }
XMEMSET(bench_plain, 0, bench_buf_size); XMEMSET(bench_plain, 0, bench_buf_size);
XMEMSET(bench_cipher, 0, bench_buf_size); XMEMSET(bench_cipher, 0, bench_buf_size);
@@ -725,16 +726,17 @@ static void* benchmarks_do(void* args)
if (bench_key == NULL || bench_iv == NULL) { if (bench_key == NULL || bench_iv == NULL) {
XFREE(bench_key, HEAP_HINT, DYNAMIC_TYPE_WOLF_BIGINT); XFREE(bench_key, HEAP_HINT, DYNAMIC_TYPE_WOLF_BIGINT);
XFREE(bench_iv, HEAP_HINT, DYNAMIC_TYPE_WOLF_BIGINT); XFREE(bench_iv, HEAP_HINT, DYNAMIC_TYPE_WOLF_BIGINT);
bench_key = bench_iv = NULL;
printf("Benchmark cipher buffer alloc failed!\n"); printf("Benchmark cipher buffer alloc failed!\n");
return NULL; goto exit;
} }
XMEMCPY(bench_key, bench_key_buf, sizeof(bench_key_buf)); XMEMCPY(bench_key, bench_key_buf, sizeof(bench_key_buf));
XMEMCPY(bench_iv, bench_iv_buf, sizeof(bench_iv_buf)); XMEMCPY(bench_iv, bench_iv_buf, sizeof(bench_iv_buf));
#else
bench_key = (byte*)bench_key_buf;
bench_iv = (byte*)bench_iv_buf;
#endif #endif
(void)bench_key;
(void)bench_iv;
#ifndef WC_NO_RNG #ifndef WC_NO_RNG
bench_rng(); bench_rng();
@@ -968,6 +970,7 @@ static void* benchmarks_do(void* args)
bench_ed25519KeySign(); bench_ed25519KeySign();
#endif #endif
exit:
/* free benchmark buffers */ /* free benchmark buffers */
XFREE(bench_plain, HEAP_HINT, DYNAMIC_TYPE_WOLF_BIGINT); XFREE(bench_plain, HEAP_HINT, DYNAMIC_TYPE_WOLF_BIGINT);
XFREE(bench_cipher, HEAP_HINT, DYNAMIC_TYPE_WOLF_BIGINT); XFREE(bench_cipher, HEAP_HINT, DYNAMIC_TYPE_WOLF_BIGINT);