summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sysinfo/benchmarkinfo.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/settings/sysinfo/benchmarkinfo.cpp b/noncore/settings/sysinfo/benchmarkinfo.cpp
index fde032a..793fcb1 100644
--- a/noncore/settings/sysinfo/benchmarkinfo.cpp
+++ b/noncore/settings/sysinfo/benchmarkinfo.cpp
@@ -1,408 +1,408 @@
1/********************************************************************** 1/**********************************************************************
2** BenchmarkInfo 2** BenchmarkInfo
3** 3**
4** A benchmark widget for Qt/Embedded 4** A benchmark widget for Qt/Embedded
5** 5**
6** Copyright (C) 2004 Michael Lauer <mickey@vanille.de> 6** Copyright (C) 2004 Michael Lauer <mickey@vanille.de>
7** Inspired by ZBench (C) 2002 Satoshi <af230533@im07.alpha-net.ne.jp> 7** Inspired by ZBench (C) 2002 Satoshi <af230533@im07.alpha-net.ne.jp>
8** 8**
9** This file may be distributed and/or modified under the terms of the 9** This file may be distributed and/or modified under the terms of the
10** GNU General Public License version 2 as published by the Free Software 10** GNU General Public License version 2 as published by the Free Software
11** Foundation and appearing in the file LICENSE.GPL included in the 11** Foundation and appearing in the file LICENSE.GPL included in the
12** packaging of this file. 12** packaging of this file.
13** 13**
14** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 14** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
15** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 15** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
16** 16**
17**********************************************************************/ 17**********************************************************************/
18 18
19#include "benchmarkinfo.h" 19#include "benchmarkinfo.h"
20 20
21/* OPIE */ 21/* OPIE */
22#include <opie2/odebug.h> 22#include <opie2/odebug.h>
23#include <opie2/ostorageinfo.h> 23#include <opie2/ostorageinfo.h>
24#include <opie2/olistview.h> 24#include <opie2/olistview.h>
25#include <qpe/qpeapplication.h> 25#include <qpe/qpeapplication.h>
26#include <qpe/qcopenvelope_qws.h> 26#include <qpe/qcopenvelope_qws.h>
27#include <qpe/qpedecoration_qws.h> 27#include <qpe/qpedecoration_qws.h>
28#include <qpe/resource.h> 28#include <qpe/resource.h>
29#include <qpe/config.h> 29#include <qpe/config.h>
30using namespace Opie::Core; 30using namespace Opie::Core;
31using namespace Opie::Ui; 31using namespace Opie::Ui;
32 32
33/* QT */ 33/* QT */
34#include <qclipboard.h> 34#include <qclipboard.h>
35#include <qcolor.h> 35#include <qcolor.h>
36#include <qcombobox.h> 36#include <qcombobox.h>
37#include <qdirectpainter_qws.h> 37#include <qdirectpainter_qws.h>
38#include <qfile.h> 38#include <qfile.h>
39#include <qtextstream.h> 39#include <qtextstream.h>
40#include <qfiledialog.h> 40#include <qfiledialog.h>
41#include <qlabel.h> 41#include <qlabel.h>
42#include <qlayout.h> 42#include <qlayout.h>
43#include <qpainter.h> 43#include <qpainter.h>
44#include <qpushbutton.h> 44#include <qpushbutton.h>
45#include <qtimer.h> 45#include <qtimer.h>
46#include <qwhatsthis.h> 46#include <qwhatsthis.h>
47 47
48/* STD */ 48/* STD */
49#include <time.h> 49#include <time.h>
50#include <stdio.h> 50#include <stdio.h>
51#include <stdlib.h> 51#include <stdlib.h>
52#include <math.h> 52#include <math.h>
53#if defined (__GNUC__) && (__GNUC__ < 3) 53#if defined (__GNUC__) && (__GNUC__ < 3)
54#define round qRound 54#define round qRound
55#endif 55#endif
56 56
57extern "C" 57extern "C"
58{ 58{
59 void BenchFFT( void ); 59 void BenchFFT( void );
60 double dhry_main( int ); 60 double dhry_main( int );
61} 61}
62 62
63#define DHRYSTONE_RUNS 20000000 63#define DHRYSTONE_RUNS 20000000
64#define TEST_DURATION 3 64#define TEST_DURATION 3
65 65
66//=========================================================================== 66//===========================================================================
67 67
68class BenchmarkPaintWidget : public QWidget 68class BenchmarkPaintWidget : public QWidget
69{ 69{
70 public: 70 public:
71 BenchmarkPaintWidget() : QWidget( 0, "Benchmark Paint Widget", WStyle_Customize|WStyle_StaysOnTop|WPaintUnclipped|WPaintClever ) 71 BenchmarkPaintWidget() : QWidget( 0, "Benchmark Paint Widget", WStyle_Customize|WStyle_StaysOnTop|WPaintUnclipped|WPaintClever )
72 { 72 {
73 resize( QApplication::desktop()->size() ); 73 resize( QApplication::desktop()->size() );
74 show(); 74 show();
75 p.begin( this ); 75 p.begin( this );
76 }; 76 };
77 77
78 ~BenchmarkPaintWidget() 78 ~BenchmarkPaintWidget()
79 { 79 {
80 p.end(); 80 p.end();
81 hide(); 81 hide();
82 }; 82 };
83 83
84 QPainter p; 84 QPainter p;
85}; 85};
86 86
87//=========================================================================== 87//===========================================================================
88 88
89BenchmarkInfo::BenchmarkInfo( QWidget *parent, const char *name, int wFlags ) 89BenchmarkInfo::BenchmarkInfo( QWidget *parent, const char *name, int wFlags )
90 : QWidget( parent, name, wFlags ) 90 : QWidget( parent, name, wFlags )
91{ 91{
92 92
93 setMinimumSize( 200, 150 ); 93 setMinimumSize( 200, 150 );
94 94
95 QVBoxLayout* vb = new QVBoxLayout( this ); 95 QVBoxLayout* vb = new QVBoxLayout( this );
96 vb->setSpacing( 4 ); 96 vb->setSpacing( 4 );
97 vb->setMargin( 4 ); 97 vb->setMargin( 4 );
98 98
99 tests = new OListView( this ); 99 tests = new OListView( this );
100 QWhatsThis::add( tests->viewport(), tr( "This area shows the available tests, the results for which the tests " 100 QWhatsThis::add( tests->viewport(), tr( "This area shows the available tests, the results for which the tests "
101 "have been performed, and comparison values for one selected device. " 101 "have been performed, and comparison values for one selected device. "
102 "Use the checkboxes to define which tests you want to perform." ) ); 102 "Use the checkboxes to define which tests you want to perform." ) );
103 tests->setMargin( 0 ); 103 tests->setMargin( 0 );
104 tests->addColumn( tr( "Tests" ) ); 104 tests->addColumn( tr( "Tests" ) );
105 tests->addColumn( tr( "Results" ) ); 105 tests->addColumn( tr( "Results" ) );
106 tests->addColumn( tr( "Comparison" ) ); 106 tests->addColumn( tr( "Comparison" ) );
107 tests->setShowSortIndicator( true ); 107 tests->setShowSortIndicator( true );
108 108
109 test_alu = new OCheckListItem( tests, tr( "1. Integer Arithmetic " ), OCheckListItem::CheckBox ); 109 test_alu = new OCheckListItem( tests, tr( "1. Integer Arithmetic " ), OCheckListItem::CheckBox );
110 test_fpu = new OCheckListItem( tests, tr( "2. Floating Point Unit " ), OCheckListItem::CheckBox ); 110 test_fpu = new OCheckListItem( tests, tr( "2. Floating Point Unit " ), OCheckListItem::CheckBox );
111 test_txt = new OCheckListItem( tests, tr( "3. Text Rendering " ), OCheckListItem::CheckBox ); 111 test_txt = new OCheckListItem( tests, tr( "3. Text Rendering " ), OCheckListItem::CheckBox );
112 test_gfx = new OCheckListItem( tests, tr( "4. Gfx Rendering " ), OCheckListItem::CheckBox ); 112 test_gfx = new OCheckListItem( tests, tr( "4. Gfx Rendering " ), OCheckListItem::CheckBox );
113 test_ram = new OCheckListItem( tests, tr( "5. RAM Performance " ), OCheckListItem::CheckBox ); 113 test_ram = new OCheckListItem( tests, tr( "5. RAM Performance " ), OCheckListItem::CheckBox );
114#ifndef QT_QWS_RAMSES 114#ifndef QT_QWS_RAMSES
115 test_sd = new OCheckListItem( tests, tr( "6. SD Card Performance " ), OCheckListItem::CheckBox ); 115 test_sd = new OCheckListItem( tests, tr( "6. SD Card Performance " ), OCheckListItem::CheckBox );
116 test_cf = new OCheckListItem( tests, tr( "7. CF Card Performance " ), OCheckListItem::CheckBox ); 116 test_cf = new OCheckListItem( tests, tr( "7. CF Card Performance " ), OCheckListItem::CheckBox );
117#endif 117#endif
118 test_alu->setText( 1, "n/a" ); 118 test_alu->setText( 1, "n/a" );
119 test_fpu->setText( 1, "n/a" ); 119 test_fpu->setText( 1, "n/a" );
120 test_txt->setText( 1, "n/a" ); 120 test_txt->setText( 1, "n/a" );
121 test_gfx->setText( 1, "n/a" ); 121 test_gfx->setText( 1, "n/a" );
122 test_ram->setText( 1, "n/a" ); 122 test_ram->setText( 1, "n/a" );
123#ifndef QT_QWS_RAMSES 123#ifndef QT_QWS_RAMSES
124 test_sd->setText( 1, "n/a" ); 124 test_sd->setText( 1, "n/a" );
125 test_cf->setText( 1, "n/a" ); 125 test_cf->setText( 1, "n/a" );
126#endif 126#endif
127 test_alu->setText( 2, "n/a" ); 127 test_alu->setText( 2, "n/a" );
128 test_fpu->setText( 2, "n/a" ); 128 test_fpu->setText( 2, "n/a" );
129 test_txt->setText( 2, "n/a" ); 129 test_txt->setText( 2, "n/a" );
130 test_gfx->setText( 2, "n/a" ); 130 test_gfx->setText( 2, "n/a" );
131 test_ram->setText( 2, "n/a" ); 131 test_ram->setText( 2, "n/a" );
132#ifndef QT_QWS_RAMSES 132#ifndef QT_QWS_RAMSES
133 test_sd->setText( 2, "n/a" ); 133 test_sd->setText( 2, "n/a" );
134 test_cf->setText( 2, "n/a" ); 134 test_cf->setText( 2, "n/a" );
135#endif 135#endif
136 136
137 startButton = new QPushButton( tr( "&Start Tests!" ), this ); 137 startButton = new QPushButton( tr( "&Start Tests!" ), this );
138 QWhatsThis::add( startButton, tr( "Click here to perform the selected tests." ) ); 138 QWhatsThis::add( startButton, tr( "Click here to perform the selected tests." ) );
139 connect( startButton, SIGNAL( clicked() ), this, SLOT( run() ) ); 139 connect( startButton, SIGNAL( clicked() ), this, SLOT( run() ) );
140 vb->addWidget( tests, 2 ); 140 vb->addWidget( tests, 2 );
141 141
142 QHBoxLayout* hb = new QHBoxLayout( vb ); 142 QHBoxLayout* hb = new QHBoxLayout( vb );
143 hb->addWidget( startButton, 2 ); 143 hb->addWidget( startButton, 2 );
144 144
145 QFile f( QPEApplication::qpeDir() + "/share/sysinfo/results" ); 145 QFile f( QPEApplication::qpeDir() + "/share/sysinfo/results" );
146 if ( f.open( IO_ReadOnly ) ) 146 if ( f.open( IO_ReadOnly ) )
147 { 147 {
148 machineCombo = new QComboBox( this ); 148 machineCombo = new QComboBox( this );
149 QWhatsThis::add( machineCombo, tr( "Choose a model to compare your results with." ) ); 149 QWhatsThis::add( machineCombo, tr( "Choose a model to compare your results with." ) );
150 150
151 QTextStream ts( &f ); 151 QTextStream ts( &f );
152 while( !ts.eof() ) 152 while( !ts.eof() )
153 { 153 {
154 QString machline = ts.readLine(); 154 QString machline = ts.readLine();
155 odebug << "sysinfo: parsing benchmark results for '" << machline << "'" << oendl; 155 odebug << "sysinfo: parsing benchmark results for '" << machline << "'" << oendl;
156 QString resline = ts.readLine(); 156 QString resline = ts.readLine();
157 machines.insert( machline, new QStringList( QStringList::split( ",", resline ) ) ); 157 machines.insert( machline, new QStringList( QStringList::split( ",", resline ) ) );
158 machineCombo->insertItem( machline ); 158 machineCombo->insertItem( machline );
159 } 159 }
160 160
161 hb->addWidget( new QLabel( tr( "Compare:" ), this ) ); 161 hb->addWidget( new QLabel( tr( "Compare:" ), this ) );
162 hb->addWidget( machineCombo, 2 ); 162 hb->addWidget( machineCombo, 2 );
163 connect( machineCombo, SIGNAL( activated(int) ), this, SLOT( machineActivated(int) ) ); 163 connect( machineCombo, SIGNAL( activated(int) ), this, SLOT( machineActivated(int) ) );
164 } 164 }
165} 165}
166 166
167 167
168BenchmarkInfo::~BenchmarkInfo() 168BenchmarkInfo::~BenchmarkInfo()
169{} 169{}
170 170
171 171
172void BenchmarkInfo::machineActivated( int index ) 172void BenchmarkInfo::machineActivated( int index )
173{ 173{
174 QStringList* results = machines[ machineCombo->text( index ) ]; 174 QStringList* results = machines[ machineCombo->text( index ) ];
175 if ( !results ) 175 if ( !results )
176 { 176 {
177 odebug << "sysinfo: no results available." << oendl; 177 odebug << "sysinfo: no results available." << oendl;
178 return; 178 return;
179 } 179 }
180 QStringList::Iterator it = results->begin(); 180 QStringList::Iterator it = results->begin();
181 test_alu->setText( 2, *(it++) ); 181 test_alu->setText( 2, *(it++) );
182 test_fpu->setText( 2, *(it++) ); 182 test_fpu->setText( 2, *(it++) );
183 test_txt->setText( 2, *(it++) ); 183 test_txt->setText( 2, *(it++) );
184 test_gfx->setText( 2, *(it++) ); 184 test_gfx->setText( 2, *(it++) );
185 test_ram->setText( 2, *(it++) ); 185 test_ram->setText( 2, *(it++) );
186#ifndef QT_QWS_RAMSES 186#ifndef QT_QWS_RAMSES
187 test_sd->setText( 2, *(it++) ); 187 test_sd->setText( 2, *(it++) );
188 test_cf->setText( 2, *(it++) ); 188 test_cf->setText( 2, *(it++) );
189#endif 189#endif
190} 190}
191 191
192 192
193void BenchmarkInfo::run() 193void BenchmarkInfo::run()
194{ 194{
195 startButton->setText( "> Don't touch! <" ); 195 startButton->setText( "> Don't touch! <" );
196 qApp->processEvents(); 196 qApp->processEvents();
197 QTime t; 197 QTime t;
198 198
199 if ( test_alu->isOn() ) 199 if ( test_alu->isOn() )
200 { 200 {
201 int d = round( dhry_main( DHRYSTONE_RUNS ) ); 201 int d = round( dhry_main( DHRYSTONE_RUNS ) );
202 test_alu->setText( 1, QString().sprintf( "%d dhrys", d ) ); 202 test_alu->setText( 1, QString().sprintf( "%d dhrys", d ) );
203 test_alu->setOn( false ); 203 test_alu->setOn( false );
204 } 204 }
205 205
206 if ( test_fpu->isOn() ) 206 if ( test_fpu->isOn() )
207 { 207 {
208 t.start(); 208 t.start();
209 BenchFFT(); 209 BenchFFT();
210 test_fpu->setText( 1, QString().sprintf( "%.2f secs", t.elapsed() / 1000.0 ) );; 210 test_fpu->setText( 1, QString().sprintf( "%.2f secs", t.elapsed() / 1000.0 ) );;
211 test_fpu->setOn( false ); 211 test_fpu->setOn( false );
212 } 212 }
213 213
214 if ( test_txt->isOn() ) 214 if ( test_txt->isOn() )
215 { 215 {
216 int value = textRendering( TEST_DURATION ); 216 int value = textRendering( TEST_DURATION );
217 test_txt->setText( 1, QString().sprintf( "%d chars/sec", value / TEST_DURATION ) ); 217 test_txt->setText( 1, QString().sprintf( "%d chars/sec", value / TEST_DURATION ) );
218 test_txt->setOn( false ); 218 test_txt->setOn( false );
219 } 219 }
220 220
221 if ( test_gfx->isOn() ) 221 if ( test_gfx->isOn() )
222 { 222 {
223 int value = gfxRendering( TEST_DURATION ); 223 int value = gfxRendering( TEST_DURATION );
224 test_gfx->setText( 1, QString().sprintf( "%.2f gops/sec", value / 4.0 / TEST_DURATION ) ); // 4 tests 224 test_gfx->setText( 1, QString().sprintf( "%.2f gops/sec", value / 4.0 / TEST_DURATION ) ); // 4 tests
225 test_gfx->setOn( false ); 225 test_gfx->setOn( false );
226 } 226 }
227 227
228 if ( test_ram->isOn() ) // /tmp is supposed to be in RAM on a PDA 228 if ( test_ram->isOn() ) // /tmp is supposed to be in RAM on a PDA
229 { 229 {
230 performFileTest( "/tmp/benchmarkFile.dat", test_ram ); 230 performFileTest( "/tmp/benchmarkFile.dat", test_ram );
231 } 231 }
232 232
233#ifndef QT_QWS_RAMSES 233#ifndef QT_QWS_RAMSES
234 if ( test_cf->isOn() ) 234 if ( test_cf->isOn() )
235 { 235 {
236 OStorageInfo storage; 236 OStorageInfo storage;
237 performFileTest( storage.cfPath() + "/benchmarkFile.dat", test_cf ); 237 performFileTest( storage.cfPath() + "/benchmarkFile.dat", test_cf );
238 } 238 }
239 239
240 if ( test_sd->isOn() ) 240 if ( test_sd->isOn() )
241 { 241 {
242 OStorageInfo storage; 242 OStorageInfo storage;
243 performFileTest( storage.sdPath() + "/benchmarkFile.dat", test_sd ); 243 performFileTest( storage.sdPath() + "/benchmarkFile.dat", test_sd );
244 } 244 }
245#endif 245#endif
246 246
247 startButton->setText( tr( "&Start Tests!" ) ); 247 startButton->setText( tr( "&Start Tests!" ) );
248} 248}
249 249
250 250
251int BenchmarkInfo::textRendering( int seconds ) 251int BenchmarkInfo::textRendering( int seconds )
252{ 252{
253 QTime t; 253 QTime t;
254 t.start(); 254 t.start();
255 int stop = t.elapsed() + seconds * 1000; 255 int stop = t.elapsed() + seconds * 1000;
256 256
257 int rr[] = { 255, 255, 255, 0, 0, 0, 0, 128, 128 }; 257 int rr[] = { 255, 255, 255, 0, 0, 0, 0, 128, 128 };
258 int gg[] = { 0, 255, 0, 0, 255, 255, 0, 128, 128 }; 258 int gg[] = { 0, 255, 0, 0, 255, 255, 0, 128, 128 };
259 int bb[] = { 0, 0, 255, 0, 0, 255, 255, 128, 0 }; 259 int bb[] = { 0, 0, 255, 0, 0, 255, 255, 128, 0 };
260 const QString text( "Opie Benchmark Test" ); 260 const QString text( "Opie Benchmark Test" );
261 261
262 int w = QApplication::desktop()->width(); 262 int w = QApplication::desktop()->width();
263 int h = QApplication::desktop()->height(); 263 int h = QApplication::desktop()->height();
264 264
265 srand( time( NULL ) ); 265 srand( time( NULL ) );
266 266
267 BenchmarkPaintWidget bpw; 267 BenchmarkPaintWidget bpw;
268 268
269 int loops = 0; 269 int loops = 0;
270 270
271 while ( t.elapsed() < stop ) 271 while ( t.elapsed() < stop )
272 { 272 {
273 int k = rand() % 9; 273 int k = rand() % 9;
274 int s = rand() % 100; 274 int s = rand() % 100;
275 bpw.p.setPen( QColor( rr[ k ], gg[ k ], bb[ k ] ) ); 275 bpw.p.setPen( QColor( rr[ k ], gg[ k ], bb[ k ] ) );
276 bpw.p.setFont( QFont( "Vera", s ) ); 276 bpw.p.setFont( QFont( "Vera", s ) );
277 bpw.p.drawText( rand() % w, rand() % h, text, text.length() ); 277 bpw.p.drawText( rand() % w, rand() % h, text, text.length() );
278 ++loops; 278 ++loops;
279 } 279 }
280 280
281 return loops * text.length(); 281 return loops * text.length();
282} 282}
283 283
284int BenchmarkInfo::gfxRendering( int seconds ) 284int BenchmarkInfo::gfxRendering( int seconds )
285{ 285{
286 int rr[] = { 255, 255, 255, 0, 0, 0, 0, 128, 128 }; 286 int rr[] = { 255, 255, 255, 0, 0, 0, 0, 128, 128 };
287 int gg[] = { 0, 255, 0, 0, 255, 255, 0, 128, 128 }; 287 int gg[] = { 0, 255, 0, 0, 255, 255, 0, 128, 128 };
288 int bb[] = { 0, 0, 255, 0, 0, 255, 255, 128, 0 }; 288 int bb[] = { 0, 0, 255, 0, 0, 255, 255, 128, 0 };
289 289
290 int w = QApplication::desktop()->width(); 290 int w = QApplication::desktop()->width();
291 int h = QApplication::desktop()->height(); 291 int h = QApplication::desktop()->height();
292 292
293 srand( time( NULL ) ); 293 srand( time( NULL ) );
294 294
295 BenchmarkPaintWidget bpw; 295 BenchmarkPaintWidget bpw;
296 296
297 QTime t; 297 QTime t;
298 t.start(); 298 t.start();
299 int stop = t.elapsed() + seconds*1000; 299 int stop = t.elapsed() + seconds*1000;
300 int loops = 0; 300 int loops = 0;
301 301
302 while ( t.elapsed() < stop ) 302 while ( t.elapsed() < stop )
303 { 303 {
304 int k = rand() % 9; 304 int k = rand() % 9;
305 bpw.p.setPen( QColor( rr[ k ], gg[ k ], bb[ k ] ) ); 305 bpw.p.setPen( QColor( rr[ k ], gg[ k ], bb[ k ] ) );
306 bpw.p.drawLine( rand()%w, rand()%h, rand()%w, rand()%h ); 306 bpw.p.drawLine( rand()%w, rand()%h, rand()%w, rand()%h );
307 ++loops; 307 ++loops;
308 } 308 }
309 309
310 t.restart(); 310 t.restart();
311 stop = t.elapsed() + seconds*1000; 311 stop = t.elapsed() + seconds*1000;
312 312
313 while ( t.elapsed() < stop ) 313 while ( t.elapsed() < stop )
314 { 314 {
315 int k = rand() % 9; 315 int k = rand() % 9;
316 bpw.p.setPen( QColor( rr[ k ], gg[ k ], bb[ k ] ) ); 316 bpw.p.setPen( QColor( rr[ k ], gg[ k ], bb[ k ] ) );
317 bpw.p.drawArc( rand()%w, rand()%h, rand()%w, rand()%h, 360 * 16, 360 * 16 ); 317 bpw.p.drawArc( rand()%w, rand()%h, rand()%w, rand()%h, 360 * 16, 360 * 16 );
318 ++loops; 318 ++loops;
319 } 319 }
320 320
321 QBrush br1; 321 QBrush br1;
322 br1.setStyle( SolidPattern ); 322 br1.setStyle( SolidPattern );
323 t.restart(); 323 t.restart();
324 stop = t.elapsed() + seconds*1000; 324 stop = t.elapsed() + seconds*1000;
325 325
326 while ( t.elapsed() < stop ) 326 while ( t.elapsed() < stop )
327 { 327 {
328 int k = rand() % 9; 328 int k = rand() % 9;
329 br1.setColor( QColor( rr[ k ], gg[ k ], bb[ k ] ) ); 329 br1.setColor( QColor( rr[ k ], gg[ k ], bb[ k ] ) );
330 bpw.p.fillRect( rand()%w, rand()%h, rand()%w, rand()%h, br1 ); 330 bpw.p.fillRect( rand()%w, rand()%h, rand()%w, rand()%h, br1 );
331 ++loops; 331 ++loops;
332 } 332 }
333 333
334 QPixmap p = Resource::loadPixmap( "sysinfo/pattern" ); 334 QPixmap p = Resource::loadPixmap( "sysinfo/pattern" );
335 t.restart(); 335 t.restart();
336 stop = t.elapsed() + seconds*1000; 336 stop = t.elapsed() + seconds*1000;
337 337
338 while ( t.elapsed() < stop ) 338 while ( t.elapsed() < stop )
339 { 339 {
340 bpw.p.drawPixmap( rand()%w, rand()%h, p ); 340 bpw.p.drawPixmap( rand()%w, rand()%h, p );
341 ++loops; 341 ++loops;
342 } 342 }
343 343
344 return loops; 344 return loops;
345 345
346} 346}
347 347
348const unsigned int FILE_TEST_COUNT = 8000; 348const unsigned int FILE_TEST_COUNT = 8000;
349const unsigned int FILE_TEST_BLOCKSIZE = 1024; 349const unsigned int FILE_TEST_BLOCKSIZE = 1024;
350 350
351void BenchmarkInfo::performFileTest( const QString& fname, OCheckListItem* item ) 351void BenchmarkInfo::performFileTest( const QString& fname, OCheckListItem* item )
352{ 352{
353 QString filename = fname == "/benchmarkFile.dat" ? QString( "/tmp/bla" ) : fname; 353 QString filename = fname == "/benchmarkFile.dat" ? QString( "/tmp/bla" ) : fname;
354 odebug << "performing file test on " << filename << oendl; 354 odebug << "performing file test on " << filename << oendl;
355 355
356 QString writeCommand = QString( "dd if=/dev/zero of=%1 count=%2 bs=%3 && sync" ).arg( filename ) 356 QString writeCommand = QString( "dd if=/dev/zero of=%1 count=%2 bs=%3 && sync" ).arg( filename )
357 .arg( FILE_TEST_COUNT ) 357 .arg( FILE_TEST_COUNT )
358 .arg( FILE_TEST_BLOCKSIZE ); 358 .arg( FILE_TEST_BLOCKSIZE );
359 QString readCommand = QString( "dd if=%1 of=/dev/null count=%2 bs=%3").arg( filename ) 359 QString readCommand = QString( "dd if=%1 of=/dev/null count=%2 bs=%3").arg( filename )
360 .arg( FILE_TEST_COUNT ) 360 .arg( FILE_TEST_COUNT )
361 .arg( FILE_TEST_BLOCKSIZE ); 361 .arg( FILE_TEST_BLOCKSIZE );
362 ::system( "sync" ); 362 ::system( "sync" );
363 odebug << "performing file test on " << filename << oendl; 363 odebug << "performing file test on " << filename << oendl;
364 364
365 int write = 0; 365 int write = 0;
366 int read = 0; 366 int read = 0;
367 367
368 QTime time; 368 QTime time;
369 time.start(); 369 time.start();
370 if ( ::system( writeCommand ) == 0 ) 370 if ( ::system( writeCommand ) == 0 )
371 { 371 {
372 write = time.elapsed(); 372 write = time.elapsed();
373 } 373 }
374 else 374 else
375 { 375 {
376 item->setText( 1, tr( "error" ) ); 376 item->setText( 1, tr( "error" ) );
377 return; 377 return;
378 } 378 }
379 379
380 time.restart(); 380 time.restart();
381 if ( ::system( readCommand ) == 0 ) 381 if ( ::system( readCommand ) == 0 )
382 { 382 {
383 read = time.elapsed(); 383 read = time.elapsed();
384 } 384 }
385 else 385 else
386 { 386 {
387 item->setText( 1, tr( "error" ) ); 387 item->setText( 1, tr( "error" ) );
388 return; 388 return;
389 } 389 }
390 390
391 QFile::remove( filename ); 391 QFile::remove( filename );
392 double readSpeed = FILE_TEST_COUNT / ( read / 1000.0 ); 392 double readSpeed = FILE_TEST_COUNT / ( read / 1000.0 );
393 QString readUnit = "kB/s"; 393 QString readUnit = "kB/s";
394 if ( readSpeed > 1024 ) 394 if ( readSpeed > 1024 )
395 { 395 {
396 readSpeed /= 1024.0; 396 readSpeed /= 1024.0;
397 readUnit = "MB/s"; 397 readUnit = "MB/s";
398 } 398 }
399 double writeSpeed = FILE_TEST_COUNT / ( write / 1000.0 ); 399 double writeSpeed = FILE_TEST_COUNT / ( write / 1000.0 );
400 QString writeUnit = "kb/s"; 400 QString writeUnit = "kb/s";
401 if ( writeSpeed > 1024 ) 401 if ( writeSpeed > 1024 )
402 { 402 {
403 writeSpeed /= 1024.0; 403 writeSpeed /= 1024.0;
404 writeUnit = "MB/s"; 404 writeUnit = "MB/s";
405 } 405 }
406 item->setText( 1, QString().sprintf( "%.2f %s, %.2f %s", readSpeed, readUnit.latin1(), writeSpeed, writeUnit.latin1() ) ); 406 item->setText( 1, QString().sprintf( "%.2f %s; %.2f %s", readSpeed, readUnit.latin1(), writeSpeed, writeUnit.latin1() ) );
407 item->setOn( false ); 407 item->setOn( false );
408} 408}