| -rw-r--r-- | noncore/settings/sysinfo/benchmarkinfo.cpp | 96 | ||||
| -rw-r--r-- | noncore/settings/sysinfo/benchmarkinfo.h | 7 |
2 files changed, 31 insertions, 72 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 @@ -8,24 +8,25 @@ ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** **********************************************************************/ /* OPIE */ +#include <opie2/ostorageinfo.h> #include <qpe/qpeapplication.h> #include <qpe/qcopenvelope_qws.h> #include <qpe/qpedecoration_qws.h> #include <qpe/resource.h> #include <qpe/config.h> /* QT */ #include <qlayout.h> #include <qfiledialog.h> #include <qlabel.h> #include <qpainter.h> #include <qdirectpainter_qws.h> @@ -44,24 +45,27 @@ #include "benchmarkinfo.h" extern "C" { void BenchFFT( void ); double dhry_main( int ); } #define DHRYSTONE_RUNS 20000000 #define TEST_DURATION 3 +#define BUFF_SIZE 8192 +#define FILE_SIZE 1024 * 1024 // 1Mb + //=========================================================================== class BenchmarkPaintWidget : public QWidget { public: BenchmarkPaintWidget() : QWidget( 0, "Benchmark Paint Widget", WStyle_Customize|WStyle_StaysOnTop|WPaintUnclipped|WPaintClever ) { resize( QApplication::desktop()->size() ); show(); p.begin( this ); }; @@ -145,57 +149,41 @@ void BenchmarkInfo::run() int value = textRendering( TEST_DURATION ); test_txt->setText( 1, QString( "%1 chars/sec" ).arg( QString::number( value / TEST_DURATION ) ) ); test_txt->setOn( false ); } if ( test_gfx->isOn() ) { int value = gfxRendering( TEST_DURATION ); test_gfx->setText( 1, QString( "%1 gops/sec" ).arg( QString::number( value / 4 / TEST_DURATION ) ) ); // 4 tests test_gfx->setOn( false ); } - 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 ); } if ( test_sd->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.sdPath() + "/benchmarkFile.dat", test_sd ); } - if ( ( which_clipb ) && ( buf.length() > 0 ) ) - { - clb = QApplication::clipboard(); - clb->setText( dt_buf + buf ); - } - */ - startButton->setText( tr( "&Start Tests!" ) ); } int BenchmarkInfo::textRendering( int seconds ) { QTime t; t.start(); int stop = t.elapsed() + seconds * 1000; int rr[] = { 255, 255, 255, 0, 0, 0, 0, 128, 128 }; int gg[] = { 0, 255, 0, 0, 255, 255, 0, 128, 128 }; @@ -279,30 +267,40 @@ int BenchmarkInfo::gfxRendering( int seconds ) stop = t.elapsed() + seconds*1000; while ( t.elapsed() < stop ) { bpw.p.drawPixmap( rand()%w, rand()%h, p ); ++loops; } return loops; } -// ********************************************************************** -// 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" ) ); + } +} char FileBuf[ BUFF_SIZE + 1 ]; bool BenchmarkInfo::writeFile( const QString& w_path ) { int i; int k; int n; int pos; int len; char *data = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; // 62 @@ -354,65 +352,25 @@ bool BenchmarkInfo::writeFile( const QString& w_path ) w_len = writeFile.writeBlock( FileBuf, len ); if ( w_len != len ) { writeFile.close(); writeFile.remove(); return ( false ); } writeFile.flush(); } writeFile.close(); } 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 ); - -------------------------------------*/ } bool BenchmarkInfo::readFile( const QString& r_path ) { int i; int k; int len; int pos; int r_len; QFile readFile( r_path ); diff --git a/noncore/settings/sysinfo/benchmarkinfo.h b/noncore/settings/sysinfo/benchmarkinfo.h index 55398eb..3c5ca37 100644 --- a/noncore/settings/sysinfo/benchmarkinfo.h +++ b/noncore/settings/sysinfo/benchmarkinfo.h @@ -45,19 +45,20 @@ public: bool sd_rd; bool sd_wt; bool cf_rd; bool cf_wt; QClipboard* clb; QListView* tests; QPushButton* startButton; int textRendering( int ); int gfxRendering( int ); - bool writeFile( const QString& ); - bool readFile( const QString& ); + void performFileTest( const QString& fname, QCheckListItem* item ); private slots: + bool writeFile( const QString& ); + bool readFile( const QString& ); void run(); - }; + |