Update of /cvsroot/compbench/CompBenchmarks++/Benchmark
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv2505
Modified Files:
Benchmark.cpp Benchmark.h
Log Message:
API changes on CBM::Benchmark
Index: Benchmark.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Benchmark.h 18 Jan 2007 18:44:01 -0000 1.17
--- Benchmark.h 21 Jan 2007 21:27:21 -0000 1.18
***************
*** 57,65 ****
\return a std::string representing current benchmark's identification
(e.g. gzip-1c) */
! virtual std::string benchmarkName(void) = 0;
/** Benchmark comments
\return a std::string containing comments about current benchmark */
! virtual std::string benchmarkComments(void) = 0;
/** Run benchmark.
--- 57,65 ----
\return a std::string representing current benchmark's identification
(e.g. gzip-1c) */
! virtual std::string Name(void) = 0;
/** Benchmark comments
\return a std::string containing comments about current benchmark */
! virtual std::string Comments(void) = 0;
/** Run benchmark.
Index: Benchmark.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Benchmark.cpp 21 Jan 2007 21:16:01 -0000 1.21
--- Benchmark.cpp 21 Jan 2007 21:27:21 -0000 1.22
***************
*** 15,24 ****
void Benchmark::display(void)
{
! std::cout << "benchmark::Name=" << benchmarkName() << std::endl
<< "benchmark::Package=" << Package()->Name() << std::endl
<< "benchmark::Language=" << Package()->language() << std::endl
<< "benchmark::Size=" << Package()->totalSize() << std::endl
<< "benchmark::Status=" << Package()->getStatus() << std::endl
! << "benchmark::Comments=" << benchmarkComments() << std::endl
<< std::endl;
}
--- 15,24 ----
void Benchmark::display(void)
{
! std::cout << "benchmark::Name=" << Name() << std::endl
<< "benchmark::Package=" << Package()->Name() << std::endl
<< "benchmark::Language=" << Package()->language() << std::endl
<< "benchmark::Size=" << Package()->totalSize() << std::endl
<< "benchmark::Status=" << Package()->getStatus() << std::endl
! << "benchmark::Comments=" << Comments() << std::endl
<< std::endl;
}
***************
*** 45,49 ****
if (((Package()->getStatus()<Package::Tested) && (Package()->hasTest())) &&
(UO_enableTestSuite)) {
! info=benchmarkName();
info+=" not tested !";
cbmUI->Information(CBM::UI::BenchTest,
--- 45,49 ----
if (((Package()->getStatus()<Package::Tested) && (Package()->hasTest())) &&
(UO_enableTestSuite)) {
! info=Name();
info+=" not tested !";
cbmUI->Information(CBM::UI::BenchTest,
***************
*** 54,58 ****
cbmUI->Information(CBM::UI::BenchBench,
! benchmarkName());
r=bench();
--- 54,58 ----
cbmUI->Information(CBM::UI::BenchBench,
! Name());
r=bench();
***************
*** 62,66 ****
Package()->storeStatus(Package::Benchmarked);
cbmUI->Information(CBM::UI::BenchResult,
! r);
} else {
info="Benchmarking failed for ";
--- 62,66 ----
Package()->storeStatus(Package::Benchmarked);
cbmUI->Information(CBM::UI::BenchResult,
! r);
} else {
info="Benchmarking failed for ";
|
