cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-10-30 19:20:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add back timing selftest with new hardclock test

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2014-05-28 11:44:20 +02:00 committed by Paul Bakker
parent 7792198a46
commit e1ac0f8c5d
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
library/timing.c
View File

@ -336,6 +336,25 @@ void m_sleep( int milliseconds )
#include "polarssl/net.h" #include "polarssl/net.h"
#endif #endif
/*
* Busy-waits for the given number of milliseconds.
* Used for testing hardclock.
*/
static void busy_msleep( unsigned long msec )
{
struct hr_time hires;
unsigned long i = 0; /* for busy-waiting */
volatile unsigned long j; /* to prevent optimisation */
(void) get_timer( &hires, 1 );
while( get_timer( &hires, 0 ) < msec )
i++;
j = i;
(void) j;
}
/* /*
* Checkup routine * Checkup routine
* *
@ -350,7 +369,7 @@ int timing_self_test( int verbose )
struct hr_time hires; struct hr_time hires;
if( verbose != 0) if( verbose != 0)
polarssl_printf( " TIMING tests warning: will take some time!\n" ); polarssl_printf( " TIMING tests note: will take some time!\n" );
if( verbose != 0 ) if( verbose != 0 )
polarssl_printf( " TIMING test #1 (m_sleep / get_timer): " ); polarssl_printf( " TIMING test #1 (m_sleep / get_timer): " );
@ -401,7 +420,7 @@ int timing_self_test( int verbose )
polarssl_printf( "passed\n" ); polarssl_printf( "passed\n" );
if( verbose != 0 ) if( verbose != 0 )
polarssl_printf( " TIMING test #3 (hardclock / m_sleep ): " ); polarssl_printf( " TIMING test #3 (hardclock / get_timer): " );
/* /*
* Allow one failure for possible counter wrapping. * Allow one failure for possible counter wrapping.
@ -420,15 +439,17 @@ hard_test:
} }
/* Get a reference ratio cycles/ms */ /* Get a reference ratio cycles/ms */
millisecs = 1;
cycles = hardclock(); cycles = hardclock();
m_sleep( 1 ); busy_msleep( millisecs );
cycles = hardclock() - cycles; cycles = hardclock() - cycles;
ratio = cycles / 1; ratio = cycles / millisecs;
/* Check that the ratio is mostly constant */
for( millisecs = 2; millisecs <= 4; millisecs++ ) for( millisecs = 2; millisecs <= 4; millisecs++ )
{ {
cycles = hardclock(); cycles = hardclock();
m_sleep( millisecs ); busy_msleep( millisecs );
cycles = hardclock() - cycles; cycles = hardclock() - cycles;
/* Allow variation up to 20% */ /* Allow variation up to 20% */
@ -443,9 +464,6 @@ hard_test:
if( verbose != 0 ) if( verbose != 0 )
polarssl_printf( "passed\n" ); polarssl_printf( "passed\n" );
if( verbose != 0 )
polarssl_printf( "\n" );
#if defined(POLARSSL_NET_C) #if defined(POLARSSL_NET_C)
if( verbose != 0 ) if( verbose != 0 )
polarssl_printf( " TIMING test #4 (net_usleep/ get_timer): " ); polarssl_printf( " TIMING test #4 (net_usleep/ get_timer): " );
@ -471,6 +489,9 @@ hard_test:
polarssl_printf( "passed\n" ); polarssl_printf( "passed\n" );
#endif /* POLARSSL_NET_C */ #endif /* POLARSSL_NET_C */
if( verbose != 0 )
polarssl_printf( "\n" );
return( 0 ); return( 0 );
} }

5
programs/test/selftest.c
View File

@ -205,10 +205,7 @@ int main( int argc, char *argv[] )
#endif #endif
#endif #endif
/* #if defined(POLARSSL_TIMING_C)
* Not reliable enough yet
*/
#if 0 && defined(POLARSSL_TIMING_C)
if( ( ret = timing_self_test( v ) ) != 0 ) if( ( ret = timing_self_test( v ) ) != 0 )
return( ret ); return( ret );
#endif #endif