From 128657d64525475a14902d2c11c3013cf47ba5b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Thu, 18 Dec 2014 16:35:52 +0000 Subject: [PATCH] Use memory_buffer_alloc() in benchmark if available Allows to measure memory by primitive. --- programs/test/benchmark.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c index 675547b3b..c0c7a11e6 100644 --- a/programs/test/benchmark.c +++ b/programs/test/benchmark.c @@ -61,9 +61,8 @@ #include "polarssl/ecdh.h" #include "polarssl/error.h" -#include -#include -#include +#if defined(POLARSSL_MEMORY_BUFFER_ALLOC_C) +#include "polarssl/memory_buffer_alloc.h" #endif #if defined _MSC_VER && !defined snprintf @@ -182,6 +181,9 @@ int main( int argc, char *argv[] ) unsigned char tmp[200]; char title[TITLE_LEN]; todo_list todo; +#if defined(POLARSSL_MEMORY_BUFFER_ALLOC_C) + unsigned char malloc_buf[1000000] = { 0 }; +#endif if( argc == 1 ) memset( &todo, 1, sizeof( todo ) ); @@ -243,6 +245,9 @@ int main( int argc, char *argv[] ) polarssl_printf( "\n" ); +#if defined(POLARSSL_MEMORY_BUFFER_ALLOC_C) + memory_buffer_alloc_init( malloc_buf, sizeof( malloc_buf ) ); +#endif memset( buf, 0xAA, sizeof( buf ) ); memset( tmp, 0xBB, sizeof( tmp ) ); @@ -642,6 +647,13 @@ int main( int argc, char *argv[] ) #endif polarssl_printf( "\n" ); +#if defined(POLARSSL_MEMORY_BUFFER_ALLOC_C) +#if defined(POLARSSL_MEMORY_DEBUG) + memory_buffer_alloc_status(); +#endif + memory_buffer_alloc_free(); +#endif + #if defined(_WIN32) polarssl_printf( " Press Enter to exit this program.\n" ); fflush( stdout ); getchar();