wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

adjust wolfCrypt test/benchmark Android log TAG name, reset malloc/free counts in memcb_test()

Browse Source
This commit is contained in:
Chris Conlon
2022-06-10 15:31:38 -06:00
parent afc63a3bfa
commit 364bf482eb
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wolfcrypt/benchmark/benchmark.c
View File

@ -178,9 +178,9 @@
#include <android/log.h> #include <android/log.h>
#define printf(...) \ #define printf(...) \
__android_log_print(ANDROID_LOG_DEBUG, "TAG", __VA_ARGS__) __android_log_print(ANDROID_LOG_DEBUG, "[WOLFCRYPT]", __VA_ARGS__)
#define fprintf(fp, ...) \ #define fprintf(fp, ...) \
__android_log_print(ANDROID_LOG_DEBUG, "TAG", __VA_ARGS__) __android_log_print(ANDROID_LOG_DEBUG, "[WOLFCRYPT]", __VA_ARGS__)
#else #else
#if defined(XMALLOC_USER) || defined(FREESCALE_MQX) #if defined(XMALLOC_USER) || defined(FREESCALE_MQX)

21
wolfcrypt/test/test.c
View File

@ -178,9 +178,9 @@
#endif #endif
#else #else
#define printf(...) \ #define printf(...) \
__android_log_print(ANDROID_LOG_DEBUG, "TAG", __VA_ARGS__) __android_log_print(ANDROID_LOG_DEBUG, "[WOLFCRYPT]", __VA_ARGS__)
#define fprintf(fp, ...) \ #define fprintf(fp, ...) \
__android_log_print(ANDROID_LOG_DEBUG, "TAG", __VA_ARGS__) __android_log_print(ANDROID_LOG_DEBUG, "[WOLFCRYPT]", __VA_ARGS__)
#endif #endif
#elif defined(WOLFSSL_DEOS) #elif defined(WOLFSSL_DEOS)
#include <printx.h> #include <printx.h>
@ -39056,7 +39056,8 @@ WOLFSSL_TEST_SUBROUTINE int mutex_test(void)
#if defined(USE_WOLFSSL_MEMORY) && !defined(FREERTOS) #if defined(USE_WOLFSSL_MEMORY) && !defined(FREERTOS)
#if !defined(WOLFSSL_NO_MALLOC) && !defined(WOLFSSL_LINUXKM) && !defined(WOLFSSL_STATIC_MEMORY) #if !defined(WOLFSSL_NO_MALLOC) && !defined(WOLFSSL_LINUXKM) && \
!defined(WOLFSSL_STATIC_MEMORY)
static int malloc_cnt = 0; static int malloc_cnt = 0;
static int realloc_cnt = 0; static int realloc_cnt = 0;
static int free_cnt = 0; static int free_cnt = 0;
@ -39122,7 +39123,8 @@ static void *my_Realloc_cb(void *ptr, size_t size)
WOLFSSL_TEST_SUBROUTINE int memcb_test(void) WOLFSSL_TEST_SUBROUTINE int memcb_test(void)
{ {
int ret = 0; int ret = 0;
#if !defined(WOLFSSL_NO_MALLOC) && !defined(WOLFSSL_LINUXKM) && !defined(WOLFSSL_STATIC_MEMORY) #if !defined(WOLFSSL_NO_MALLOC) && !defined(WOLFSSL_LINUXKM) && \
!defined(WOLFSSL_STATIC_MEMORY)
byte* b = NULL; byte* b = NULL;
#endif #endif
wolfSSL_Malloc_cb mc; wolfSSL_Malloc_cb mc;
@ -39133,7 +39135,8 @@ WOLFSSL_TEST_SUBROUTINE int memcb_test(void)
if (wolfSSL_GetAllocators(&mc, &fc, &rc) != 0) if (wolfSSL_GetAllocators(&mc, &fc, &rc) != 0)
return -13800; return -13800;
#if !defined(WOLFSSL_NO_MALLOC) && !defined(WOLFSSL_LINUXKM) && !defined(WOLFSSL_STATIC_MEMORY) #if !defined(WOLFSSL_NO_MALLOC) && !defined(WOLFSSL_LINUXKM) && \
!defined(WOLFSSL_STATIC_MEMORY)
/* test realloc */ /* test realloc */
b = (byte*)XREALLOC(b, 1024, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); b = (byte*)XREALLOC(b, 1024, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
@ -39162,8 +39165,14 @@ WOLFSSL_TEST_SUBROUTINE int memcb_test(void)
ret = -13803; ret = -13803;
#endif /* !WOLFSSL_NO_MALLOC */ #endif /* !WOLFSSL_NO_MALLOC */
#if !defined(WOLFSSL_NO_MALLOC) && !defined(WOLFSSL_LINUXKM) && !defined(WOLFSSL_STATIC_MEMORY) #if !defined(WOLFSSL_NO_MALLOC) && !defined(WOLFSSL_LINUXKM) && \
!defined(WOLFSSL_STATIC_MEMORY)
exit_memcb: exit_memcb:
/* reset malloc/free/realloc counts */
malloc_cnt = 0;
free_cnt = 0;
realloc_cnt = 0;
#endif #endif
/* restore memory callbacks */ /* restore memory callbacks */