author | mickeyl <mickeyl> | 2004-02-27 23:12:01 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-02-27 23:12:01 (UTC) |
commit | 99d1378aeaad7613b820d5c3b55911c77a01d7c5 (patch) (side-by-side diff) | |
tree | 4d509df258c29f19f7d1502db185fd1b02339cba /noncore/settings/sysinfo/benchmarkinfo.cpp | |
parent | ef5dd6301fee8abe99320d3151f4aae1b4e9e776 (diff) | |
download | opie-99d1378aeaad7613b820d5c3b55911c77a01d7c5.zip opie-99d1378aeaad7613b820d5c3b55911c77a01d7c5.tar.gz opie-99d1378aeaad7613b820d5c3b55911c77a01d7c5.tar.bz2 |
ram,cf and sd seem to work now. didn't test on a PDA yet though ;)
Diffstat (limited to 'noncore/settings/sysinfo/benchmarkinfo.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/sysinfo/benchmarkinfo.cpp | 96 |
1 files changed, 27 insertions, 69 deletions
diff --git a/noncore/settings/sysinfo/benchmarkinfo.cpp b/noncore/settings/sysinfo/benchmarkinfo.cpp index 3dd4121..69d8229 100644 --- a/noncore/settings/sysinfo/benchmarkinfo.cpp +++ b/noncore/settings/sysinfo/benchmarkinfo.cpp @@ -19,2 +19,3 @@ /* OPIE */ +#include <opie2/ostorageinfo.h> #include <qpe/qpeapplication.h> @@ -55,2 +56,5 @@ extern "C" +#define BUFF_SIZE 8192 +#define FILE_SIZE 1024 * 1024 // 1Mb + //=========================================================================== @@ -156,18 +160,11 @@ void BenchmarkInfo::run() - if ( test_ram->isOn() ) + if ( test_ram->isOn() ) // /tmp is supposed to be in RAM on a PDA { - t.start(); - writeFile( "/tmp/benchmarkFile.dat" ); // /tmp is supposed to be in RAM on a PDA - readFile( "/tmp/benchmarkFile.dat" ); - QFile::remove( "/tmp/benchmarkFile.dat" ); - test_ram->setText( 1, QString( "%1 secs" ).arg( QString::number( t.elapsed() / 1000.0 ) ) ); - test_ram->setOn( false ); + performFileTest( "/tmp/benchmarkFile.dat", test_ram ); } -/* + if ( test_cf->isOn() ) { - t.start(); - benchInteger(); - test_alu->setText( 1, QString( "%1 secs" ).arg( QString::number( t.elapsed() / 1000.0 ) ) ); - test_alu->setOn( false ); + OStorageInfo storage; + performFileTest( storage.cfPath() + "/benchmarkFile.dat", test_cf ); } @@ -176,15 +173,6 @@ void BenchmarkInfo::run() { - t.start(); - benchInteger(); - test_alu->setText( 1, QString( "%1 secs" ).arg( QString::number( t.elapsed() / 1000.0 ) ) ); - test_alu->setOn( false ); + OStorageInfo storage; + performFileTest( storage.sdPath() + "/benchmarkFile.dat", test_sd ); } - if ( ( which_clipb ) && ( buf.length() > 0 ) ) - { - clb = QApplication::clipboard(); - clb->setText( dt_buf + buf ); - } - */ - startButton->setText( tr( "&Start Tests!" ) ); @@ -290,8 +278,18 @@ int BenchmarkInfo::gfxRendering( int seconds ) -// ********************************************************************** -// Read & Write -// v2.0.0 -// ********************************************************************** -#define BUFF_SIZE 8192 -#define FILE_SIZE 1024 * 1024 // 1Mb +void BenchmarkInfo::performFileTest( const QString& fname, QCheckListItem* item ) +{ + QTime time; + time.start(); + if ( writeFile( fname ) && + readFile( fname ) ) + { + QFile::remove( fname ); + item->setText( 1, QString( "%1 kb/sec" ).arg( QString::number( 1024.0 / ( time.elapsed() / 1000.0 ) ) ) ); + item->setOn( false ); + } + else + { + item->setText( 1, tr( "error" ) ); + } +} @@ -365,43 +363,3 @@ bool BenchmarkInfo::writeFile( const QString& w_path ) return ( true ); - // ------------------------------------*/ - - /* ---------------------------------- - srand( time( NULL ) ); - FILE *fp; - - for( n= 0 ; n < 40 ; n++ ) - { - if (( fp = fopen( w_path, "wt" )) == NULL ) - return( false ); - memset( FileBuf, '\0', BUFF_SIZE+1 ); - // ------------------------------------------ sequential write - for( i= 0 ; i < FILE_SIZE / BUFF_SIZE ; i++ ) - { - for( k= 0 ; k < 128 ; k++ ) - { - n = rand() % 30; - memcpy( &FileBuf[k*8], &data[n], 32 ); - } - fputs( FileBuf, fp ); - } - // ------------------------------------------ random write - for( i= 0 ; i < 300 ; i++ ) - { - memset( FileBuf, '\0', 130 ); - len = rand() % 120 + 8; - for( k= 0 ; k < 16 ; k++ ) - { - n = rand() % 54; - memcpy( &FileBuf[k*8], &data[n], 8 ); - } - pos = rand() % ( FILE_SIZE / BUFF_SIZE - BUFF_SIZE ); - - fseek( fp, pos, SEEK_SET ); - fputs( FileBuf, fp ); - } - fclose( fp ); - } - return( true ); - -------------------------------------*/ } |