compbench-devel Mailing List for CompBenchmarks (Page 31)
Brought to you by:
xfred
Menu
▾
▴
compbench-devel
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(48) |
Oct
(51) |
Nov
(66) |
Dec
(83) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(242) |
Feb
(56) |
Mar
(95) |
Apr
(120) |
May
(127) |
Jun
(32) |
Jul
(10) |
Aug
(55) |
Sep
(114) |
Oct
(3) |
Nov
|
Dec
|
|
From: Frederic T. <xf...@us...> - 2007-01-22 17:40:36
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3137/libcompbenchmarks Log Message: Directory /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks added to the repository |
|
From: Frederic T. <xf...@us...> - 2007-01-22 17:21:23
|
Update of /cvsroot/compbench/CompBenchmarks++/Benchmark In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27968 Modified Files: Package.cpp Package.h Log Message: buildTime() method added to get last make() duration in seconds. Index: Package.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Package.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Package.cpp 21 Jan 2007 21:16:02 -0000 1.8 --- Package.cpp 22 Jan 2007 17:21:14 -0000 1.9 *************** *** 469,473 **** if (r) { end=system->Time(); ! std::cout << "Build time : " << (double) (end-beg) << std::endl; storeStatus(Made); storeContext(currentCompiler, --- 469,474 ---- if (r) { end=system->Time(); ! lastBuildTime=(double) (end-beg); ! std::cout << "Build time : " << lastBuildTime << std::endl; storeStatus(Made); storeContext(currentCompiler, *************** *** 483,486 **** --- 484,492 ---- } + std::string Package::buildTime(void) + { + return(lastBuildTime); + } + int Package::Test(int _force) { Index: Package.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Package.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Package.h 21 Jan 2007 21:16:02 -0000 1.8 --- Package.h 22 Jan 2007 17:21:15 -0000 1.9 *************** *** 59,62 **** --- 59,65 ---- Status status; + /** \sa buildTime() */ + std::string lastBuildTime; + /** Expected MD5 on downloaded package * \return MD5 expected, as an std::string */ *************** *** 348,359 **** --- 351,371 ---- * Uses make(). Overloading is unadvised. * This step won't be done and'll return 1 if getStatus()>=Package::Made. + * Updates lastBuildTime. * \param _force sets to 1 to force operation. May changes status. * \return 1 if ok. May changes status. * \sa Configure() * \sa Release() + * \sa buildTime() * \sa status * \sa ContextMatches() */ virtual int Make(int _force = 0); + /** Give build time. + * Returns last time (in seconds) of make(). + * \return build time in seconds + * \sa Make() + * \sa make() */ + virtual std::string buildTime(void); + /** Test a package. * Test a built package. |
|
From: Frederic T. <xf...@us...> - 2007-01-21 21:45:13
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv9113 Modified Files: configure.in Log Message: CBM namespace. -g option added. Index: configure.in =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/configure.in,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** configure.in 28 Dec 2006 18:50:55 -0000 1.20 --- configure.in 21 Jan 2007 21:45:08 -0000 1.21 *************** *** 13,25 **** case $sys in Linux) ! CBM_SYSTEM=CBMSystemLinux CBM_SYSTEM_LINUX=1 ;; CYGWIN*) ! CBM_SYSTEM=CBMSystemCygwin CBM_SYSTEM_CYGWIN=1 ;; FreeBSD) ! CBM_SYSTEM=CBMSystemFreeBSD CBM_SYSTEM_FREEBSD=1 ;; --- 13,25 ---- case $sys in Linux) ! CBM_SYSTEM=CBM::SystemLinux CBM_SYSTEM_LINUX=1 ;; CYGWIN*) ! CBM_SYSTEM=CBM::SystemCygwin CBM_SYSTEM_CYGWIN=1 ;; FreeBSD) ! CBM_SYSTEM=CBM::SystemFreeBSD CBM_SYSTEM_FREEBSD=1 ;; *************** *** 203,207 **** fi ! CXXFLAGS="-Wall -pedantic -O2" # Checks for libraries. --- 203,207 ---- fi ! CXXFLAGS="-Wall -pedantic -O2 -g" # Checks for libraries. |
|
From: Frederic T. <xf...@us...> - 2007-01-21 21:42:20
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv8219 Modified Files: cloptions.cpp Log Message: CBM namespace. Index: cloptions.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/cloptions.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** cloptions.cpp 10 Jan 2007 20:31:44 -0000 1.12 --- cloptions.cpp 21 Jan 2007 21:42:17 -0000 1.13 *************** *** 14,48 **** #include <getopt.h> extern int optind, opterr, optopt; int parseExitValue = -1; - void cbmOptionsDisplayBenchmarks(CBMPackage *P) - { - CBMBenchmark *B; - int i; - int n = P->benchmarkNumber(); - - for(i=0; i<n; i++) { - B=P->Benchmark(i); - B->display(); - } - } - - void cbmOptionsDisplayAllBenchmarks(void) - { - CBMPackage *P; - int i; - int n = cbmSystem->packageNumber(); - - printf("n=%d\n", n); - for(i=0; i<n; i++) { - P=cbmSystem->Package(i); - printf("%d => %x\n", i, P); - P->display(); - cbmOptionsDisplayBenchmarks(P); - } - } - void cbmOptionsHelp(void) { --- 14,23 ---- #include <getopt.h> + using namespace CBM; + extern int optind, opterr, optopt; int parseExitValue = -1; void cbmOptionsHelp(void) { *************** *** 89,95 **** } ! CBMBenchmark *cbmOptionsExpectBenchmark(char *optarg) { ! CBMBenchmark *B = 0; std::string bench; --- 64,70 ---- } ! CBM::Benchmark *cbmOptionsExpectBenchmark(char *optarg) { ! CBM::Benchmark *B = 0; std::string bench; *************** *** 111,117 **** ! CBMPackage *cbmOptionsExpectPackage(char *optarg) { ! CBMPackage *P = 0; std::string pack; --- 86,92 ---- ! CBM::Package *cbmOptionsExpectPackage(char *optarg) { ! CBM::Package *P = 0; std::string pack; *************** *** 136,147 **** int c; int context; ! CBMPackage::Status status; ! CBMPackage *P = 0; ! CBMBenchmark *B = 0; ! CBMCompilerSelector SC(cbmSystem); ! CBMCompiler *C = 0; ! CBMCompilerOptions *O; std::string bench; --- 111,122 ---- int c; int context; ! CBM::Package::Status status; ! CBM::Package *P = 0; ! CBM::Benchmark *B = 0; ! CBM::CompilerSelector SC(cbmSystem); ! CBM::Compiler *C = 0; ! CBM::CompilerOptions *O; std::string bench; *************** *** 205,209 **** break; case 'L': ! cbmOptionsDisplayAllBenchmarks(); parseExitValue=0; break; --- 180,184 ---- break; case 'L': ! cbmSystem->displayAllBenchmarks(); parseExitValue=0; break; *************** *** 255,259 **** parseExitValue=!P->Download(); } else { ! UI->Fatal("Package is not known to be hosted anymore on the Internet. Use --fetch option"); } } --- 230,234 ---- parseExitValue=!P->Download(); } else { ! CBM::cbmUI->Fatal("Package is not known to be hosted anymore on the Internet. Use --fetch option"); } } *************** *** 278,282 **** if (P) { if (!UO_enableTestSuite) { ! UI->Fatal("Incompatible options : --test and --disable-testsuite"); } } --- 253,257 ---- if (P) { if (!UO_enableTestSuite) { ! CBM::cbmUI->Fatal("Incompatible options : --test and --disable-testsuite"); } } *************** *** 314,321 **** options=""; } ! O=new CBMCompilerOptions(C, ! (char*) options.c_str()); P=B->Package(); ! if (P->getStatus()<CBMPackage::Preconfigured) { std::cerr << "Package not properly installed" << std::endl; parseExitValue=1; --- 289,296 ---- options=""; } ! O=new CBM::CompilerOptions(C, ! (char*) options.c_str()); P=B->Package(); ! if (P->getStatus()<CBM::Package::Preconfigured) { std::cerr << "Package not properly installed" << std::endl; parseExitValue=1; *************** *** 325,329 **** status=P->getStatus(); ! if ((status>=CBMPackage::Configured) && (!context)) { P->Release(); } --- 300,304 ---- status=P->getStatus(); ! if ((status>=CBM::Package::Configured) && (!context)) { P->Release(); } |
|
From: Frederic T. <xf...@us...> - 2007-01-21 21:41:12
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv7467 Modified Files: Makefile.am Log Message: Build process now follows more closely automake principles. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.am 21 Jan 2007 21:31:58 -0000 1.5 --- Makefile.am 21 Jan 2007 21:41:04 -0000 1.6 *************** *** 1,2 **** --- 1,6 ---- + lib_LTLIBRARIES = libCBM.la + + libCBM_la_SOURCES = Glue.cpp CBM_wrap.cxx + SUBDIRS = t INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/CBM-PI -I.. -I. *************** *** 11,32 **** inst_pkgdatadir=@datarootdir@/compbenchmarks/@VERSION@/perl ! Glue.o: $(top_srcdir)/CBM-PI/Glue.cpp ! $(CXX) $(INCLUDES) -c $< -o $@ $(top_srcdir)/CBM-PI/CBM.pm: CBM.i swig -c++ $(INCLUDES) -Wall -proxy -perl $< ! CBM.o: $(top_srcdir)/CBM-PI/CBM.pm ! $(CXX) $(INCLUDES) -c $(top_srcdir)/CBM-PI/CBM_wrap.cxx `$(PERL) -MExtUtils::Embed -e ccopts` ../libcompbenchmarks.la: make -C .. libcompbenchmarks.la ! CBM.so: CBM.o Glue.o ../libcompbenchmarks.la ! ld -G CBM_wrap.o Glue.o -o CBM.so -L ../.libs -lcompbenchmarks test: @CBM_PROG_MAKE@ -C t test all-local: CBM.so --- 15,37 ---- inst_pkgdatadir=@datarootdir@/compbenchmarks/@VERSION@/perl ! $(top_srcdir)/CBM-PI/CBM_wrap.cxx: CBM.i ! swig -c++ $(INCLUDES) -Wall -proxy -perl $< $(top_srcdir)/CBM-PI/CBM.pm: CBM.i swig -c++ $(INCLUDES) -Wall -proxy -perl $< ! AM_CXXFLAGS = `$(PERL) -MExtUtils::Embed -e ccopts` ../libcompbenchmarks.la: make -C .. libcompbenchmarks.la ! libCBM_la_LIBADD = ../libcompbenchmarks.la test: @CBM_PROG_MAKE@ -C t test + CBM.so: libCBM.la + rm CBM.so; ln -s .libs/libCBM.so CBM.so + all-local: CBM.so |
|
From: Frederic T. <xf...@us...> - 2007-01-21 21:32:04
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4109 Modified Files: Makefile.am Log Message: swig -proxy Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.am 11 Jan 2007 17:34:15 -0000 1.4 --- Makefile.am 21 Jan 2007 21:31:58 -0000 1.5 *************** *** 15,19 **** $(top_srcdir)/CBM-PI/CBM.pm: CBM.i ! swig -c++ $(INCLUDES) -shadow -Wall -perl $< CBM.o: $(top_srcdir)/CBM-PI/CBM.pm --- 15,19 ---- $(top_srcdir)/CBM-PI/CBM.pm: CBM.i ! swig -c++ $(INCLUDES) -Wall -proxy -perl $< CBM.o: $(top_srcdir)/CBM-PI/CBM.pm |
|
From: Frederic T. <xf...@us...> - 2007-01-21 21:28:11
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv2662 Modified Files: CBM.pm CBM_wrap.cxx Log Message: API changes on CBM::Benchmark Index: CBM.pm =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM.pm,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** CBM.pm 21 Jan 2007 21:17:03 -0000 1.9 --- CBM.pm 21 Jan 2007 21:28:07 -0000 1.10 *************** *** 226,231 **** *Package = *CBMc::Benchmark_Package; *display = *CBMc::Benchmark_display; ! *benchmarkName = *CBMc::Benchmark_benchmarkName; ! *benchmarkComments = *CBMc::Benchmark_benchmarkComments; *Bench = *CBMc::Benchmark_Bench; sub DESTROY { --- 226,231 ---- *Package = *CBMc::Benchmark_Package; *display = *CBMc::Benchmark_display; ! *Name = *CBMc::Benchmark_Name; ! *Comments = *CBMc::Benchmark_Comments; *Bench = *CBMc::Benchmark_Bench; sub DESTROY { Index: CBM_wrap.cxx =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM_wrap.cxx,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** CBM_wrap.cxx 21 Jan 2007 21:17:03 -0000 1.9 --- CBM_wrap.cxx 21 Jan 2007 21:28:07 -0000 1.10 *************** *** 5574,5578 **** ! XS(_wrap_Benchmark_benchmarkName) { { CBM::Benchmark *arg1 = (CBM::Benchmark *) 0 ; --- 5574,5578 ---- ! XS(_wrap_Benchmark_Name) { { CBM::Benchmark *arg1 = (CBM::Benchmark *) 0 ; *************** *** 5584,5595 **** if ((items < 1) || (items > 1)) { ! SWIG_croak("Usage: Benchmark_benchmarkName(self);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Benchmark, 0 | 0 ); if (!SWIG_IsOK(res1)) { ! SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Benchmark_benchmarkName" "', argument " "1"" of type '" "CBM::Benchmark *""'"); } arg1 = reinterpret_cast<CBM::Benchmark * >(argp1); ! result = (arg1)->benchmarkName(); ST(argvi) = SWIG_From_std_string SWIG_PERL_CALL_ARGS_1(static_cast<std::string >(result)); argvi++ ; --- 5584,5595 ---- if ((items < 1) || (items > 1)) { ! SWIG_croak("Usage: Benchmark_Name(self);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Benchmark, 0 | 0 ); if (!SWIG_IsOK(res1)) { ! SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Benchmark_Name" "', argument " "1"" of type '" "CBM::Benchmark *""'"); } arg1 = reinterpret_cast<CBM::Benchmark * >(argp1); ! result = (arg1)->Name(); ST(argvi) = SWIG_From_std_string SWIG_PERL_CALL_ARGS_1(static_cast<std::string >(result)); argvi++ ; *************** *** 5603,5607 **** ! XS(_wrap_Benchmark_benchmarkComments) { { CBM::Benchmark *arg1 = (CBM::Benchmark *) 0 ; --- 5603,5607 ---- ! XS(_wrap_Benchmark_Comments) { { CBM::Benchmark *arg1 = (CBM::Benchmark *) 0 ; *************** *** 5613,5624 **** if ((items < 1) || (items > 1)) { ! SWIG_croak("Usage: Benchmark_benchmarkComments(self);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Benchmark, 0 | 0 ); if (!SWIG_IsOK(res1)) { ! SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Benchmark_benchmarkComments" "', argument " "1"" of type '" "CBM::Benchmark *""'"); } arg1 = reinterpret_cast<CBM::Benchmark * >(argp1); ! result = (arg1)->benchmarkComments(); ST(argvi) = SWIG_From_std_string SWIG_PERL_CALL_ARGS_1(static_cast<std::string >(result)); argvi++ ; --- 5613,5624 ---- if ((items < 1) || (items > 1)) { ! SWIG_croak("Usage: Benchmark_Comments(self);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Benchmark, 0 | 0 ); if (!SWIG_IsOK(res1)) { ! SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Benchmark_Comments" "', argument " "1"" of type '" "CBM::Benchmark *""'"); } arg1 = reinterpret_cast<CBM::Benchmark * >(argp1); ! result = (arg1)->Comments(); ST(argvi) = SWIG_From_std_string SWIG_PERL_CALL_ARGS_1(static_cast<std::string >(result)); argvi++ ; *************** *** 7766,7771 **** {"CBMc::Benchmark_Package", _wrap_Benchmark_Package}, {"CBMc::Benchmark_display", _wrap_Benchmark_display}, ! {"CBMc::Benchmark_benchmarkName", _wrap_Benchmark_benchmarkName}, ! {"CBMc::Benchmark_benchmarkComments", _wrap_Benchmark_benchmarkComments}, {"CBMc::Benchmark_Bench", _wrap_Benchmark_Bench}, {"CBMc::delete_Benchmark", _wrap_delete_Benchmark}, --- 7766,7771 ---- {"CBMc::Benchmark_Package", _wrap_Benchmark_Package}, {"CBMc::Benchmark_display", _wrap_Benchmark_display}, ! {"CBMc::Benchmark_Name", _wrap_Benchmark_Name}, ! {"CBMc::Benchmark_Comments", _wrap_Benchmark_Comments}, {"CBMc::Benchmark_Bench", _wrap_Benchmark_Bench}, {"CBMc::delete_Benchmark", _wrap_delete_Benchmark}, |
|
From: Frederic T. <xf...@us...> - 2007-01-21 21:27:54
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv2548 Modified Files: 02-CBMSystem-benchs.pl Log Message: API changes on CBM::Benchmark Index: 02-CBMSystem-benchs.pl =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/02-CBMSystem-benchs.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** 02-CBMSystem-benchs.pl 21 Jan 2007 21:16:16 -0000 1.5 --- 02-CBMSystem-benchs.pl 21 Jan 2007 21:27:51 -0000 1.6 *************** *** 56,65 **** ok($siz_b > 0); ! my $bn = $b->benchmarkName(); check_simple($bn); ok($bn eq $_, "checking benchmark's name : got '$bn', expected '$_'"); ! check_simple($b->benchmarkComments()); my $lang = $p->language(); --- 56,65 ---- ok($siz_b > 0); ! my $bn = $b->Name(); check_simple($bn); ok($bn eq $_, "checking benchmark's name : got '$bn', expected '$_'"); ! check_simple($b->Comments()); my $lang = $p->language(); |
Update of /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv2521 Modified Files: Benchmark-BENCHPP.cpp Benchmark-BENCHPP.h Benchmark-BENCHPPLINUX.cpp Benchmark-BENCHPPLINUX.h Benchmark-BZIP2.cpp Benchmark-BZIP2.h Benchmark-GZIP.cpp Benchmark-GZIP.h Benchmark-LINPACKC.cpp Benchmark-LINPACKC.h Benchmark-NBENCH.cpp Benchmark-NBENCH.h Benchmark-SCIMARK2.cpp Benchmark-SCIMARK2.h Log Message: API changes on CBM::Benchmark Index: Benchmark-BENCHPP.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPP.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Benchmark-BENCHPP.cpp 21 Jan 2007 21:16:49 -0000 1.5 --- Benchmark-BENCHPP.cpp 21 Jan 2007 21:27:37 -0000 1.6 *************** *** 231,235 **** } ! std::string BenchmarkBENCHPP::benchmarkComments(void) { std::string comment; --- 231,235 ---- } ! std::string BenchmarkBENCHPP::Comments(void) { std::string comment; *************** *** 273,277 **** } ! std::string BenchmarkBENCHPP_DHRYSTONE::benchmarkName(void) { return("benchpp-dhrystone"); --- 273,277 ---- } ! std::string BenchmarkBENCHPP_DHRYSTONE::Name(void) { return("benchpp-dhrystone"); *************** *** 297,301 **** } ! std::string BenchmarkBENCHPP_WHETSTONE::benchmarkName(void) { return("benchpp-whetstone"); --- 297,301 ---- } ! std::string BenchmarkBENCHPP_WHETSTONE::Name(void) { return("benchpp-whetstone"); *************** *** 353,357 **** } ! std::string BenchmarkBENCHPP_STEPANOV_AL12::benchmarkName(void) { return("benchpp-stepanov-al12"); --- 353,357 ---- } ! std::string BenchmarkBENCHPP_STEPANOV_AL12::Name(void) { return("benchpp-stepanov-al12"); Index: Benchmark-NBENCH.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-NBENCH.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Benchmark-NBENCH.h 21 Jan 2007 21:16:33 -0000 1.5 --- Benchmark-NBENCH.h 21 Jan 2007 21:27:37 -0000 1.6 *************** *** 65,69 **** virtual int nbyteWriteDatFile(void); ! virtual std::string benchmarkComments(void); virtual std::string nbyteBenchmark(void) = 0; virtual std::string nbyteBenchmarkLabel(void) = 0; --- 65,69 ---- virtual int nbyteWriteDatFile(void); ! virtual std::string Comments(void); virtual std::string nbyteBenchmark(void) = 0; virtual std::string nbyteBenchmarkLabel(void) = 0; *************** *** 81,85 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkNBENCHComments(void); --- 81,85 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkNBENCHComments(void); *************** *** 97,101 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkNBENCHComments(void); --- 97,101 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkNBENCHComments(void); *************** *** 113,117 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkNBENCHComments(void); --- 113,117 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkNBENCHComments(void); *************** *** 129,133 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkNBENCHComments(void); --- 129,133 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkNBENCHComments(void); *************** *** 145,149 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkNBENCHComments(void); --- 145,149 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkNBENCHComments(void); *************** *** 161,165 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkNBENCHComments(void); --- 161,165 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkNBENCHComments(void); *************** *** 177,181 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkNBENCHComments(void); --- 177,181 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkNBENCHComments(void); *************** *** 193,197 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkNBENCHComments(void); --- 193,197 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkNBENCHComments(void); *************** *** 209,213 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkNBENCHComments(void); --- 209,213 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkNBENCHComments(void); *************** *** 225,229 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkNBENCHComments(void); --- 225,229 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkNBENCHComments(void); Index: Benchmark-LINPACKC.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-LINPACKC.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Benchmark-LINPACKC.h 21 Jan 2007 21:16:33 -0000 1.7 --- Benchmark-LINPACKC.h 21 Jan 2007 21:27:37 -0000 1.8 *************** *** 56,60 **** protected: BenchmarkLINPACKC(CBM::Package *_package); ! virtual std::string benchmarkComments(void); virtual std::string benchmarkLINPACKCComments(void) = 0; --- 56,60 ---- protected: BenchmarkLINPACKC(CBM::Package *_package); ! virtual std::string Comments(void); virtual std::string benchmarkLINPACKCComments(void) = 0; *************** *** 75,79 **** BenchmarkLINPACKC_SP_UNROLL(CBM::Package *_package); ! virtual std::string benchmarkName(void); virtual ~BenchmarkLINPACKC_SP_UNROLL(); --- 75,79 ---- BenchmarkLINPACKC_SP_UNROLL(CBM::Package *_package); ! virtual std::string Name(void); virtual ~BenchmarkLINPACKC_SP_UNROLL(); *************** *** 92,96 **** BenchmarkLINPACKC_SP_ROLL(CBM::Package *_package); ! virtual std::string benchmarkName(void); virtual ~BenchmarkLINPACKC_SP_ROLL(); --- 92,96 ---- BenchmarkLINPACKC_SP_ROLL(CBM::Package *_package); ! virtual std::string Name(void); virtual ~BenchmarkLINPACKC_SP_ROLL(); *************** *** 110,114 **** BenchmarkLINPACKC_DP_UNROLL(CBM::Package *_package); ! virtual std::string benchmarkName(void); virtual ~BenchmarkLINPACKC_DP_UNROLL(); --- 110,114 ---- BenchmarkLINPACKC_DP_UNROLL(CBM::Package *_package); ! virtual std::string Name(void); virtual ~BenchmarkLINPACKC_DP_UNROLL(); *************** *** 127,131 **** BenchmarkLINPACKC_DP_ROLL(CBM::Package *_package); ! virtual std::string benchmarkName(void); virtual ~BenchmarkLINPACKC_DP_ROLL(); --- 127,131 ---- BenchmarkLINPACKC_DP_ROLL(CBM::Package *_package); ! virtual std::string Name(void); virtual ~BenchmarkLINPACKC_DP_ROLL(); Index: Benchmark-SCIMARK2.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-SCIMARK2.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Benchmark-SCIMARK2.h 21 Jan 2007 21:16:34 -0000 1.5 --- Benchmark-SCIMARK2.h 21 Jan 2007 21:27:37 -0000 1.6 *************** *** 64,69 **** protected: BenchmarkSCIMARK2(CBM::Package *_package); ! virtual std::string benchmarkComments(void); ! virtual std::string benchmarkName(void) = 0; virtual std::string benchmarkSCIMARK2Comments(void) = 0; virtual std::string scimark2BenchmarkLabel(void) = 0; --- 64,69 ---- protected: BenchmarkSCIMARK2(CBM::Package *_package); ! virtual std::string Comments(void); ! virtual std::string Name(void) = 0; virtual std::string benchmarkSCIMARK2Comments(void) = 0; virtual std::string scimark2BenchmarkLabel(void) = 0; *************** *** 78,82 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkSCIMARK2Comments(void); --- 78,82 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkSCIMARK2Comments(void); *************** *** 93,97 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkSCIMARK2Comments(void); --- 93,97 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkSCIMARK2Comments(void); *************** *** 108,112 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkSCIMARK2Comments(void); --- 108,112 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkSCIMARK2Comments(void); *************** *** 123,127 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkSCIMARK2Comments(void); --- 123,127 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkSCIMARK2Comments(void); *************** *** 138,142 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkSCIMARK2Comments(void); --- 138,142 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkSCIMARK2Comments(void); Index: Benchmark-NBENCH.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-NBENCH.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Benchmark-NBENCH.cpp 21 Jan 2007 21:16:33 -0000 1.4 --- Benchmark-NBENCH.cpp 21 Jan 2007 21:27:37 -0000 1.5 *************** *** 190,194 **** } ! std::string BenchmarkNBENCH::benchmarkComments(void) { std::string comment; --- 190,194 ---- } ! std::string BenchmarkNBENCH::Comments(void) { std::string comment; *************** *** 237,241 **** } ! std::string BenchmarkNBENCH_NUMSORT::benchmarkName(void) { return("nbench-numsort"); --- 237,241 ---- } ! std::string BenchmarkNBENCH_NUMSORT::Name(void) { return("nbench-numsort"); *************** *** 270,274 **** } ! std::string BenchmarkNBENCH_STRINGSORT::benchmarkName(void) { return("nbench-stringsort"); --- 270,274 ---- } ! std::string BenchmarkNBENCH_STRINGSORT::Name(void) { return("nbench-stringsort"); *************** *** 307,311 **** } ! std::string BenchmarkNBENCH_BITFIELD::benchmarkName(void) { return("nbench-bitfield"); --- 307,311 ---- } ! std::string BenchmarkNBENCH_BITFIELD::Name(void) { return("nbench-bitfield"); *************** *** 343,347 **** } ! std::string BenchmarkNBENCH_EMF::benchmarkName(void) { return("nbench-emf"); --- 343,347 ---- } ! std::string BenchmarkNBENCH_EMF::Name(void) { return("nbench-emf"); *************** *** 374,378 **** } ! std::string BenchmarkNBENCH_FOURIER::benchmarkName(void) { return("nbench-fourier"); --- 374,378 ---- } ! std::string BenchmarkNBENCH_FOURIER::Name(void) { return("nbench-fourier"); *************** *** 408,412 **** } ! std::string BenchmarkNBENCH_ASSIGN::benchmarkName(void) { return("nbench-assign"); --- 408,412 ---- } ! std::string BenchmarkNBENCH_ASSIGN::Name(void) { return("nbench-assign"); *************** *** 446,450 **** } ! std::string BenchmarkNBENCH_HUFFMAN::benchmarkName(void) { return("nbench-huffman"); --- 446,450 ---- } ! std::string BenchmarkNBENCH_HUFFMAN::Name(void) { return("nbench-huffman"); *************** *** 478,482 **** } ! std::string BenchmarkNBENCH_IDEA::benchmarkName(void) { return("nbench-idea"); --- 478,482 ---- } ! std::string BenchmarkNBENCH_IDEA::Name(void) { return("nbench-idea"); *************** *** 509,513 **** } ! std::string BenchmarkNBENCH_NNET::benchmarkName(void) { return("nbench-nnet"); --- 509,513 ---- } ! std::string BenchmarkNBENCH_NNET::Name(void) { return("nbench-nnet"); *************** *** 543,547 **** } ! std::string BenchmarkNBENCH_LU::benchmarkName(void) { return("nbench-lu"); --- 543,547 ---- } ! std::string BenchmarkNBENCH_LU::Name(void) { return("nbench-lu"); Index: Benchmark-GZIP.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-GZIP.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Benchmark-GZIP.h 21 Jan 2007 21:16:33 -0000 1.5 --- Benchmark-GZIP.h 21 Jan 2007 21:27:37 -0000 1.6 *************** *** 64,72 **** protected: virtual char* compressionLevel(void); ! virtual std::string benchmarkComments(void); public: BenchmarkGZIP1(CBM::Package *_package); ! virtual std::string benchmarkName(void); virtual ~BenchmarkGZIP1(); }; --- 64,72 ---- protected: virtual char* compressionLevel(void); ! virtual std::string Comments(void); public: BenchmarkGZIP1(CBM::Package *_package); ! virtual std::string Name(void); virtual ~BenchmarkGZIP1(); }; *************** *** 78,87 **** protected: virtual char* compressionLevel(void); ! virtual std::string benchmarkComments(void); public: BenchmarkGZIP9(CBM::Package *_package); ! virtual std::string benchmarkName(void); virtual ~BenchmarkGZIP9(); }; --- 78,87 ---- protected: virtual char* compressionLevel(void); ! virtual std::string Comments(void); public: BenchmarkGZIP9(CBM::Package *_package); ! virtual std::string Name(void); virtual ~BenchmarkGZIP9(); }; Index: Benchmark-BENCHPPLINUX.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPPLINUX.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Benchmark-BENCHPPLINUX.h 21 Jan 2007 21:16:33 -0000 1.5 --- Benchmark-BENCHPPLINUX.h 21 Jan 2007 21:27:37 -0000 1.6 *************** *** 66,71 **** virtual std::string bench(void); ! virtual std::string benchmarkComments(void); ! virtual std::string benchmarkName(void) = 0; virtual std::string benchppBenchmark(void) = 0; virtual std::string benchmarkBENCHPPLINUXComments(void) = 0; --- 66,71 ---- virtual std::string bench(void); ! virtual std::string Comments(void); ! virtual std::string Name(void) = 0; virtual std::string benchppBenchmark(void) = 0; virtual std::string benchmarkBENCHPPLINUXComments(void) = 0; *************** *** 79,83 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 79,83 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 95,99 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 95,99 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 123,127 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 123,127 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 140,144 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 140,144 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 157,161 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 157,161 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 175,179 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 175,179 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 193,197 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 193,197 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 211,215 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 211,215 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 228,232 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 228,232 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 245,249 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 245,249 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 262,266 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 262,266 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 279,283 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 279,283 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 296,300 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 296,300 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 313,317 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 313,317 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 330,334 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 330,334 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 347,351 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 347,351 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 364,368 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 364,368 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 381,385 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 381,385 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 399,403 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 399,403 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 416,420 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 416,420 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 433,437 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 433,437 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 450,454 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 450,454 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 467,471 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 467,471 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 484,488 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 484,488 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 501,505 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 501,505 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 518,522 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 518,522 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 535,539 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 535,539 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 552,556 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 552,556 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 569,573 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 569,573 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 586,590 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 586,590 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 604,608 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 604,608 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 621,625 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 621,625 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 639,643 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 639,643 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 656,660 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 656,660 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); *************** *** 673,677 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPLINUXComments(void); --- 673,677 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPLINUXComments(void); Index: Benchmark-BZIP2.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BZIP2.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Benchmark-BZIP2.cpp 21 Jan 2007 21:16:33 -0000 1.6 --- Benchmark-BZIP2.cpp 21 Jan 2007 21:27:37 -0000 1.7 *************** *** 166,170 **** } ! std::string BenchmarkBZIP21::benchmarkName(void) { return("bzip2-1c"); --- 166,170 ---- } ! std::string BenchmarkBZIP21::Name(void) { return("bzip2-1c"); *************** *** 176,180 **** } ! std::string BenchmarkBZIP21::benchmarkComments(void) { return("Uses generated bzip2 binary with fastest compression"); --- 176,180 ---- } ! std::string BenchmarkBZIP21::Comments(void) { return("Uses generated bzip2 binary with fastest compression"); *************** *** 190,194 **** } ! std::string BenchmarkBZIP29::benchmarkName(void) { return("bzip2-9c"); --- 190,194 ---- } ! std::string BenchmarkBZIP29::Name(void) { return("bzip2-9c"); *************** *** 200,204 **** } ! std::string BenchmarkBZIP29::benchmarkComments(void) { return("Uses generated bzip2 binary with maximum compression"); --- 200,204 ---- } ! std::string BenchmarkBZIP29::Comments(void) { return("Uses generated bzip2 binary with maximum compression"); Index: Benchmark-GZIP.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-GZIP.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Benchmark-GZIP.cpp 21 Jan 2007 21:16:33 -0000 1.6 --- Benchmark-GZIP.cpp 21 Jan 2007 21:27:37 -0000 1.7 *************** *** 124,128 **** } ! std::string BenchmarkGZIP1::benchmarkName(void) { return("gzip-1c"); --- 124,128 ---- } ! std::string BenchmarkGZIP1::Name(void) { return("gzip-1c"); *************** *** 134,138 **** } ! std::string BenchmarkGZIP1::benchmarkComments(void) { return("Uses generated gzip binary with fastest compression"); --- 134,138 ---- } ! std::string BenchmarkGZIP1::Comments(void) { return("Uses generated gzip binary with fastest compression"); *************** *** 148,152 **** } ! std::string BenchmarkGZIP9::benchmarkName(void) { return("gzip-9c"); --- 148,152 ---- } ! std::string BenchmarkGZIP9::Name(void) { return("gzip-9c"); *************** *** 158,162 **** } ! std::string BenchmarkGZIP9::benchmarkComments(void) { return("Uses generated gzip binary with maximum compression"); --- 158,162 ---- } ! std::string BenchmarkGZIP9::Comments(void) { return("Uses generated gzip binary with maximum compression"); Index: Benchmark-BENCHPP.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPP.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Benchmark-BENCHPP.h 21 Jan 2007 21:16:49 -0000 1.5 --- Benchmark-BENCHPP.h 21 Jan 2007 21:27:37 -0000 1.6 *************** *** 65,71 **** protected: BenchmarkBENCHPP(CBM::Package *_package); ! virtual std::string benchmarkComments(void); virtual std::string benchmarkBENCHPPComments(void) = 0; ! virtual std::string benchmarkName(void) = 0; virtual std::string benchppBenchmark(void) = 0; virtual std::string bench(void); --- 65,71 ---- protected: BenchmarkBENCHPP(CBM::Package *_package); ! virtual std::string Comments(void); virtual std::string benchmarkBENCHPPComments(void) = 0; ! virtual std::string Name(void) = 0; virtual std::string benchppBenchmark(void) = 0; virtual std::string bench(void); *************** *** 78,82 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPComments(void); --- 78,82 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPComments(void); *************** *** 94,98 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPComments(void); --- 94,98 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPComments(void); *************** *** 121,125 **** { protected: ! virtual std::string benchmarkName(void); virtual std::string benchmarkBENCHPPComments(void); --- 121,125 ---- { protected: ! virtual std::string Name(void); virtual std::string benchmarkBENCHPPComments(void); Index: Benchmark-SCIMARK2.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-SCIMARK2.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Benchmark-SCIMARK2.cpp 21 Jan 2007 21:16:33 -0000 1.5 --- Benchmark-SCIMARK2.cpp 21 Jan 2007 21:27:37 -0000 1.6 *************** *** 213,217 **** } ! std::string BenchmarkSCIMARK2::benchmarkComments(void) { std::string comment; --- 213,217 ---- } ! std::string BenchmarkSCIMARK2::Comments(void) { std::string comment; *************** *** 257,261 **** } ! std::string BenchmarkSCIMARK2_FOURIER::benchmarkName(void) { return("scimark2-fourier"); --- 257,261 ---- } ! std::string BenchmarkSCIMARK2_FOURIER::Name(void) { return("scimark2-fourier"); *************** *** 289,293 **** } ! std::string BenchmarkSCIMARK2_SOR::benchmarkName(void) { return("scimark2-sor"); --- 289,293 ---- } ! std::string BenchmarkSCIMARK2_SOR::Name(void) { return("scimark2-sor"); *************** *** 321,325 **** } ! std::string BenchmarkSCIMARK2_MC::benchmarkName(void) { return("scimark2-mc"); --- 321,325 ---- } ! std::string BenchmarkSCIMARK2_MC::Name(void) { return("scimark2-mc"); *************** *** 353,357 **** } ! std::string BenchmarkSCIMARK2_SMM::benchmarkName(void) { return("scimark2-smm"); --- 353,357 ---- } ! std::string BenchmarkSCIMARK2_SMM::Name(void) { return("scimark2-smm"); *************** *** 382,386 **** } ! std::string BenchmarkSCIMARK2_LU::benchmarkName(void) { return("scimark2-lu"); --- 382,386 ---- } ! std::string BenchmarkSCIMARK2_LU::Name(void) { return("scimark2-lu"); Index: Benchmark-LINPACKC.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-LINPACKC.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Benchmark-LINPACKC.cpp 21 Jan 2007 21:16:33 -0000 1.9 --- Benchmark-LINPACKC.cpp 21 Jan 2007 21:27:37 -0000 1.10 *************** *** 96,100 **** } ! std::string BenchmarkLINPACKC::benchmarkComments(void) { std::string comment; --- 96,100 ---- } ! std::string BenchmarkLINPACKC::Comments(void) { std::string comment; *************** *** 116,120 **** cmd+=" && echo $("; cmd+="./"; ! cmd+=benchmarkName(); cmd+=" 2>&1 | "; cmd+=CBM_PROG_GREP; --- 116,120 ---- cmd+=" && echo $("; cmd+="./"; ! cmd+=Name(); cmd+=" 2>&1 | "; cmd+=CBM_PROG_GREP; *************** *** 140,144 **** } ! std::string BenchmarkLINPACKC_SP_UNROLL::benchmarkName(void) { return("linpackc-sp-unroll"); --- 140,144 ---- } ! std::string BenchmarkLINPACKC_SP_UNROLL::Name(void) { return("linpackc-sp-unroll"); *************** *** 160,164 **** } ! std::string BenchmarkLINPACKC_SP_ROLL::benchmarkName(void) { return("linpackc-sp-roll"); --- 160,164 ---- } ! std::string BenchmarkLINPACKC_SP_ROLL::Name(void) { return("linpackc-sp-roll"); *************** *** 180,184 **** } ! std::string BenchmarkLINPACKC_DP_UNROLL::benchmarkName(void) { return("linpackc-dp-unroll"); --- 180,184 ---- } ! std::string BenchmarkLINPACKC_DP_UNROLL::Name(void) { return("linpackc-dp-unroll"); *************** *** 199,203 **** { } ! std::string BenchmarkLINPACKC_DP_ROLL::benchmarkName(void) { return("linpackc-dp-roll"); --- 199,203 ---- { } ! std::string BenchmarkLINPACKC_DP_ROLL::Name(void) { return("linpackc-dp-roll"); Index: Benchmark-BENCHPPLINUX.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPPLINUX.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Benchmark-BENCHPPLINUX.cpp 21 Jan 2007 21:16:49 -0000 1.8 --- Benchmark-BENCHPPLINUX.cpp 21 Jan 2007 21:27:37 -0000 1.9 *************** *** 208,212 **** } ! std::string BenchmarkBENCHPPLINUX::benchmarkComments(void) { std::string comment; --- 208,212 ---- } ! std::string BenchmarkBENCHPPLINUX::Comments(void) { std::string comment; *************** *** 231,235 **** } ! std::string BenchmarkBENCHPPLINUX_DHRYSTONE::benchmarkName(void) { return("benchpplinux-dhrystone"); --- 231,235 ---- } ! std::string BenchmarkBENCHPPLINUX_DHRYSTONE::Name(void) { return("benchpplinux-dhrystone"); *************** *** 255,259 **** } ! std::string BenchmarkBENCHPPLINUX_WHETSTONE::benchmarkName(void) { return("benchpplinux-whetstone"); --- 255,259 ---- } ! std::string BenchmarkBENCHPPLINUX_WHETSTONE::Name(void) { return("benchpplinux-whetstone"); *************** *** 326,330 **** } ! std::string BenchmarkBENCHPPLINUX_BOOL_ASSIGN::benchmarkName(void) { return("benchpplinux-bool-assign"); --- 326,330 ---- } ! std::string BenchmarkBENCHPPLINUX_BOOL_ASSIGN::Name(void) { return("benchpplinux-bool-assign"); *************** *** 351,355 **** } ! std::string BenchmarkBENCHPPLINUX_BOOL_IF::benchmarkName(void) { return("benchpplinux-bool-if"); --- 351,355 ---- } ! std::string BenchmarkBENCHPPLINUX_BOOL_IF::Name(void) { return("benchpplinux-bool-if"); *************** *** 376,380 **** } ! std::string BenchmarkBENCHPPLINUX_2WAY_IFELSE::benchmarkName(void) { return("benchpplinux-2wifelse"); --- 376,380 ---- } ! std::string BenchmarkBENCHPPLINUX_2WAY_IFELSE::Name(void) { return("benchpplinux-2wifelse"); *************** *** 400,404 **** } ! std::string BenchmarkBENCHPPLINUX_2WAY_SWITCH::benchmarkName(void) { return("benchpplinux-2wswitch"); --- 400,404 ---- } ! std::string BenchmarkBENCHPPLINUX_2WAY_SWITCH::Name(void) { return("benchpplinux-2wswitch"); *************** *** 424,428 **** } ! std::string BenchmarkBENCHPPLINUX_10WAY_IFELSE::benchmarkName(void) { return("benchpplinux-10wifelse"); --- 424,428 ---- } ! std::string BenchmarkBENCHPPLINUX_10WAY_IFELSE::Name(void) { return("benchpplinux-10wifelse"); *************** *** 448,452 **** } ! std::string BenchmarkBENCHPPLINUX_10WAY_SWITCH::benchmarkName(void) { return("benchpplinux-10wswitch"); --- 448,452 ---- } ! std::string BenchmarkBENCHPPLINUX_10WAY_SWITCH::Name(void) { return("benchpplinux-10wswitch"); *************** *** 473,477 **** } ! std::string BenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH::benchmarkName(void) { return("benchpplinux-10wsparseswitch"); --- 473,477 ---- } ! std::string BenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH::Name(void) { return("benchpplinux-10wsparseswitch"); *************** *** 497,501 **** } ! std::string BenchmarkBENCHPPLINUX_10WAY_VFC::benchmarkName(void) { return("benchpplinux-10wvfc"); --- 497,501 ---- } ! std::string BenchmarkBENCHPPLINUX_10WAY_VFC::Name(void) { return("benchpplinux-10wvfc"); *************** *** 521,525 **** } ! std::string BenchmarkBENCHPPLINUX_PACKEDBITARRAY::benchmarkName(void) { return("benchpplinux-packedbitarray"); --- 521,525 ---- } ! std::string BenchmarkBENCHPPLINUX_PACKEDBITARRAY::Name(void) { return("benchpplinux-packedbitarray"); *************** *** 545,549 **** } ! std::string BenchmarkBENCHPPLINUX_BITFIELDS::benchmarkName(void) { return("benchpplinux-bitfields"); --- 545,549 ---- } ! std::string BenchmarkBENCHPPLINUX_BITFIELDS::Name(void) { return("benchpplinux-bitfields"); *************** *** 570,574 **** } ! std::string BenchmarkBENCHPPLINUX_BITFIELDS_PBA::benchmarkName(void) { return("benchpplinux-bitfields-pba"); --- 570,574 ---- } ! std::string BenchmarkBENCHPPLINUX_BITFIELDS_PBA::Name(void) { return("benchpplinux-bitfields-pba"); *************** *** 596,600 **** } ! std::string BenchmarkBENCHPPLINUX_PACKUNPACKOBJ::benchmarkName(void) { return("benchpplinux-packunpackobjets"); --- 596,600 ---- } ! std::string BenchmarkBENCHPPLINUX_PACKUNPACKOBJ::Name(void) { return("benchpplinux-packunpackobjets"); *************** *** 620,624 **** } ! std::string BenchmarkBENCHPPLINUX_CONSTPROP::benchmarkName(void) { return("benchpplinux-constantpropagation"); --- 620,624 ---- } ! std::string BenchmarkBENCHPPLINUX_CONSTPROP::Name(void) { return("benchpplinux-constantpropagation"); *************** *** 644,648 **** } ! std::string BenchmarkBENCHPPLINUX_CONSTPROP_HO::benchmarkName(void) { return("benchpplinux-constantpropagation-ho"); --- 644,648 ---- } ! std::string BenchmarkBENCHPPLINUX_CONSTPROP_HO::Name(void) { return("benchpplinux-constantpropagation-ho"); *************** *** 668,672 **** } ! std::string BenchmarkBENCHPPLINUX_LOCALCSE::benchmarkName(void) { return("benchpplinux-localcommonse"); --- 668,672 ---- } ! std::string BenchmarkBENCHPPLINUX_LOCALCSE::Name(void) { return("benchpplinux-localcommonse"); *************** *** 692,696 **** } ! std::string BenchmarkBENCHPPLINUX_LOCALCSE_HO::benchmarkName(void) { return("benchpplinux-localcommonse-ho"); --- 692,696 ---- } ! std::string BenchmarkBENCHPPLINUX_LOCALCSE_HO::Name(void) { return("benchpplinux-localcommonse-ho"); *************** *** 716,720 **** } ! std::string BenchmarkBENCHPPLINUX_GLOBALCSE::benchmarkName(void) { return("benchpplinux-globalcommonse"); --- 716,720 ---- } ! std::string BenchmarkBENCHPPLINUX_GLOBALCSE::Name(void) { return("benchpplinux-globalcommonse"); *************** *** 740,744 **** } ! std::string BenchmarkBENCHPPLINUX_GLOBALCSE_HO::benchmarkName(void) { return("benchpplinux-globalcommonse-ho"); --- 740,744 ---- } ! std::string BenchmarkBENCHPPLINUX_GLOBALCSE_HO::Name(void) { return("benchpplinux-globalcommonse-ho"); *************** *** 764,768 **** } ! std::string BenchmarkBENCHPPLINUX_UNNECCOPY::benchmarkName(void) { return("benchpplinux-unneccopy"); --- 764,768 ---- } ! std::string BenchmarkBENCHPPLINUX_UNNECCOPY::Name(void) { return("benchpplinux-unneccopy"); *************** *** 788,792 **** } ! std::string BenchmarkBENCHPPLINUX_UNNECCOPY_HO::benchmarkName(void) { return("benchpplinux-unneccopy-ho"); --- 788,792 ---- } ! std::string BenchmarkBENCHPPLINUX_UNNECCOPY_HO::Name(void) { return("benchpplinux-unneccopy-ho"); *************** *** 812,816 **** } ! std::string BenchmarkBENCHPPLINUX_CODEMOTION::benchmarkName(void) { return("benchpplinux-codemotion"); --- 812,816 ---- } ! std::string BenchmarkBENCHPPLINUX_CODEMOTION::Name(void) { return("benchpplinux-codemotion"); *************** *** 836,840 **** } ! std::string BenchmarkBENCHPPLINUX_CODEMOTION_HO::benchmarkName(void) { return("benchpplinux-codemotion-ho"); --- 836,840 ---- } ! std::string BenchmarkBENCHPPLINUX_CODEMOTION_HO::Name(void) { return("benchpplinux-codemotion-ho"); *************** *** 860,864 **** } ! std::string BenchmarkBENCHPPLINUX_INDUCVAR::benchmarkName(void) { return("benchpplinux-inducvar"); --- 860,864 ---- } ! std::string BenchmarkBENCHPPLINUX_INDUCVAR::Name(void) { return("benchpplinux-inducvar"); *************** *** 884,888 **** } ! std::string BenchmarkBENCHPPLINUX_INDUCVAR_HO::benchmarkName(void) { return("benchpplinux-inducvar-ho"); --- 884,888 ---- } ! std::string BenchmarkBENCHPPLINUX_INDUCVAR_HO::Name(void) { return("benchpplinux-inducvar-ho"); *************** *** 908,912 **** } ! std::string BenchmarkBENCHPPLINUX_REDUCSTRENGTH_HO::benchmarkName(void) { return("benchpplinux-reducstrength-ho"); --- 908,912 ---- } ! std::string BenchmarkBENCHPPLINUX_REDUCSTRENGTH_HO::Name(void) { return("benchpplinux-reducstrength-ho"); *************** *** 932,936 **** } ! std::string BenchmarkBENCHPPLINUX_DEADCODE::benchmarkName(void) { return("benchpplinux-deadcode"); --- 932,936 ---- } ! std::string BenchmarkBENCHPPLINUX_DEADCODE::Name(void) { return("benchpplinux-deadcode"); *************** *** 956,960 **** } ! std::string BenchmarkBENCHPPLINUX_DEADCODE_HO::benchmarkName(void) { return("benchpplinux-deadcode-ho"); --- 956,960 ---- } ! std::string BenchmarkBENCHPPLINUX_DEADCODE_HO::Name(void) { return("benchpplinux-deadcode-ho"); *************** *** 981,985 **** } ! std::string BenchmarkBENCHPPLINUX_LOOPJAMMING::benchmarkName(void) { return("benchpplinux-loopjamming"); --- 981,985 ---- } ! std::string BenchmarkBENCHPPLINUX_LOOPJAMMING::Name(void) { return("benchpplinux-loopjamming"); *************** *** 1005,1009 **** } ! std::string BenchmarkBENCHPPLINUX_LOOPJAMMING_HO::benchmarkName(void) { return("benchpplinux-loopjamming-ho"); --- 1005,1009 ---- } ! std::string BenchmarkBENCHPPLINUX_LOOPJAMMING_HO::Name(void) { return("benchpplinux-loopjamming-ho"); *************** *** 1029,1033 **** } ! std::string BenchmarkBENCHPPLINUX_REDUNCODE::benchmarkName(void) { return("benchpplinux-reduncode"); --- 1029,1033 ---- } ! std::string BenchmarkBENCHPPLINUX_REDUNCODE::Name(void) { return("benchpplinux-reduncode"); *************** *** 1053,1057 **** } ! std::string BenchmarkBENCHPPLINUX_REDUNCODE_HO::benchmarkName(void) { return("benchpplinux-reduncode-ho"); --- 1053,1057 ---- } ! std::string BenchmarkBENCHPPLINUX_REDUNCODE_HO::Name(void) { return("benchpplinux-reduncode-ho"); *************** *** 1077,1081 **** } ! std::string BenchmarkBENCHPPLINUX_STRINGOPS::benchmarkName(void) { return("benchpplinux-stringops"); --- 1077,1081 ---- } ! std::string BenchmarkBENCHPPLINUX_STRINGOPS::Name(void) { return("benchpplinux-stringops"); *************** *** 1101,1105 **** } ! std::string BenchmarkBENCHPPLINUX_STRINGOPS_HO::benchmarkName(void) { return("benchpplinux-stringops-ho"); --- 1101,1105 ---- } ! std::string BenchmarkBENCHPPLINUX_STRINGOPS_HO::Name(void) { return("benchpplinux-stringops-ho"); Index: Benchmark-BZIP2.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BZIP2.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Benchmark-BZIP2.h 21 Jan 2007 21:16:33 -0000 1.6 --- Benchmark-BZIP2.h 21 Jan 2007 21:27:37 -0000 1.7 *************** *** 71,79 **** protected: virtual char* compressionLevel(void); ! virtual std::string benchmarkComments(void); public: BenchmarkBZIP21(CBM::Package *_package); ! virtual std::string benchmarkName(void); virtual ~BenchmarkBZIP21(); }; --- 71,79 ---- protected: virtual char* compressionLevel(void); ! virtual std::string Comments(void); public: BenchmarkBZIP21(CBM::Package *_package); ! virtual std::string Name(void); virtual ~BenchmarkBZIP21(); }; *************** *** 85,94 **** protected: virtual char* compressionLevel(void); ! virtual std::string benchmarkComments(void); public: BenchmarkBZIP29(CBM::Package *_package); ! virtual std::string benchmarkName(void); virtual ~BenchmarkBZIP29(); }; --- 85,94 ---- protected: virtual char* compressionLevel(void); ! virtual std::string Comments(void); public: BenchmarkBZIP29(CBM::Package *_package); ! virtual std::string Name(void); virtual ~BenchmarkBZIP29(); }; |
|
From: Frederic T. <xf...@us...> - 2007-01-21 21:27:24
|
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 "; |
|
From: Frederic T. <xf...@us...> - 2007-01-21 21:17:06
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv30808 Modified Files: CBM.pm CBM_wrap.cxx Log Message: API changes on CBM::Package Index: CBM.pm =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM.pm,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** CBM.pm 21 Jan 2007 20:47:56 -0000 1.8 --- CBM.pm 21 Jan 2007 21:17:03 -0000 1.9 *************** *** 165,183 **** *Benchmark = *CBMc::Package_Benchmark; *storeStatus = *CBMc::Package_storeStatus; ! *packageName = *CBMc::Package_packageName; ! *packageVersion = *CBMc::Package_packageVersion; ! *packageSize = *CBMc::Package_packageSize; ! *packageComments = *CBMc::Package_packageComments; ! *localPackageName = *CBMc::Package_localPackageName; *language = *CBMc::Package_language; *license = *CBMc::Package_license; *homePage = *CBMc::Package_homePage; *author = *CBMc::Package_author; ! *localPackageAbsoluteName = *CBMc::Package_localPackageAbsoluteName; ! *localPackageAbsoluteDirectory = *CBMc::Package_localPackageAbsoluteDirectory; *extractDirectory = *CBMc::Package_extractDirectory; *hasTest = *CBMc::Package_hasTest; *downloadURL = *CBMc::Package_downloadURL; ! *benchmarkSize = *CBMc::Package_benchmarkSize; *ContextMatches = *CBMc::Package_ContextMatches; *Download = *CBMc::Package_Download; --- 165,183 ---- *Benchmark = *CBMc::Package_Benchmark; *storeStatus = *CBMc::Package_storeStatus; ! *Name = *CBMc::Package_Name; ! *Version = *CBMc::Package_Version; ! *Size = *CBMc::Package_Size; ! *Comments = *CBMc::Package_Comments; ! *localName = *CBMc::Package_localName; *language = *CBMc::Package_language; *license = *CBMc::Package_license; *homePage = *CBMc::Package_homePage; *author = *CBMc::Package_author; ! *localAbsoluteName = *CBMc::Package_localAbsoluteName; ! *localAbsoluteDirectory = *CBMc::Package_localAbsoluteDirectory; *extractDirectory = *CBMc::Package_extractDirectory; *hasTest = *CBMc::Package_hasTest; *downloadURL = *CBMc::Package_downloadURL; ! *totalSize = *CBMc::Package_totalSize; *ContextMatches = *CBMc::Package_ContextMatches; *Download = *CBMc::Package_Download; Index: CBM_wrap.cxx =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM_wrap.cxx,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** CBM_wrap.cxx 21 Jan 2007 20:47:56 -0000 1.8 --- CBM_wrap.cxx 21 Jan 2007 21:17:03 -0000 1.9 *************** *** 3711,3715 **** ! XS(_wrap_Package_packageName) { { CBM::Package *arg1 = (CBM::Package *) 0 ; --- 3711,3715 ---- ! XS(_wrap_Package_Name) { { CBM::Package *arg1 = (CBM::Package *) 0 ; *************** *** 3721,3732 **** if ((items < 1) || (items > 1)) { ! SWIG_croak("Usage: Package_packageName(self);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Package, 0 | 0 ); if (!SWIG_IsOK(res1)) { ! SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Package_packageName" "', argument " "1"" of type '" "CBM::Package *""'"); } arg1 = reinterpret_cast<CBM::Package * >(argp1); ! result = (arg1)->packageName(); ST(argvi) = SWIG_From_std_string SWIG_PERL_CALL_ARGS_1(static_cast<std::string >(result)); argvi++ ; --- 3721,3732 ---- if ((items < 1) || (items > 1)) { ! SWIG_croak("Usage: Package_Name(self);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Package, 0 | 0 ); if (!SWIG_IsOK(res1)) { ! SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Package_Name" "', argument " "1"" of type '" "CBM::Package *""'"); } arg1 = reinterpret_cast<CBM::Package * >(argp1); ! result = (arg1)->Name(); ST(argvi) = SWIG_From_std_string SWIG_PERL_CALL_ARGS_1(static_cast<std::string >(result)); argvi++ ; *************** *** 3740,3744 **** ! XS(_wrap_Package_packageVersion) { { CBM::Package *arg1 = (CBM::Package *) 0 ; --- 3740,3744 ---- ! XS(_wrap_Package_Version) { { CBM::Package *arg1 = (CBM::Package *) 0 ; *************** *** 3750,3761 **** if ((items < 1) || (items > 1)) { ! SWIG_croak("Usage: Package_packageVersion(self);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Package, 0 | 0 ); if (!SWIG_IsOK(res1)) { ! SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Package_packageVersion" "', argument " "1"" of type '" "CBM::Package *""'"); } arg1 = reinterpret_cast<CBM::Package * >(argp1); ! result = (arg1)->packageVersion(); ST(argvi) = SWIG_From_std_string SWIG_PERL_CALL_ARGS_1(static_cast<std::string >(result)); argvi++ ; --- 3750,3761 ---- if ((items < 1) || (items > 1)) { ! SWIG_croak("Usage: Package_Version(self);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Package, 0 | 0 ); if (!SWIG_IsOK(res1)) { ! SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Package_Version" "', argument " "1"" of type '" "CBM::Package *""'"); } arg1 = reinterpret_cast<CBM::Package * >(argp1); ! result = (arg1)->Version(); ST(argvi) = SWIG_From_std_string SWIG_PERL_CALL_ARGS_1(static_cast<std::string >(result)); argvi++ ; *************** *** 3769,3773 **** ! XS(_wrap_Package_packageSize) { { CBM::Package *arg1 = (CBM::Package *) 0 ; --- 3769,3773 ---- ! XS(_wrap_Package_Size) { { CBM::Package *arg1 = (CBM::Package *) 0 ; *************** *** 3779,3790 **** if ((items < 1) || (items > 1)) { ! SWIG_croak("Usage: Package_packageSize(self);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Package, 0 | 0 ); if (!SWIG_IsOK(res1)) { ! SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Package_packageSize" "', argument " "1"" of type '" "CBM::Package *""'"); } arg1 = reinterpret_cast<CBM::Package * >(argp1); ! result = (int)(arg1)->packageSize(); ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast<int >(result)); argvi++ ; --- 3779,3790 ---- if ((items < 1) || (items > 1)) { ! SWIG_croak("Usage: Package_Size(self);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Package, 0 | 0 ); if (!SWIG_IsOK(res1)) { ! SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Package_Size" "', argument " "1"" of type '" "CBM::Package *""'"); } arg1 = reinterpret_cast<CBM::Package * >(argp1); ! result = (int)(arg1)->Size(); ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast<int >(result)); argvi++ ; *************** *** 3798,3802 **** ! XS(_wrap_Package_packageComments) { { CBM::Package *arg1 = (CBM::Package *) 0 ; --- 3798,3802 ---- ! XS(_wrap_Package_Comments) { { CBM::Package *arg1 = (CBM::Package *) 0 ; *************** *** 3808,3819 **** if ((items < 1) || (items > 1)) { ! SWIG_croak("Usage: Package_packageComments(self);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Package, 0 | 0 ); if (!SWIG_IsOK(res1)) { ! SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Package_packageComments" "', argument " "1"" of type '" "CBM::Package *""'"); } arg1 = reinterpret_cast<CBM::Package * >(argp1); ! result = (arg1)->packageComments(); ST(argvi) = SWIG_From_std_string SWIG_PERL_CALL_ARGS_1(static_cast<std::string >(result)); argvi++ ; --- 3808,3819 ---- if ((items < 1) || (items > 1)) { ! SWIG_croak("Usage: Package_Comments(self);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Package, 0 | 0 ); if (!SWIG_IsOK(res1)) { ! SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Package_Comments" "', argument " "1"" of type '" "CBM::Package *""'"); } arg1 = reinterpret_cast<CBM::Package * >(argp1); ! result = (arg1)->Comments(); ST(argvi) = SWIG_From_std_string SWIG_PERL_CALL_ARGS_1(static_cast<std::string >(result)); argvi++ ; *************** *** 3827,3831 **** ! XS(_wrap_Package_localPackageName) { { CBM::Package *arg1 = (CBM::Package *) 0 ; --- 3827,3831 ---- ! XS(_wrap_Package_localName) { { CBM::Package *arg1 = (CBM::Package *) 0 ; *************** *** 3837,3848 **** if ((items < 1) || (items > 1)) { ! SWIG_croak("Usage: Package_localPackageName(self);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Package, 0 | 0 ); if (!SWIG_IsOK(res1)) { ! SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Package_localPackageName" "', argument " "1"" of type '" "CBM::Package *""'"); } arg1 = reinterpret_cast<CBM::Package * >(argp1); ! result = (arg1)->localPackageName(); ST(argvi) = SWIG_From_std_string SWIG_PERL_CALL_ARGS_1(static_cast<std::string >(result)); argvi++ ; --- 3837,3848 ---- if ((items < 1) || (items > 1)) { ! SWIG_croak("Usage: Package_localName(self);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Package, 0 | 0 ); if (!SWIG_IsOK(res1)) { ! SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Package_localName" "', argument " "1"" of type '" "CBM::Package *""'"); } arg1 = reinterpret_cast<CBM::Package * >(argp1); ! result = (arg1)->localName(); ST(argvi) = SWIG_From_std_string SWIG_PERL_CALL_ARGS_1(static_cast<std::string >(result)); argvi++ ; *************** *** 3972,3976 **** ! XS(_wrap_Package_localPackageAbsoluteName) { { CBM::Package *arg1 = (CBM::Package *) 0 ; --- 3972,3976 ---- ! XS(_wrap_Package_localAbsoluteName) { { CBM::Package *arg1 = (CBM::Package *) 0 ; *************** *** 3982,3993 **** if ((items < 1) || (items > 1)) { ! SWIG_croak("Usage: Package_localPackageAbsoluteName(self);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Package, 0 | 0 ); if (!SWIG_IsOK(res1)) { ! SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Package_localPackageAbsoluteName" "', argument " "1"" of type '" "CBM::Package *""'"); } arg1 = reinterpret_cast<CBM::Package * >(argp1); ! result = (arg1)->localPackageAbsoluteName(); ST(argvi) = SWIG_From_std_string SWIG_PERL_CALL_ARGS_1(static_cast<std::string >(result)); argvi++ ; --- 3982,3993 ---- if ((items < 1) || (items > 1)) { ! SWIG_croak("Usage: Package_localAbsoluteName(self);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Package, 0 | 0 ); if (!SWIG_IsOK(res1)) { ! SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Package_localAbsoluteName" "', argument " "1"" of type '" "CBM::Package *""'"); } arg1 = reinterpret_cast<CBM::Package * >(argp1); ! result = (arg1)->localAbsoluteName(); ST(argvi) = SWIG_From_std_string SWIG_PERL_CALL_ARGS_1(static_cast<std::string >(result)); argvi++ ; *************** *** 4001,4005 **** ! XS(_wrap_Package_localPackageAbsoluteDirectory) { { CBM::Package *arg1 = (CBM::Package *) 0 ; --- 4001,4005 ---- ! XS(_wrap_Package_localAbsoluteDirectory) { { CBM::Package *arg1 = (CBM::Package *) 0 ; *************** *** 4011,4022 **** if ((items < 1) || (items > 1)) { ! SWIG_croak("Usage: Package_localPackageAbsoluteDirectory(self);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Package, 0 | 0 ); if (!SWIG_IsOK(res1)) { ! SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Package_localPackageAbsoluteDirectory" "', argument " "1"" of type '" "CBM::Package *""'"); } arg1 = reinterpret_cast<CBM::Package * >(argp1); ! result = (arg1)->localPackageAbsoluteDirectory(); ST(argvi) = SWIG_From_std_string SWIG_PERL_CALL_ARGS_1(static_cast<std::string >(result)); argvi++ ; --- 4011,4022 ---- if ((items < 1) || (items > 1)) { ! SWIG_croak("Usage: Package_localAbsoluteDirectory(self);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Package, 0 | 0 ); if (!SWIG_IsOK(res1)) { ! SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Package_localAbsoluteDirectory" "', argument " "1"" of type '" "CBM::Package *""'"); } arg1 = reinterpret_cast<CBM::Package * >(argp1); ! result = (arg1)->localAbsoluteDirectory(); ST(argvi) = SWIG_From_std_string SWIG_PERL_CALL_ARGS_1(static_cast<std::string >(result)); argvi++ ; *************** *** 4117,4121 **** ! XS(_wrap_Package_benchmarkSize) { { CBM::Package *arg1 = (CBM::Package *) 0 ; --- 4117,4121 ---- ! XS(_wrap_Package_totalSize) { { CBM::Package *arg1 = (CBM::Package *) 0 ; *************** *** 4127,4138 **** if ((items < 1) || (items > 1)) { ! SWIG_croak("Usage: Package_benchmarkSize(self);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Package, 0 | 0 ); if (!SWIG_IsOK(res1)) { ! SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Package_benchmarkSize" "', argument " "1"" of type '" "CBM::Package *""'"); } arg1 = reinterpret_cast<CBM::Package * >(argp1); ! result = (int)(arg1)->benchmarkSize(); ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast<int >(result)); argvi++ ; --- 4127,4138 ---- if ((items < 1) || (items > 1)) { ! SWIG_croak("Usage: Package_totalSize(self);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Package, 0 | 0 ); if (!SWIG_IsOK(res1)) { ! SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Package_totalSize" "', argument " "1"" of type '" "CBM::Package *""'"); } arg1 = reinterpret_cast<CBM::Package * >(argp1); ! result = (int)(arg1)->totalSize(); ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast<int >(result)); argvi++ ; *************** *** 7735,7753 **** {"CBMc::Package_Benchmark", _wrap_Package_Benchmark}, {"CBMc::Package_storeStatus", _wrap_Package_storeStatus}, ! {"CBMc::Package_packageName", _wrap_Package_packageName}, ! {"CBMc::Package_packageVersion", _wrap_Package_packageVersion}, ! {"CBMc::Package_packageSize", _wrap_Package_packageSize}, ! {"CBMc::Package_packageComments", _wrap_Package_packageComments}, ! {"CBMc::Package_localPackageName", _wrap_Package_localPackageName}, {"CBMc::Package_language", _wrap_Package_language}, {"CBMc::Package_license", _wrap_Package_license}, {"CBMc::Package_homePage", _wrap_Package_homePage}, {"CBMc::Package_author", _wrap_Package_author}, ! {"CBMc::Package_localPackageAbsoluteName", _wrap_Package_localPackageAbsoluteName}, ! {"CBMc::Package_localPackageAbsoluteDirectory", _wrap_Package_localPackageAbsoluteDirectory}, {"CBMc::Package_extractDirectory", _wrap_Package_extractDirectory}, {"CBMc::Package_hasTest", _wrap_Package_hasTest}, {"CBMc::Package_downloadURL", _wrap_Package_downloadURL}, ! {"CBMc::Package_benchmarkSize", _wrap_Package_benchmarkSize}, {"CBMc::Package_ContextMatches", _wrap_Package_ContextMatches}, {"CBMc::Package_Download", _wrap_Package_Download}, --- 7735,7753 ---- {"CBMc::Package_Benchmark", _wrap_Package_Benchmark}, {"CBMc::Package_storeStatus", _wrap_Package_storeStatus}, ! {"CBMc::Package_Name", _wrap_Package_Name}, ! {"CBMc::Package_Version", _wrap_Package_Version}, ! {"CBMc::Package_Size", _wrap_Package_Size}, ! {"CBMc::Package_Comments", _wrap_Package_Comments}, ! {"CBMc::Package_localName", _wrap_Package_localName}, {"CBMc::Package_language", _wrap_Package_language}, {"CBMc::Package_license", _wrap_Package_license}, {"CBMc::Package_homePage", _wrap_Package_homePage}, {"CBMc::Package_author", _wrap_Package_author}, ! {"CBMc::Package_localAbsoluteName", _wrap_Package_localAbsoluteName}, ! {"CBMc::Package_localAbsoluteDirectory", _wrap_Package_localAbsoluteDirectory}, {"CBMc::Package_extractDirectory", _wrap_Package_extractDirectory}, {"CBMc::Package_hasTest", _wrap_Package_hasTest}, {"CBMc::Package_downloadURL", _wrap_Package_downloadURL}, ! {"CBMc::Package_totalSize", _wrap_Package_totalSize}, {"CBMc::Package_ContextMatches", _wrap_Package_ContextMatches}, {"CBMc::Package_Download", _wrap_Package_Download}, |
|
From: Frederic T. <xf...@us...> - 2007-01-21 21:16:52
|
Update of /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv30793 Modified Files: Benchmark-BENCHPP.cpp Benchmark-BENCHPP.h Benchmark-BENCHPPLINUX.cpp Log Message: API changes on CBM::Package Index: Benchmark-BENCHPP.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPP.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Benchmark-BENCHPP.cpp 21 Jan 2007 20:46:46 -0000 1.4 --- Benchmark-BENCHPP.cpp 21 Jan 2007 21:16:49 -0000 1.5 *************** *** 23,42 **** } ! std::string PackageBENCHPP::packageName(void) { return("benchpp"); } ! std::string PackageBENCHPP::packageVersion(void) { return("1.1"); } ! int PackageBENCHPP::packageSize(void) { return(177532); } ! std::string PackageBENCHPP::packageComments(void) { return("The suite is based on the Ada PIWG suite, and therefore is " \ --- 23,42 ---- } ! std::string PackageBENCHPP::Name(void) { return("benchpp"); } ! std::string PackageBENCHPP::Version(void) { return("1.1"); } ! int PackageBENCHPP::Size(void) { return(177532); } ! std::string PackageBENCHPP::Comments(void) { return("The suite is based on the Ada PIWG suite, and therefore is " \ *************** *** 56,60 **** } ! std::string PackageBENCHPP::localPackageName(void) { return("bench_plus_plus_1.1.tar.Z"); --- 56,60 ---- } ! std::string PackageBENCHPP::localName(void) { return("bench_plus_plus_1.1.tar.Z"); *************** *** 87,91 **** cmd+="cd "; ! cmd+=localPackageAbsoluteDirectory(); cmd+=" && if test ! -f "; cmd+=patch; --- 87,91 ---- cmd+="cd "; ! cmd+=localAbsoluteDirectory(); cmd+=" && if test ! -f "; cmd+=patch; *************** *** 104,108 **** int PackageBENCHPP::extract(int _force) { ! std::string localFile = localPackageAbsoluteName(); std::string cmd; std::string sstdout; --- 104,108 ---- int PackageBENCHPP::extract(int _force) { ! std::string localFile = localAbsoluteName(); std::string cmd; std::string sstdout; *************** *** 133,137 **** cmd="cd "; ! cmd+=localPackageAbsoluteDirectory(); cmd+=" && "; --- 133,137 ---- cmd="cd "; ! cmd+=localAbsoluteDirectory(); cmd+=" && "; *************** *** 156,160 **** cmd="cd "; ! cmd+=localPackageAbsoluteDirectory(); cmd+=" && "; cmd+=CBM_PROG_MAKE; --- 156,160 ---- cmd="cd "; ! cmd+=localAbsoluteDirectory(); cmd+=" && "; cmd+=CBM_PROG_MAKE; *************** *** 194,198 **** cmd="cd "; ! cmd+=localPackageAbsoluteDirectory(); cmd+=" && "; cmd+=CBM_PROG_MAKE; --- 194,198 ---- cmd="cd "; ! cmd+=localAbsoluteDirectory(); cmd+=" && "; cmd+=CBM_PROG_MAKE; *************** *** 217,223 **** } ! int PackageBENCHPP::benchmarkSize(void) { ! return(packageSize()); } --- 217,223 ---- } ! int PackageBENCHPP::totalSize(void) { ! return(Size()); } *************** *** 247,251 **** cmd="cd "; ! cmd+=package->localPackageAbsoluteDirectory(); cmd+=" && echo $(./"; cmd+=benchppBenchmark(); --- 247,251 ---- cmd="cd "; ! cmd+=package->localAbsoluteDirectory(); cmd+=" && echo $(./"; cmd+=benchppBenchmark(); *************** *** 328,332 **** cmd="cd "; ! cmd+=package->localPackageAbsoluteDirectory(); cmd+=" && echo $(./"; cmd+=benchppBenchmark(); --- 328,332 ---- cmd="cd "; ! cmd+=package->localAbsoluteDirectory(); cmd+=" && echo $(./"; cmd+=benchppBenchmark(); Index: Benchmark-BENCHPPLINUX.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPPLINUX.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Benchmark-BENCHPPLINUX.cpp 21 Jan 2007 20:46:46 -0000 1.7 --- Benchmark-BENCHPPLINUX.cpp 21 Jan 2007 21:16:49 -0000 1.8 *************** *** 35,54 **** } ! std::string PackageBENCHPPLINUX::packageName(void) { return("benchpplinux"); } ! std::string PackageBENCHPPLINUX::packageVersion(void) { return("1.1v5"); } ! int PackageBENCHPPLINUX::packageSize(void) { return(83702); } ! std::string PackageBENCHPPLINUX::packageComments(void) { return("Bench++ for Linux is a port of Bench++ (based on " \ --- 35,54 ---- } ! std::string PackageBENCHPPLINUX::Name(void) { return("benchpplinux"); } ! std::string PackageBENCHPPLINUX::Version(void) { return("1.1v5"); } ! int PackageBENCHPPLINUX::Size(void) { return(83702); } ! std::string PackageBENCHPPLINUX::Comments(void) { return("Bench++ for Linux is a port of Bench++ (based on " \ *************** *** 57,61 **** } ! std::string PackageBENCHPPLINUX::localPackageName(void) { return("bench_plus_plus_1.1_linux5.tgz"); --- 57,61 ---- } ! std::string PackageBENCHPPLINUX::localName(void) { return("bench_plus_plus_1.1_linux5.tgz"); *************** *** 74,78 **** int PackageBENCHPPLINUX::extract(int _force) { ! std::string localFile = localPackageAbsoluteName(); std::string cmd; std::string sstdout; --- 74,78 ---- int PackageBENCHPPLINUX::extract(int _force) { ! std::string localFile = localAbsoluteName(); std::string cmd; std::string sstdout; *************** *** 105,109 **** cmd="cd "; ! cmd+=localPackageAbsoluteDirectory(); cmd+=" && "; --- 105,109 ---- cmd="cd "; ! cmd+=localAbsoluteDirectory(); cmd+=" && "; *************** *** 126,130 **** cmd="cd "; ! cmd+=localPackageAbsoluteDirectory(); cmd+=" && "; cmd+=CBM_PROG_MAKE; --- 126,130 ---- cmd="cd "; ! cmd+=localAbsoluteDirectory(); cmd+=" && "; cmd+=CBM_PROG_MAKE; *************** *** 148,152 **** cmd="cd "; ! cmd+=localPackageAbsoluteDirectory(); cmd+=" && "; cmd+=CBM_PROG_MAKE; --- 148,152 ---- cmd="cd "; ! cmd+=localAbsoluteDirectory(); cmd+=" && "; cmd+=CBM_PROG_MAKE; *************** *** 171,177 **** } ! int PackageBENCHPPLINUX::benchmarkSize(void) { ! return(packageSize()); } --- 171,177 ---- } ! int PackageBENCHPPLINUX::totalSize(void) { ! return(Size()); } *************** *** 191,195 **** cmd="cd "; ! cmd+=package->localPackageAbsoluteDirectory(); cmd+=" && echo $(./"; cmd+=benchppBenchmark(); --- 191,195 ---- cmd="cd "; ! cmd+=package->localAbsoluteDirectory(); cmd+=" && echo $(./"; cmd+=benchppBenchmark(); *************** *** 291,295 **** cmd="cd "; ! cmd+=package->localPackageAbsoluteDirectory(); cmd+=" && echo $(./"; cmd+=benchppBenchmark(); --- 291,295 ---- cmd="cd "; ! cmd+=package->localAbsoluteDirectory(); cmd+=" && echo $(./"; cmd+=benchppBenchmark(); Index: Benchmark-BENCHPP.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPP.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Benchmark-BENCHPP.h 21 Jan 2007 20:46:46 -0000 1.4 --- Benchmark-BENCHPP.h 21 Jan 2007 21:16:49 -0000 1.5 *************** *** 23,32 **** virtual std::string expectedMD5(void); ! virtual std::string packageName(void); ! virtual std::string packageVersion(void); ! virtual int packageSize(void); /* in bytes */ ! virtual std::string packageComments(void); ! virtual std::string localPackageName(void); --- 23,32 ---- virtual std::string expectedMD5(void); ! virtual std::string Name(void); ! virtual std::string Version(void); ! virtual int Size(void); /* in bytes */ ! virtual std::string Comments(void); ! virtual std::string localName(void); *************** *** 54,58 **** virtual std::string author(void); ! virtual int benchmarkSize(void); virtual ~PackageBENCHPP(); --- 54,58 ---- virtual std::string author(void); ! virtual int totalSize(void); virtual ~PackageBENCHPP(); |
|
From: Frederic T. <xf...@us...> - 2007-01-21 21:16:37
|
Update of /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv30770 Modified Files: Benchmark-BENCHPPLINUX.h Benchmark-BZIP2.cpp Benchmark-BZIP2.h Benchmark-GZIP.cpp Benchmark-GZIP.h Benchmark-LINPACKC.cpp Benchmark-LINPACKC.h Benchmark-NBENCH.cpp Benchmark-NBENCH.h Benchmark-SCIMARK2.cpp Benchmark-SCIMARK2.h Log Message: API changes on CBM::Package Index: Benchmark-NBENCH.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-NBENCH.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Benchmark-NBENCH.h 18 Jan 2007 18:44:36 -0000 1.4 --- Benchmark-NBENCH.h 21 Jan 2007 21:16:33 -0000 1.5 *************** *** 23,32 **** virtual std::string expectedMD5(void); ! virtual std::string packageName(void); ! virtual std::string packageVersion(void); ! virtual int packageSize(void); /* in bytes */ ! virtual std::string packageComments(void); ! virtual std::string localPackageName(void); --- 23,32 ---- virtual std::string expectedMD5(void); ! virtual std::string Name(void); ! virtual std::string Version(void); ! virtual int Size(void); /* in bytes */ ! virtual std::string Comments(void); ! virtual std::string localName(void); *************** *** 52,56 **** virtual std::string author(void); ! virtual int benchmarkSize(void); virtual ~PackageNBENCH(); --- 52,56 ---- virtual std::string author(void); ! virtual int totalSize(void); virtual ~PackageNBENCH(); Index: Benchmark-LINPACKC.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-LINPACKC.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Benchmark-LINPACKC.h 21 Jan 2007 20:46:47 -0000 1.6 --- Benchmark-LINPACKC.h 21 Jan 2007 21:16:33 -0000 1.7 *************** *** 23,33 **** virtual std::string expectedMD5(void); ! virtual std::string packageName(void); ! virtual std::string packageVersion(void); ! virtual int packageSize(void); /* in bytes */ ! virtual std::string packageComments(void); ! virtual std::string localPackageName(void); --- 23,33 ---- virtual std::string expectedMD5(void); ! virtual std::string Name(void); ! virtual std::string Version(void); ! virtual int Size(void); /* in bytes */ ! virtual std::string Comments(void); ! virtual std::string localName(void); *************** *** 46,50 **** virtual std::string author(void); ! virtual int benchmarkSize(void); virtual ~PackageLINPACKC(); }; --- 46,50 ---- virtual std::string author(void); ! virtual int totalSize(void); virtual ~PackageLINPACKC(); }; Index: Benchmark-SCIMARK2.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-SCIMARK2.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Benchmark-SCIMARK2.h 21 Jan 2007 20:46:47 -0000 1.4 --- Benchmark-SCIMARK2.h 21 Jan 2007 21:16:34 -0000 1.5 *************** *** 22,31 **** virtual std::string expectedMD5(void); ! virtual std::string packageName(void); ! virtual std::string packageVersion(void); ! virtual int packageSize(void); /* in bytes */ ! virtual std::string packageComments(void); ! virtual std::string localPackageName(void); --- 22,31 ---- virtual std::string expectedMD5(void); ! virtual std::string Name(void); ! virtual std::string Version(void); ! virtual int Size(void); /* in bytes */ ! virtual std::string Comments(void); ! virtual std::string localName(void); *************** *** 53,57 **** virtual std::string author(void); ! virtual int benchmarkSize(void); virtual ~PackageSCIMARK2(); --- 53,57 ---- virtual std::string author(void); ! virtual int totalSize(void); virtual ~PackageSCIMARK2(); Index: Benchmark-NBENCH.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-NBENCH.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Benchmark-NBENCH.cpp 18 Jan 2007 18:44:36 -0000 1.3 --- Benchmark-NBENCH.cpp 21 Jan 2007 21:16:33 -0000 1.4 *************** *** 24,48 **** } ! std::string PackageNBENCH::packageName(void) { return("nbench"); } ! std::string PackageNBENCH::packageVersion(void) { return("2.2.2"); } ! int PackageNBENCH::packageSize(void) { return(111751); } ! std::string PackageNBENCH::packageComments(void) { return("Uwe F. Mayer's UNIX port of BYTE Magazine's BYTEmark benchmark program"); } ! std::string PackageNBENCH::localPackageName(void) { return("nbench-byte-2.2.2.tar.gz"); --- 24,48 ---- } ! std::string PackageNBENCH::Name(void) { return("nbench"); } ! std::string PackageNBENCH::Version(void) { return("2.2.2"); } ! int PackageNBENCH::Size(void) { return(111751); } ! std::string PackageNBENCH::Comments(void) { return("Uwe F. Mayer's UNIX port of BYTE Magazine's BYTEmark benchmark program"); } ! std::string PackageNBENCH::localName(void) { return("nbench-byte-2.2.2.tar.gz"); *************** *** 61,65 **** int PackageNBENCH::extract(int _force) { ! std::string localFile = localPackageAbsoluteName(); std::string cmd; std::string sstdout; --- 61,65 ---- int PackageNBENCH::extract(int _force) { ! std::string localFile = localAbsoluteName(); std::string cmd; std::string sstdout; *************** *** 96,100 **** cmd="cd "; ! cmd+=localPackageAbsoluteDirectory(); cmd+=" && "; cmd+=CBM_PROG_MAKE; --- 96,100 ---- cmd="cd "; ! cmd+=localAbsoluteDirectory(); cmd+=" && "; cmd+=CBM_PROG_MAKE; *************** *** 134,138 **** cmd="cd "; ! cmd+=localPackageAbsoluteDirectory(); cmd+=" && "; cmd+=CBM_PROG_MAKE; --- 134,138 ---- cmd="cd "; ! cmd+=localAbsoluteDirectory(); cmd+=" && "; cmd+=CBM_PROG_MAKE; *************** *** 157,163 **** } ! int PackageNBENCH::benchmarkSize(void) { ! return(packageSize()); } --- 157,163 ---- } ! int PackageNBENCH::totalSize(void) { ! return(Size()); } *************** *** 180,184 **** contains+="=T\n"; ! fileName+=package->localPackageAbsoluteDirectory(); fileName+="/COMPBENCH.DAT"; --- 180,184 ---- contains+="=T\n"; ! fileName+=package->localAbsoluteDirectory(); fileName+="/COMPBENCH.DAT"; *************** *** 208,212 **** cmd="cd "; ! cmd+=package->localPackageAbsoluteDirectory(); cmd+=" && echo $(./nbench -cCOMPBENCH.DAT | grep '^"; cmd+=nbyteBenchmarkLabel(); --- 208,212 ---- cmd="cd "; ! cmd+=package->localAbsoluteDirectory(); cmd+=" && echo $(./nbench -cCOMPBENCH.DAT | grep '^"; cmd+=nbyteBenchmarkLabel(); Index: Benchmark-GZIP.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-GZIP.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Benchmark-GZIP.h 18 Jan 2007 18:44:36 -0000 1.4 --- Benchmark-GZIP.h 21 Jan 2007 21:16:33 -0000 1.5 *************** *** 23,31 **** virtual std::string expectedMD5(void); ! virtual std::string packageName(void); ! virtual std::string packageVersion(void); ! virtual int packageSize(void); /* in bytes */ ! virtual std::string packageComments(void); ! virtual std::string localPackageName(void); virtual char* extractDirectory(void); --- 23,31 ---- virtual std::string expectedMD5(void); ! virtual std::string Name(void); ! virtual std::string Version(void); ! virtual int Size(void); /* in bytes */ ! virtual std::string Comments(void); ! virtual std::string localName(void); virtual char* extractDirectory(void); Index: Benchmark-BENCHPPLINUX.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPPLINUX.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Benchmark-BENCHPPLINUX.h 21 Jan 2007 20:46:46 -0000 1.4 --- Benchmark-BENCHPPLINUX.h 21 Jan 2007 21:16:33 -0000 1.5 *************** *** 23,34 **** virtual std::string expectedMD5(void); ! virtual std::string packageName(void); ! virtual std::string packageVersion(void); ! virtual int packageSize(void); /* in bytes */ ! virtual std::string packageComments(void); virtual std::string language(void); ! virtual std::string localPackageName(void); --- 23,34 ---- virtual std::string expectedMD5(void); ! virtual std::string Name(void); ! virtual std::string Version(void); ! virtual int Size(void); /* in bytes */ ! virtual std::string Comments(void); virtual std::string language(void); ! virtual std::string localName(void); *************** *** 53,57 **** virtual std::string author(void); ! virtual int benchmarkSize(void); virtual ~PackageBENCHPPLINUX(); --- 53,57 ---- virtual std::string author(void); ! virtual int totalSize(void); virtual ~PackageBENCHPPLINUX(); Index: Benchmark-BZIP2.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BZIP2.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Benchmark-BZIP2.cpp 18 Jan 2007 18:44:36 -0000 1.5 --- Benchmark-BZIP2.cpp 21 Jan 2007 21:16:33 -0000 1.6 *************** *** 25,49 **** } ! std::string PackageBZIP2::packageName(void) { return("bzip2"); } ! std::string PackageBZIP2::packageVersion(void) { return("1.0.3"); } ! int PackageBZIP2::packageSize(void) { return(669075); } ! std::string PackageBZIP2::packageComments(void) { return("Official bzip2-1.0.3 source package."); } ! std::string PackageBZIP2::localPackageName(void) { return("bzip2-1.0.3.tar.Z"); --- 25,49 ---- } ! std::string PackageBZIP2::Name(void) { return("bzip2"); } ! std::string PackageBZIP2::Version(void) { return("1.0.3"); } ! int PackageBZIP2::Size(void) { return(669075); } ! std::string PackageBZIP2::Comments(void) { return("Official bzip2-1.0.3 source package."); } ! std::string PackageBZIP2::localName(void) { return("bzip2-1.0.3.tar.Z"); *************** *** 67,71 **** cmd="cd "; ! cmd+=localPackageAbsoluteDirectory(); cmd+=" && "; cmd+=CBM_PROG_MAKE; --- 67,71 ---- cmd="cd "; ! cmd+=localAbsoluteDirectory(); cmd+=" && "; cmd+=CBM_PROG_MAKE; *************** *** 110,114 **** cmd="cd "; ! cmd+=localPackageAbsoluteDirectory(); cmd+=" && "; cmd+=CBM_PROG_MAKE; --- 110,114 ---- cmd="cd "; ! cmd+=localAbsoluteDirectory(); cmd+=" && "; cmd+=CBM_PROG_MAKE; Index: Benchmark-GZIP.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-GZIP.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Benchmark-GZIP.cpp 18 Jan 2007 18:44:36 -0000 1.5 --- Benchmark-GZIP.cpp 21 Jan 2007 21:16:33 -0000 1.6 *************** *** 27,51 **** } ! std::string PackageGZIP::packageName(void) { return("gzip"); } ! std::string PackageGZIP::packageVersion(void) { return("1.2.4"); } ! int PackageGZIP::packageSize(void) { return(327865); } ! std::string PackageGZIP::packageComments(void) { return("Official gzip-1.2.4 source package."); } ! std::string PackageGZIP::localPackageName(void) { return("gzip-1.2.4.tar.Z"); --- 27,51 ---- } ! std::string PackageGZIP::Name(void) { return("gzip"); } ! std::string PackageGZIP::Version(void) { return("1.2.4"); } ! int PackageGZIP::Size(void) { return(327865); } ! std::string PackageGZIP::Comments(void) { return("Official gzip-1.2.4 source package."); } ! std::string PackageGZIP::localName(void) { return("gzip-1.2.4.tar.Z"); *************** *** 68,72 **** cmd="cd "; ! cmd+=localPackageAbsoluteDirectory(); cmd+=" && "; cmd+=CBM_PROG_MAKE; --- 68,72 ---- cmd="cd "; ! cmd+=localAbsoluteDirectory(); cmd+=" && "; cmd+=CBM_PROG_MAKE; Index: Benchmark-SCIMARK2.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-SCIMARK2.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Benchmark-SCIMARK2.cpp 21 Jan 2007 20:46:47 -0000 1.4 --- Benchmark-SCIMARK2.cpp 21 Jan 2007 21:16:33 -0000 1.5 *************** *** 31,55 **** } ! std::string PackageSCIMARK2::packageName(void) { return("scimark2"); } ! std::string PackageSCIMARK2::packageVersion(void) { return("2.0"); } ! int PackageSCIMARK2::packageSize(void) { return(13792); } ! std::string PackageSCIMARK2::packageComments(void) { return("Official SciMark 2.0 package. Yet, a minor patch held locally is applied by benchmark suite."); } ! std::string PackageSCIMARK2::localPackageName(void) { return("scimark2_1c.zip"); --- 31,55 ---- } ! std::string PackageSCIMARK2::Name(void) { return("scimark2"); } ! std::string PackageSCIMARK2::Version(void) { return("2.0"); } ! int PackageSCIMARK2::Size(void) { return(13792); } ! std::string PackageSCIMARK2::Comments(void) { return("Official SciMark 2.0 package. Yet, a minor patch held locally is applied by benchmark suite."); } ! std::string PackageSCIMARK2::localName(void) { return("scimark2_1c.zip"); *************** *** 82,86 **** cmd+="cd "; ! cmd+=localPackageAbsoluteDirectory(); cmd+=" && if test ! -f "; cmd+=patch; --- 82,86 ---- cmd+="cd "; ! cmd+=localAbsoluteDirectory(); cmd+=" && if test ! -f "; cmd+=patch; *************** *** 99,103 **** int PackageSCIMARK2::extract(int _force) { ! std::string localFile = localPackageAbsoluteName(); std::string cmd; std::string sstdout; --- 99,103 ---- int PackageSCIMARK2::extract(int _force) { ! std::string localFile = localAbsoluteName(); std::string cmd; std::string sstdout; *************** *** 116,120 **** cmd+=system->temporaryDirectory(CBM::System::Download); cmd+="/"; ! cmd+=localPackageName(); return(system->exec(cmd, sstdout)==0); --- 116,120 ---- cmd+=system->temporaryDirectory(CBM::System::Download); cmd+="/"; ! cmd+=localName(); return(system->exec(cmd, sstdout)==0); *************** *** 138,142 **** cmd="cd "; ! cmd+=localPackageAbsoluteDirectory(); cmd+=" && "; cmd+=CBM_PROG_MAKE; --- 138,142 ---- cmd="cd "; ! cmd+=localAbsoluteDirectory(); cmd+=" && "; cmd+=CBM_PROG_MAKE; *************** *** 176,180 **** cmd="cd "; ! cmd+=localPackageAbsoluteDirectory(); cmd+=" && "; cmd+=CBM_PROG_MAKE; --- 176,180 ---- cmd="cd "; ! cmd+=localAbsoluteDirectory(); cmd+=" && "; cmd+=CBM_PROG_MAKE; *************** *** 199,205 **** } ! int PackageSCIMARK2::benchmarkSize(void) { ! return(packageSize()); } --- 199,205 ---- } ! int PackageSCIMARK2::totalSize(void) { ! return(Size()); } *************** *** 229,233 **** cmd="cd "; ! cmd+=package->localPackageAbsoluteDirectory(); cmd+=" && echo $(./scimark2 "; cmd+=scimark2BenchmarkLabel(); --- 229,233 ---- cmd="cd "; ! cmd+=package->localAbsoluteDirectory(); cmd+=" && echo $(./scimark2 "; cmd+=scimark2BenchmarkLabel(); Index: Benchmark-LINPACKC.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-LINPACKC.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Benchmark-LINPACKC.cpp 21 Jan 2007 20:46:47 -0000 1.8 --- Benchmark-LINPACKC.cpp 21 Jan 2007 21:16:33 -0000 1.9 *************** *** 23,37 **** } ! std::string PackageLINPACKC::packageName(void) { return("linpackc"); } ! std::string PackageLINPACKC::packageVersion(void) { return("0.1.1"); } ! int PackageLINPACKC::packageSize(void) { return(75029); --- 23,37 ---- } ! std::string PackageLINPACKC::Name(void) { return("linpackc"); } ! std::string PackageLINPACKC::Version(void) { return("0.1.1"); } ! int PackageLINPACKC::Size(void) { return(75029); *************** *** 39,48 **** ! std::string PackageLINPACKC::packageComments(void) { return("This is the former linpackc benchmark translated to C by Bonnie Toy, which has been modified to suit compbenchmarks requirements."); } ! std::string PackageLINPACKC::localPackageName(void) { return("cbm-bm-linpackc"); --- 39,48 ---- ! std::string PackageLINPACKC::Comments(void) { return("This is the former linpackc benchmark translated to C by Bonnie Toy, which has been modified to suit compbenchmarks requirements."); } ! std::string PackageLINPACKC::localName(void) { return("cbm-bm-linpackc"); *************** *** 58,62 **** std::string dum = "cbm-bm-linpackc-"; ! dum+=packageVersion(); return((char*) dum.c_str()); } --- 58,62 ---- std::string dum = "cbm-bm-linpackc-"; ! dum+=Version(); return((char*) dum.c_str()); } *************** *** 82,88 **** } ! int PackageLINPACKC::benchmarkSize(void) { ! return(packageSize()); } --- 82,88 ---- } ! int PackageLINPACKC::totalSize(void) { ! return(Size()); } *************** *** 91,96 **** } - - BenchmarkLINPACKC::BenchmarkLINPACKC(CBM::Package *_package) : Benchmark(_package) --- 91,94 ---- *************** *** 115,119 **** cmd="cd "; ! cmd+=package->localPackageAbsoluteDirectory(); cmd+=" && echo $("; cmd+="./"; --- 113,117 ---- cmd="cd "; ! cmd+=package->localAbsoluteDirectory(); cmd+=" && echo $("; cmd+="./"; Index: Benchmark-BZIP2.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BZIP2.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Benchmark-BZIP2.h 18 Jan 2007 18:44:36 -0000 1.5 --- Benchmark-BZIP2.h 21 Jan 2007 21:16:33 -0000 1.6 *************** *** 23,31 **** virtual std::string expectedMD5(void); ! virtual std::string packageName(void); ! virtual std::string packageVersion(void); ! virtual int packageSize(void); /* in bytes */ ! virtual std::string packageComments(void); ! virtual std::string localPackageName(void); virtual char* extractDirectory(void); --- 23,31 ---- virtual std::string expectedMD5(void); ! virtual std::string Name(void); ! virtual std::string Version(void); ! virtual int Size(void); /* in bytes */ ! virtual std::string Comments(void); ! virtual std::string localName(void); virtual char* extractDirectory(void); |
|
From: Frederic T. <xf...@us...> - 2007-01-21 21:16:21
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv30754 Modified Files: 02-CBMSystem-benchs.pl Log Message: API changes on CBM::Package Index: 02-CBMSystem-benchs.pl =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/02-CBMSystem-benchs.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** 02-CBMSystem-benchs.pl 21 Jan 2007 20:47:25 -0000 1.4 --- 02-CBMSystem-benchs.pl 21 Jan 2007 21:16:16 -0000 1.5 *************** *** 41,56 **** my $pack = "$_"; $pack =~ s/^(.*?)-.+/$1/g; ! ok($pack eq $p->packageName(), "checking packageName() for $_ : '$pack'/" . $p->packageName()); ! check_simple($p->packageVersion()); ! my $siz = $p->packageSize(); check_simple($siz); ok($siz > 0); ! check_simple($p->packageComments()); ! check_simple($p->localPackageName()); ! my $siz_b = $p->benchmarkSize(); check_simple($siz_b); ok($siz_b > 0); --- 41,56 ---- my $pack = "$_"; $pack =~ s/^(.*?)-.+/$1/g; ! ok($pack eq $p->Name(), "checking Name() for $_ : '$pack'/" . $p->Name()); ! check_simple($p->Version()); ! my $siz = $p->Size(); check_simple($siz); ok($siz > 0); ! check_simple($p->Comments()); ! check_simple($p->localName()); ! my $siz_b = $p->Size(); check_simple($siz_b); ok($siz_b > 0); *************** *** 70,75 **** check_simple($p->author()); ! check_simple($p->localPackageAbsoluteName()); ! check_simple($p->localPackageAbsoluteDirectory()); my $hast = $p->hasTest(); --- 70,75 ---- check_simple($p->author()); ! check_simple($p->localAbsoluteName()); ! check_simple($p->localAbsoluteDirectory()); my $hast = $p->hasTest(); |
Update of /cvsroot/compbench/CompBenchmarks++/Benchmark In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv30394 Modified Files: Benchmark-Autotools.cpp Benchmark-Autotools.h Benchmark.cpp Benchmark-DLLoader.cpp Benchmark-xZIP.cpp Package.cpp Package.h Log Message: API changes on CBM::Package Index: Benchmark-DLLoader.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-DLLoader.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Benchmark-DLLoader.cpp 21 Jan 2007 20:47:08 -0000 1.7 --- Benchmark-DLLoader.cpp 21 Jan 2007 21:16:01 -0000 1.8 *************** *** 24,28 **** for(i=0; i<s; i++) { l=cbmlib_loaded_libraries[i]; ! if (l->PackageGet()->packageName()==package_id) return(l); } --- 24,28 ---- for(i=0; i<s; i++) { l=cbmlib_loaded_libraries[i]; ! if (l->PackageGet()->Name()==package_id) return(l); } Index: Package.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Package.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Package.h 18 Jan 2007 18:44:01 -0000 1.7 --- Package.h 21 Jan 2007 21:16:02 -0000 1.8 *************** *** 207,220 **** /** Package name * \return a std::string like 'gzip', without quotes */ ! virtual std::string packageName(void); /** Package version * \return a std::string like '1.2.4', without quotes */ ! virtual std::string packageVersion(void) = 0; /** Package size, in bytes * \return an integer coding the size of package's archive (to download) in bytes. */ ! virtual int packageSize(void) = 0; /** Package comments --- 207,220 ---- /** Package name * \return a std::string like 'gzip', without quotes */ ! virtual std::string Name(void); /** Package version * \return a std::string like '1.2.4', without quotes */ ! virtual std::string Version(void) = 0; /** Package size, in bytes * \return an integer coding the size of package's archive (to download) in bytes. */ ! virtual int Size(void) = 0; /** Package comments *************** *** 222,231 **** * \return comments, as std::string */ ! virtual std::string packageComments(void) = 0; /** Package local filename * \return a relative filename containing the local name of the uncompressed * package (like 'gzip-1.2.4.tar.Z', without quotes) */ ! virtual std::string localPackageName(void) = 0; /** Benchmark's language --- 222,231 ---- * \return comments, as std::string */ ! virtual std::string Comments(void) = 0; /** Package local filename * \return a relative filename containing the local name of the uncompressed * package (like 'gzip-1.2.4.tar.Z', without quotes) */ ! virtual std::string localName(void) = 0; /** Benchmark's language *************** *** 248,256 **** * \return local uncompressed absolute archive filename for benchmark. * \sa localPackageName() */ ! virtual std::string localPackageAbsoluteName(void); /** Convenience method * \return directory used for extracting package * \sa CBM::System::Extract */ ! virtual std::string localPackageAbsoluteDirectory(void); /** Relative directory to extract package --- 248,256 ---- * \return local uncompressed absolute archive filename for benchmark. * \sa localPackageName() */ ! virtual std::string localAbsoluteName(void); /** Convenience method * \return directory used for extracting package * \sa CBM::System::Extract */ ! virtual std::string localAbsoluteDirectory(void); /** Relative directory to extract package *************** *** 277,281 **** * \sa preConfigure() * \sa packageSize() */ ! virtual int benchmarkSize(void); /** Compairs previous compilation context to current one --- 277,281 ---- * \sa preConfigure() * \sa packageSize() */ ! virtual int totalSize(void); /** Compairs previous compilation context to current one Index: Benchmark-xZIP.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-xZIP.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Benchmark-xZIP.cpp 18 Jan 2007 18:44:00 -0000 1.4 --- Benchmark-xZIP.cpp 21 Jan 2007 21:16:02 -0000 1.5 *************** *** 17,21 **** int n = 12 * 1024 * 1024; ! fileName+=localPackageAbsoluteDirectory(); fileName+="/Compbenchmarks.dat"; --- 17,21 ---- int n = 12 * 1024 * 1024; ! fileName+=localAbsoluteDirectory(); fileName+="/Compbenchmarks.dat"; *************** *** 49,53 **** cmd="cd "; ! cmd+=package->localPackageAbsoluteDirectory(); cmd+=" && ./"; cmd+=benchmarkProgram(); --- 49,53 ---- cmd="cd "; ! cmd+=package->localAbsoluteDirectory(); cmd+=" && ./"; cmd+=benchmarkProgram(); *************** *** 58,62 **** if (System()->exec(cmd, sstdout)==0) { end=System()->Time(); ! sprintf(dum, "%0.0f", ((float)package->benchmarkSize())/((int)(end-start))); result=dum; return(result); --- 58,62 ---- if (System()->exec(cmd, sstdout)==0) { end=System()->Time(); ! sprintf(dum, "%0.0f", ((float)package->totalSize())/((int)(end-start))); result=dum; return(result); Index: Benchmark.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Benchmark.cpp 18 Jan 2007 18:44:01 -0000 1.20 --- Benchmark.cpp 21 Jan 2007 21:16:01 -0000 1.21 *************** *** 16,22 **** { std::cout << "benchmark::Name=" << benchmarkName() << std::endl ! << "benchmark::Package=" << Package()->packageName() << std::endl << "benchmark::Language=" << Package()->language() << std::endl ! << "benchmark::Size=" << Package()->benchmarkSize() << std::endl << "benchmark::Status=" << Package()->getStatus() << std::endl << "benchmark::Comments=" << benchmarkComments() << std::endl --- 16,22 ---- { 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 *************** *** 65,69 **** } else { info="Benchmarking failed for "; ! info+=Package()->packageName(); cbmUI->Fatal(info); } --- 65,69 ---- } else { info="Benchmarking failed for "; ! info+=Package()->Name(); cbmUI->Fatal(info); } Index: Package.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Package.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Package.cpp 18 Jan 2007 18:44:01 -0000 1.7 --- Package.cpp 21 Jan 2007 21:16:02 -0000 1.8 *************** *** 50,58 **** void Package::display(void) { ! std::cout << "package::Name=" << packageName() << std::endl << "package::Url=" << downloadURL() << std::endl ! << "package::Size=" << packageSize() << std::endl ! << "package::Version=" << packageVersion() << std::endl ! << "package::Comments=" << packageComments() << std::endl << "package::License=" << license() << std::endl << "package::Homepage=" << homePage() << std::endl --- 50,58 ---- void Package::display(void) { ! std::cout << "package::Name=" << Name() << std::endl << "package::Url=" << downloadURL() << std::endl ! << "package::Size=" << Size() << std::endl ! << "package::Version=" << Version() << std::endl ! << "package::Comments=" << Comments() << std::endl << "package::License=" << license() << std::endl << "package::Homepage=" << homePage() << std::endl *************** *** 78,82 **** } ! std::string Package::packageName(void) { return(""); --- 78,82 ---- } ! std::string Package::Name(void) { return(""); *************** *** 90,94 **** id="bm-status-"; ! id+=packageName(); --- 90,94 ---- id="bm-status-"; ! id+=Name(); *************** *** 113,132 **** contextFile+="bm-context-"; ! contextFile+=packageName(); return(system->unlink(contextFile)); } ! std::string Package::localPackageAbsoluteName(void) { std::string localFile = system->temporaryDirectory(System::Download); localFile+="/"; ! localFile+=localPackageName(); return(localFile); } ! std::string Package::localPackageAbsoluteDirectory(void) { std::string cmd; --- 113,132 ---- contextFile+="bm-context-"; ! contextFile+=Name(); return(system->unlink(contextFile)); } ! std::string Package::localAbsoluteName(void) { std::string localFile = system->temporaryDirectory(System::Download); localFile+="/"; ! localFile+=localName(); return(localFile); } ! std::string Package::localAbsoluteDirectory(void) { std::string cmd; *************** *** 149,157 **** } ! int Package::benchmarkSize(void) { return(0); } int Package::hasTest(void) { --- 149,158 ---- } ! int Package::totalSize(void) { return(0); } + int Package::hasTest(void) { *************** *** 167,171 **** int Package::uninstall(void) { ! std::string where = localPackageAbsoluteDirectory(); std::string cmd; cmd+=CBM_PROG_RM; --- 168,172 ---- int Package::uninstall(void) { ! std::string where = localAbsoluteDirectory(); std::string cmd; cmd+=CBM_PROG_RM; *************** *** 187,191 **** id="bm-status-"; ! id+=packageName(); sprintf(c, "%d", (int) _status); --- 188,192 ---- id="bm-status-"; ! id+=Name(); sprintf(c, "%d", (int) _status); *************** *** 216,220 **** id="bm-context-"; ! id+=packageName(); r=system->store((char*) id.c_str(), --- 217,221 ---- id="bm-context-"; ! id+=Name(); r=system->store((char*) id.c_str(), *************** *** 232,236 **** id="bm-context-"; ! id+=packageName(); previousContext=system->read((char*) id.c_str()); --- 233,237 ---- id="bm-context-"; ! id+=Name(); previousContext=system->read((char*) id.c_str()); *************** *** 249,253 **** int Package::Download(int _force) { ! std::string localFile = localPackageAbsoluteName(); std::string expected_md5; std::string md5; --- 250,254 ---- int Package::Download(int _force) { ! std::string localFile = localAbsoluteName(); std::string expected_md5; std::string md5; *************** *** 259,265 **** } ! info=packageName(); info+=" "; ! info+=packageVersion(); cbmUI->Information(CBM::UI::BenchDownload, --- 260,266 ---- } ! info=Name(); info+=" "; ! info+=Version(); cbmUI->Information(CBM::UI::BenchDownload, *************** *** 318,322 **** cbmUI->Information(CBM::UI::BenchExtract, ! packageName()); r=extract(_force); --- 319,323 ---- cbmUI->Information(CBM::UI::BenchExtract, ! Name()); r=extract(_force); *************** *** 327,331 **** std::string info; info="Error extracting "; ! info+=localPackageAbsoluteName(); info+=" into "; info+=system->temporaryDirectory(System::Extract); --- 328,332 ---- std::string info; info="Error extracting "; ! info+=localAbsoluteName(); info+=" into "; info+=system->temporaryDirectory(System::Extract); *************** *** 349,353 **** cbmUI->Information(CBM::UI::BenchPatch, ! packageName()); r=patch(_force); --- 350,354 ---- cbmUI->Information(CBM::UI::BenchPatch, ! Name()); r=patch(_force); *************** *** 358,362 **** std::string info; info="Error patching "; ! info+=localPackageAbsoluteName(); cbmUI->Fatal(info); } --- 359,363 ---- std::string info; info="Error patching "; ! info+=localAbsoluteName(); cbmUI->Fatal(info); } *************** *** 379,383 **** cbmUI->Information(CBM::UI::BenchPreconfigure, ! packageName()); r=preConfigure(_force); --- 380,384 ---- cbmUI->Information(CBM::UI::BenchPreconfigure, ! Name()); r=preConfigure(_force); *************** *** 389,393 **** info="Error in "; ! info+=packageName(); info+="'s pre-configuration"; cbmUI->Fatal(info); --- 390,394 ---- info="Error in "; ! info+=Name(); info+="'s pre-configuration"; cbmUI->Fatal(info); *************** *** 408,412 **** } ! info=packageName(); info+=" with compiler "; info+=_currentCompiler->Binary(); --- 409,413 ---- } ! info=Name(); info+=" with compiler "; info+=_currentCompiler->Binary(); *************** *** 443,447 **** } else { info="Configure failed for "; ! info+=packageName(); cbmUI->Fatal(info); } --- 444,448 ---- } else { info="Configure failed for "; ! info+=Name(); cbmUI->Fatal(info); } *************** *** 462,466 **** cbmUI->Information(CBM::UI::BenchMake, ! packageName()); beg=system->Time(); --- 463,467 ---- cbmUI->Information(CBM::UI::BenchMake, ! Name()); beg=system->Time(); *************** *** 474,478 **** } else { info="Make failed for "; ! info+=packageName(); cbmUI->Fatal(info); --- 475,479 ---- } else { info="Make failed for "; ! info+=Name(); cbmUI->Fatal(info); *************** *** 505,513 **** if (UO_enableTestSuite) { cbmUI->Information(CBM::UI::BenchTest, ! packageName()); r=test(_force); } else { ! dum=packageName(); dum+=" : passed (disabled by user option)."; cbmUI->Information(CBM::UI::BenchTest, --- 506,514 ---- if (UO_enableTestSuite) { cbmUI->Information(CBM::UI::BenchTest, ! Name()); r=test(_force); } else { ! dum=Name(); dum+=" : passed (disabled by user option)."; cbmUI->Information(CBM::UI::BenchTest, *************** *** 521,525 **** std::string info; info="Error testing "; ! info+=localPackageAbsoluteName(); cbmUI->Fatal(info); } --- 522,526 ---- std::string info; info="Error testing "; ! info+=localAbsoluteName(); cbmUI->Fatal(info); } *************** *** 538,542 **** cbmUI->Information(CBM::UI::BenchClean, ! packageName()); --- 539,543 ---- cbmUI->Information(CBM::UI::BenchClean, ! Name()); *************** *** 547,551 **** } else { info="Clean failed for "; ! info+=packageName(); /* cbmUI->Fatal(info); */ } --- 548,552 ---- } else { info="Clean failed for "; ! info+=Name(); /* cbmUI->Fatal(info); */ } *************** *** 584,588 **** int Package::Fetch(char *_source, int _force) { ! std::string dest = localPackageAbsoluteName(); std::string source = _source; std::string expected_md5; --- 585,589 ---- int Package::Fetch(char *_source, int _force) { ! std::string dest = localAbsoluteName(); std::string source = _source; std::string expected_md5; *************** *** 622,635 **** cbmUI->Information(CBM::UI::BenchUninstall, ! packageName()); statusFile=system->temporaryDirectory(System::Status); statusFile+="/"; statusFile+="bm-status-"; ! statusFile+=packageName(); if (getStatus()!=Unknown) { ! system->unlink(localPackageAbsoluteName().c_str()); system->unlink(statusFile.c_str()); resetContext(); --- 623,636 ---- cbmUI->Information(CBM::UI::BenchUninstall, ! Name()); statusFile=system->temporaryDirectory(System::Status); statusFile+="/"; statusFile+="bm-status-"; ! statusFile+=Name(); if (getStatus()!=Unknown) { ! system->unlink(localAbsoluteName().c_str()); system->unlink(statusFile.c_str()); resetContext(); *************** *** 646,650 **** { // Status result = Unknown; ! std::string localFile = localPackageAbsoluteName(); if (status==Unknown) --- 647,651 ---- { // Status result = Unknown; ! std::string localFile = localAbsoluteName(); if (status==Unknown) Index: Benchmark-Autotools.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-Autotools.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Benchmark-Autotools.cpp 18 Jan 2007 18:44:00 -0000 1.6 --- Benchmark-Autotools.cpp 21 Jan 2007 21:16:01 -0000 1.7 *************** *** 15,19 **** int PackageAutotools::extract(int _force) { ! std::string localFile = localPackageAbsoluteName(); std::string cmd; std::string sstdout; --- 15,19 ---- int PackageAutotools::extract(int _force) { ! std::string localFile = localAbsoluteName(); std::string cmd; std::string sstdout; *************** *** 40,44 **** cmd="cd "; ! cmd+=localPackageAbsoluteDirectory(); cmd+=" && "; --- 40,44 ---- cmd="cd "; ! cmd+=localAbsoluteDirectory(); cmd+=" && "; *************** *** 80,84 **** cmd="cd "; ! cmd+=localPackageAbsoluteDirectory(); cmd+=" && "; cmd+=CBM_PROG_MAKE; --- 80,84 ---- cmd="cd "; ! cmd+=localAbsoluteDirectory(); cmd+=" && "; cmd+=CBM_PROG_MAKE; *************** *** 94,98 **** cmd="cd "; ! cmd+=localPackageAbsoluteDirectory(); cmd+=" && "; cmd+=CBM_PROG_MAKE; --- 94,98 ---- cmd="cd "; ! cmd+=localAbsoluteDirectory(); cmd+=" && "; cmd+=CBM_PROG_MAKE; Index: Benchmark-Autotools.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-Autotools.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Benchmark-Autotools.h 18 Jan 2007 18:44:00 -0000 1.6 --- Benchmark-Autotools.h 21 Jan 2007 21:16:01 -0000 1.7 *************** *** 29,33 **** * Extract a gzipped-tarball. * \return 1 if ok. ! * \sa CBMBenchmark::localPackageAbsoluteDirectory() */ virtual int extract(int _force = 0); /** Configure package --- 29,33 ---- * Extract a gzipped-tarball. * \return 1 if ok. ! * \sa CBMBenchmark::packageAbsoluteDirectory() */ virtual int extract(int _force = 0); /** Configure package |
|
From: Frederic T. <xf...@us...> - 2007-01-21 20:48:00
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19925 Modified Files: CBM.i CBM.pm CBM_wrap.cxx Glue.cpp Glue.h Log Message: API changes. CBM namespace. Index: CBM.pm =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM.pm,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CBM.pm 17 Jan 2007 19:21:17 -0000 1.7 --- CBM.pm 21 Jan 2007 20:47:56 -0000 1.8 *************** *** 52,112 **** *c_str = *CBMc::c_str; ! ############# Class : CBM::CBMSystem ############## ! ! package CBM::CBMSystem; ! use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); ! @ISA = qw( CBM ); ! %OWNER = (); ! *Root = *CBMc::CBMSystem_Root; ! *HostDep = *CBMc::CBMSystem_HostDep; ! *Extract = *CBMc::CBMSystem_Extract; ! *Patches = *CBMc::CBMSystem_Patches; ! *System = *CBMc::CBMSystem_System; ! *Download = *CBMc::CBMSystem_Download; ! *Status = *CBMc::CBMSystem_Status; ! *Configuration = *CBMc::CBMSystem_Configuration; ! *init = *CBMc::CBMSystem_init; ! *packageList = *CBMc::CBMSystem_packageList; ! *packageNumber = *CBMc::CBMSystem_packageNumber; ! *Package = *CBMc::CBMSystem_Package; ! *Benchmark = *CBMc::CBMSystem_Benchmark; ! *displayAllPackages = *CBMc::CBMSystem_displayAllPackages; ! *displayAllBenchmarks = *CBMc::CBMSystem_displayAllBenchmarks; ! *Split = *CBMc::CBMSystem_Split; ! *Chomp = *CBMc::CBMSystem_Chomp; ! *display = *CBMc::CBMSystem_display; ! *displayPrograms = *CBMc::CBMSystem_displayPrograms; ! *exec = *CBMc::CBMSystem_exec; ! *md5 = *CBMc::CBMSystem_md5; ! *md5File = *CBMc::CBMSystem_md5File; ! *download = *CBMc::CBMSystem_download; ! *copy = *CBMc::CBMSystem_copy; ! *mkdir = *CBMc::CBMSystem_mkdir; ! *checkDirectory = *CBMc::CBMSystem_checkDirectory; ! *temporaryDirectory = *CBMc::CBMSystem_temporaryDirectory; ! *unlink = *CBMc::CBMSystem_unlink; ! *store = *CBMc::CBMSystem_store; ! *read = *CBMc::CBMSystem_read; ! *fileExists = *CBMc::CBMSystem_fileExists; ! *Time = *CBMc::CBMSystem_Time; ! *done = *CBMc::CBMSystem_done; ! *getLastCommand = *CBMc::CBMSystem_getLastCommand; ! *getLastCommandOutput = *CBMc::CBMSystem_getLastCommandOutput; ! sub DISOWN { ! my $self = shift; ! my $ptr = tied(%$self); ! delete $OWNER{$ptr}; ! } ! ! sub ACQUIRE { ! my $self = shift; ! my $ptr = tied(%$self); ! $OWNER{$ptr} = 1; ! } ! ! ! ############# Class : CBM::CBMXMLAttribute ############## ! package CBM::CBMXMLAttribute; use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); @ISA = qw( CBM ); --- 52,58 ---- *c_str = *CBMc::c_str; ! ############# Class : CBM::XMLAttribute ############## ! package CBM::XMLAttribute; use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); @ISA = qw( CBM ); *************** *** 115,125 **** sub new { my $pkg = shift; ! my $self = CBMc::new_CBMXMLAttribute(@_); bless $self, $pkg if defined($self); } ! *Name = *CBMc::CBMXMLAttribute_Name; ! *Value = *CBMc::CBMXMLAttribute_Value; ! *setValue = *CBMc::CBMXMLAttribute_setValue; sub DESTROY { return unless $_[0]->isa('HASH'); --- 61,71 ---- sub new { my $pkg = shift; ! my $self = CBMc::new_XMLAttribute(@_); bless $self, $pkg if defined($self); } ! *Name = *CBMc::XMLAttribute_Name; ! *Value = *CBMc::XMLAttribute_Value; ! *setValue = *CBMc::XMLAttribute_setValue; sub DESTROY { return unless $_[0]->isa('HASH'); *************** *** 128,132 **** delete $ITERATORS{$self}; if (exists $OWNER{$self}) { ! CBMc::delete_CBMXMLAttribute($self); delete $OWNER{$self}; } --- 74,78 ---- delete $ITERATORS{$self}; if (exists $OWNER{$self}) { ! CBMc::delete_XMLAttribute($self); delete $OWNER{$self}; } *************** *** 146,152 **** ! ############# Class : CBM::CBMXMLNode ############## ! package CBM::CBMXMLNode; use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); @ISA = qw( CBM ); --- 92,98 ---- ! ############# Class : CBM::XMLNode ############## ! package CBM::XMLNode; use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); @ISA = qw( CBM ); *************** *** 155,213 **** sub new { my $pkg = shift; ! my $self = CBMc::new_CBMXMLNode(@_); bless $self, $pkg if defined($self); } ! *Name = *CBMc::CBMXMLNode_Name; ! *Value = *CBMc::CBMXMLNode_Value; ! *setValue = *CBMc::CBMXMLNode_setValue; ! *childNumber = *CBMc::CBMXMLNode_childNumber; ! *getChild = *CBMc::CBMXMLNode_getChild; ! *attributeNumber = *CBMc::CBMXMLNode_attributeNumber; ! *getAttribute = *CBMc::CBMXMLNode_getAttribute; ! *addNode = *CBMc::CBMXMLNode_addNode; ! *add = *CBMc::CBMXMLNode_add; ! *addAttribute = *CBMc::CBMXMLNode_addAttribute; ! *str = *CBMc::CBMXMLNode_str; ! sub DESTROY { ! return unless $_[0]->isa('HASH'); ! my $self = tied(%{$_[0]}); ! return unless defined $self; ! delete $ITERATORS{$self}; ! if (exists $OWNER{$self}) { ! CBMc::delete_CBMXMLNode($self); ! delete $OWNER{$self}; ! } ! } ! ! sub DISOWN { ! my $self = shift; ! my $ptr = tied(%$self); ! delete $OWNER{$ptr}; ! } ! ! sub ACQUIRE { ! my $self = shift; ! my $ptr = tied(%$self); ! $OWNER{$ptr} = 1; ! } ! ! ! ############# Class : CBM::CBMSystemUnix ############## ! ! package CBM::CBMSystemUnix; ! use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); ! @ISA = qw( CBM::CBMSystem CBM ); ! %OWNER = (); ! %ITERATORS = (); ! *copy = *CBMc::CBMSystemUnix_copy; ! *mkdir = *CBMc::CBMSystemUnix_mkdir; ! *checkDirectory = *CBMc::CBMSystemUnix_checkDirectory; ! *arch = *CBMc::CBMSystemUnix_arch; ! *hostid = *CBMc::CBMSystemUnix_hostid; ! *hostname = *CBMc::CBMSystemUnix_hostname; ! *os = *CBMc::CBMSystemUnix_os; ! *os_version = *CBMc::CBMSystemUnix_os_version; ! *unlink = *CBMc::CBMSystemUnix_unlink; sub DESTROY { return unless $_[0]->isa('HASH'); --- 101,119 ---- sub new { my $pkg = shift; ! my $self = CBMc::new_XMLNode(@_); bless $self, $pkg if defined($self); } ! *Name = *CBMc::XMLNode_Name; ! *Value = *CBMc::XMLNode_Value; ! *setValue = *CBMc::XMLNode_setValue; ! *childNumber = *CBMc::XMLNode_childNumber; ! *getChild = *CBMc::XMLNode_getChild; ! *attributeNumber = *CBMc::XMLNode_attributeNumber; ! *getAttribute = *CBMc::XMLNode_getAttribute; ! *addNode = *CBMc::XMLNode_addNode; ! *add = *CBMc::XMLNode_add; ! *addAttribute = *CBMc::XMLNode_addAttribute; ! *str = *CBMc::XMLNode_str; sub DESTROY { return unless $_[0]->isa('HASH'); *************** *** 216,220 **** delete $ITERATORS{$self}; if (exists $OWNER{$self}) { ! CBMc::delete_CBMSystemUnix($self); delete $OWNER{$self}; } --- 122,126 ---- delete $ITERATORS{$self}; if (exists $OWNER{$self}) { ! CBMc::delete_XMLNode($self); delete $OWNER{$self}; } *************** *** 234,254 **** ! ############# Class : CBM::CBMSystemLinux ############## ! package CBM::CBMSystemLinux; use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); ! @ISA = qw( CBM::CBMSystemUnix CBM ); %OWNER = (); %ITERATORS = (); ! sub new { ! my $pkg = shift; ! my $self = CBMc::new_CBMSystemLinux(@_); ! bless $self, $pkg if defined($self); ! } ! ! *processor_name = *CBMc::CBMSystemLinux_processor_name; ! *processor_mhz = *CBMc::CBMSystemLinux_processor_mhz; ! *processor_cache = *CBMc::CBMSystemLinux_processor_cache; ! *processor_number = *CBMc::CBMSystemLinux_processor_number; sub DESTROY { return unless $_[0]->isa('HASH'); --- 140,196 ---- ! ############# Class : CBM::Package ############## ! package CBM::Package; use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); ! @ISA = qw( CBM ); %OWNER = (); %ITERATORS = (); ! *Unknown = *CBMc::Package_Unknown; ! *Downloaded = *CBMc::Package_Downloaded; ! *Extracted = *CBMc::Package_Extracted; ! *Patched = *CBMc::Package_Patched; ! *Preconfigured = *CBMc::Package_Preconfigured; ! *Configured = *CBMc::Package_Configured; ! *Made = *CBMc::Package_Made; ! *Tested = *CBMc::Package_Tested; ! *Benchmarked = *CBMc::Package_Benchmarked; ! *hasPatch = *CBMc::Package_hasPatch; ! *resetContext = *CBMc::Package_resetContext; ! *display = *CBMc::Package_display; ! *displayBenchmarks = *CBMc::Package_displayBenchmarks; ! *System = *CBMc::Package_System; ! *Benchmarks = *CBMc::Package_Benchmarks; ! *benchmarkNumber = *CBMc::Package_benchmarkNumber; ! *Benchmark = *CBMc::Package_Benchmark; ! *storeStatus = *CBMc::Package_storeStatus; ! *packageName = *CBMc::Package_packageName; ! *packageVersion = *CBMc::Package_packageVersion; ! *packageSize = *CBMc::Package_packageSize; ! *packageComments = *CBMc::Package_packageComments; ! *localPackageName = *CBMc::Package_localPackageName; ! *language = *CBMc::Package_language; ! *license = *CBMc::Package_license; ! *homePage = *CBMc::Package_homePage; ! *author = *CBMc::Package_author; ! *localPackageAbsoluteName = *CBMc::Package_localPackageAbsoluteName; ! *localPackageAbsoluteDirectory = *CBMc::Package_localPackageAbsoluteDirectory; ! *extractDirectory = *CBMc::Package_extractDirectory; ! *hasTest = *CBMc::Package_hasTest; ! *downloadURL = *CBMc::Package_downloadURL; ! *benchmarkSize = *CBMc::Package_benchmarkSize; ! *ContextMatches = *CBMc::Package_ContextMatches; ! *Download = *CBMc::Package_Download; ! *Extract = *CBMc::Package_Extract; ! *Patch = *CBMc::Package_Patch; ! *PreConfigure = *CBMc::Package_PreConfigure; ! *Configure = *CBMc::Package_Configure; ! *Make = *CBMc::Package_Make; ! *Test = *CBMc::Package_Test; ! *Release = *CBMc::Package_Release; ! *Install = *CBMc::Package_Install; ! *Fetch = *CBMc::Package_Fetch; ! *Uninstall = *CBMc::Package_Uninstall; ! *getStatus = *CBMc::Package_getStatus; sub DESTROY { return unless $_[0]->isa('HASH'); *************** *** 257,261 **** delete $ITERATORS{$self}; if (exists $OWNER{$self}) { ! CBMc::delete_CBMSystemLinux($self); delete $OWNER{$self}; } --- 199,203 ---- delete $ITERATORS{$self}; if (exists $OWNER{$self}) { ! CBMc::delete_Package($self); delete $OWNER{$self}; } *************** *** 275,331 **** ! ############# Class : CBM::CBMPackage ############## ! package CBM::CBMPackage; use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); @ISA = qw( CBM ); %OWNER = (); %ITERATORS = (); ! *Unknown = *CBMc::CBMPackage_Unknown; ! *Downloaded = *CBMc::CBMPackage_Downloaded; ! *Extracted = *CBMc::CBMPackage_Extracted; ! *Patched = *CBMc::CBMPackage_Patched; ! *Preconfigured = *CBMc::CBMPackage_Preconfigured; ! *Configured = *CBMc::CBMPackage_Configured; ! *Made = *CBMc::CBMPackage_Made; ! *Tested = *CBMc::CBMPackage_Tested; ! *Benchmarked = *CBMc::CBMPackage_Benchmarked; ! *hasPatch = *CBMc::CBMPackage_hasPatch; ! *resetContext = *CBMc::CBMPackage_resetContext; ! *display = *CBMc::CBMPackage_display; ! *displayBenchmarks = *CBMc::CBMPackage_displayBenchmarks; ! *System = *CBMc::CBMPackage_System; ! *Benchmarks = *CBMc::CBMPackage_Benchmarks; ! *benchmarkNumber = *CBMc::CBMPackage_benchmarkNumber; ! *Benchmark = *CBMc::CBMPackage_Benchmark; ! *storeStatus = *CBMc::CBMPackage_storeStatus; ! *packageName = *CBMc::CBMPackage_packageName; ! *packageVersion = *CBMc::CBMPackage_packageVersion; ! *packageSize = *CBMc::CBMPackage_packageSize; ! *packageComments = *CBMc::CBMPackage_packageComments; ! *localPackageName = *CBMc::CBMPackage_localPackageName; ! *language = *CBMc::CBMPackage_language; ! *license = *CBMc::CBMPackage_license; ! *homePage = *CBMc::CBMPackage_homePage; ! *author = *CBMc::CBMPackage_author; ! *localPackageAbsoluteName = *CBMc::CBMPackage_localPackageAbsoluteName; ! *localPackageAbsoluteDirectory = *CBMc::CBMPackage_localPackageAbsoluteDirectory; ! *extractDirectory = *CBMc::CBMPackage_extractDirectory; ! *hasTest = *CBMc::CBMPackage_hasTest; ! *downloadURL = *CBMc::CBMPackage_downloadURL; ! *benchmarkSize = *CBMc::CBMPackage_benchmarkSize; ! *ContextMatches = *CBMc::CBMPackage_ContextMatches; ! *Download = *CBMc::CBMPackage_Download; ! *Extract = *CBMc::CBMPackage_Extract; ! *Patch = *CBMc::CBMPackage_Patch; ! *PreConfigure = *CBMc::CBMPackage_PreConfigure; ! *Configure = *CBMc::CBMPackage_Configure; ! *Make = *CBMc::CBMPackage_Make; ! *Test = *CBMc::CBMPackage_Test; ! *Release = *CBMc::CBMPackage_Release; ! *Install = *CBMc::CBMPackage_Install; ! *Fetch = *CBMc::CBMPackage_Fetch; ! *Uninstall = *CBMc::CBMPackage_Uninstall; ! *getStatus = *CBMc::CBMPackage_getStatus; sub DESTROY { return unless $_[0]->isa('HASH'); --- 217,232 ---- ! ############# Class : CBM::Benchmark ############## ! package CBM::Benchmark; use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); @ISA = qw( CBM ); %OWNER = (); %ITERATORS = (); ! *Package = *CBMc::Benchmark_Package; ! *display = *CBMc::Benchmark_display; ! *benchmarkName = *CBMc::Benchmark_benchmarkName; ! *benchmarkComments = *CBMc::Benchmark_benchmarkComments; ! *Bench = *CBMc::Benchmark_Bench; sub DESTROY { return unless $_[0]->isa('HASH'); *************** *** 334,338 **** delete $ITERATORS{$self}; if (exists $OWNER{$self}) { ! CBMc::delete_CBMPackage($self); delete $OWNER{$self}; } --- 235,239 ---- delete $ITERATORS{$self}; if (exists $OWNER{$self}) { ! CBMc::delete_Benchmark($self); delete $OWNER{$self}; } *************** *** 352,378 **** ! ############# Class : CBM::CBMBenchmark ############## ! package CBM::CBMBenchmark; use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); @ISA = qw( CBM ); %OWNER = (); ! %ITERATORS = (); ! *Package = *CBMc::CBMBenchmark_Package; ! *display = *CBMc::CBMBenchmark_display; ! *benchmarkName = *CBMc::CBMBenchmark_benchmarkName; ! *benchmarkComments = *CBMc::CBMBenchmark_benchmarkComments; ! *Bench = *CBMc::CBMBenchmark_Bench; ! sub DESTROY { ! return unless $_[0]->isa('HASH'); ! my $self = tied(%{$_[0]}); ! return unless defined $self; ! delete $ITERATORS{$self}; ! if (exists $OWNER{$self}) { ! CBMc::delete_CBMBenchmark($self); ! delete $OWNER{$self}; ! } ! } ! sub DISOWN { my $self = shift; --- 253,306 ---- ! ############# Class : CBM::System ############## ! package CBM::System; use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); @ISA = qw( CBM ); %OWNER = (); ! *Root = *CBMc::System_Root; ! *HostDep = *CBMc::System_HostDep; ! *Extract = *CBMc::System_Extract; ! *Patches = *CBMc::System_Patches; ! *OS = *CBMc::System_OS; ! *Download = *CBMc::System_Download; ! *Status = *CBMc::System_Status; ! *Configuration = *CBMc::System_Configuration; ! *init = *CBMc::System_init; ! *hostid = *CBMc::System_hostid; ! *hostname = *CBMc::System_hostname; ! *os = *CBMc::System_os; ! *os_version = *CBMc::System_os_version; ! *processor_name = *CBMc::System_processor_name; ! *processor_mhz = *CBMc::System_processor_mhz; ! *processor_cache = *CBMc::System_processor_cache; ! *processor_number = *CBMc::System_processor_number; ! *arch = *CBMc::System_arch; ! *packageList = *CBMc::System_packageList; ! *packageNumber = *CBMc::System_packageNumber; ! *Package = *CBMc::System_Package; ! *Benchmark = *CBMc::System_Benchmark; ! *displayAllPackages = *CBMc::System_displayAllPackages; ! *displayAllBenchmarks = *CBMc::System_displayAllBenchmarks; ! *Split = *CBMc::System_Split; ! *Chomp = *CBMc::System_Chomp; ! *display = *CBMc::System_display; ! *displayPrograms = *CBMc::System_displayPrograms; ! *exec = *CBMc::System_exec; ! *md5 = *CBMc::System_md5; ! *md5File = *CBMc::System_md5File; ! *download = *CBMc::System_download; ! *copy = *CBMc::System_copy; ! *mkdir = *CBMc::System_mkdir; ! *checkDirectory = *CBMc::System_checkDirectory; ! *temporaryDirectory = *CBMc::System_temporaryDirectory; ! *unlink = *CBMc::System_unlink; ! *store = *CBMc::System_store; ! *read = *CBMc::System_read; ! *fileExists = *CBMc::System_fileExists; ! *Time = *CBMc::System_Time; ! *done = *CBMc::System_done; ! *getLastCommand = *CBMc::System_getLastCommand; ! *getLastCommandOutput = *CBMc::System_getLastCommandOutput; sub DISOWN { my $self = shift; *************** *** 388,404 **** ! ############# Class : CBM::CBMCompiler ############## ! package CBM::CBMCompiler; use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); @ISA = qw( CBM ); %OWNER = (); %ITERATORS = (); ! *display = *CBMc::CBMCompiler_display; ! *compiler = *CBMc::CBMCompiler_compiler; ! *compilerName = *CBMc::CBMCompiler_compilerName; ! *compilerVersion = *CBMc::CBMCompiler_compilerVersion; ! *Binary = *CBMc::CBMCompiler_Binary; ! *language = *CBMc::CBMCompiler_language; sub DESTROY { return unless $_[0]->isa('HASH'); --- 316,332 ---- ! ############# Class : CBM::Compiler ############## ! package CBM::Compiler; use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); @ISA = qw( CBM ); %OWNER = (); %ITERATORS = (); ! *display = *CBMc::Compiler_display; ! *compiler = *CBMc::Compiler_compiler; ! *compilerName = *CBMc::Compiler_compilerName; ! *compilerVersion = *CBMc::Compiler_compilerVersion; ! *Binary = *CBMc::Compiler_Binary; ! *language = *CBMc::Compiler_language; sub DESTROY { return unless $_[0]->isa('HASH'); *************** *** 407,411 **** delete $ITERATORS{$self}; if (exists $OWNER{$self}) { ! CBMc::delete_CBMCompiler($self); delete $OWNER{$self}; } --- 335,339 ---- delete $ITERATORS{$self}; if (exists $OWNER{$self}) { ! CBMc::delete_Compiler($self); delete $OWNER{$self}; } *************** *** 425,431 **** ! ############# Class : CBM::CBMCompilerSelector ############## ! package CBM::CBMCompilerSelector; use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); @ISA = qw( CBM ); --- 353,359 ---- ! ############# Class : CBM::CompilerSelector ############## ! package CBM::CompilerSelector; use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); @ISA = qw( CBM ); *************** *** 434,442 **** sub new { my $pkg = shift; ! my $self = CBMc::new_CBMCompilerSelector(@_); bless $self, $pkg if defined($self); } ! *select = *CBMc::CBMCompilerSelector_select; sub DESTROY { return unless $_[0]->isa('HASH'); --- 362,370 ---- sub new { my $pkg = shift; ! my $self = CBMc::new_CompilerSelector(@_); bless $self, $pkg if defined($self); } ! *select = *CBMc::CompilerSelector_select; sub DESTROY { return unless $_[0]->isa('HASH'); *************** *** 445,449 **** delete $ITERATORS{$self}; if (exists $OWNER{$self}) { ! CBMc::delete_CBMCompilerSelector($self); delete $OWNER{$self}; } --- 373,377 ---- delete $ITERATORS{$self}; if (exists $OWNER{$self}) { ! CBMc::delete_CompilerSelector($self); delete $OWNER{$self}; } *************** *** 467,516 **** package CBM; - *CBM_PROG_BZIP2 = *CBMc::CBM_PROG_BZIP2; - *CBM_PROG_CAT = *CBMc::CBM_PROG_CAT; - *CBM_PROG_CP = *CBMc::CBM_PROG_CP; - *CBM_PROG_CUT = *CBMc::CBM_PROG_CUT; - *CBM_PROG_DD = *CBMc::CBM_PROG_DD; - *CBM_PROG_DIALOG = *CBMc::CBM_PROG_DIALOG; - *CBM_PROG_GREP = *CBMc::CBM_PROG_GREP; - *CBM_PROG_GZIP = *CBMc::CBM_PROG_GZIP; - *CBM_PROG_HEAD = *CBMc::CBM_PROG_HEAD; - *CBM_PROG_MAKE = *CBMc::CBM_PROG_MAKE; - *CBM_PROG_MKDIR = *CBMc::CBM_PROG_MKDIR; - *CBM_PROG_PATCH = *CBMc::CBM_PROG_PATCH; - *CBM_PROG_PERL = *CBMc::CBM_PROG_PERL; - *CBM_PROG_RM = *CBMc::CBM_PROG_RM; - *CBM_PROG_TAIL = *CBMc::CBM_PROG_TAIL; - *CBM_PROG_TAR = *CBMc::CBM_PROG_TAR; - *CBM_PROG_UNZIP = *CBMc::CBM_PROG_UNZIP; - *CBM_PROG_WGET = *CBMc::CBM_PROG_WGET; - *CBM_PROG_ZCAT = *CBMc::CBM_PROG_ZCAT; - *CBM_SYSTEM_CYGWIN = *CBMc::CBM_SYSTEM_CYGWIN; - *CBM_SYSTEM_FREEBSD = *CBMc::CBM_SYSTEM_FREEBSD; - *CBM_SYSTEM_LINUX = *CBMc::CBM_SYSTEM_LINUX; - *HAVE_CTYPE_H = *CBMc::HAVE_CTYPE_H; - *HAVE_DIRENT_H = *CBMc::HAVE_DIRENT_H; - *HAVE_DLFCN_H = *CBMc::HAVE_DLFCN_H; - *HAVE_GETOPT_H = *CBMc::HAVE_GETOPT_H; - *HAVE_INTTYPES_H = *CBMc::HAVE_INTTYPES_H; - *HAVE_LIBDL = *CBMc::HAVE_LIBDL; - *HAVE_MEMORY_H = *CBMc::HAVE_MEMORY_H; - *HAVE_STDINT_H = *CBMc::HAVE_STDINT_H; - *HAVE_STDLIB_H = *CBMc::HAVE_STDLIB_H; - *HAVE_STRINGS_H = *CBMc::HAVE_STRINGS_H; - *HAVE_STRING_H = *CBMc::HAVE_STRING_H; - *HAVE_SYS_STAT_H = *CBMc::HAVE_SYS_STAT_H; - *HAVE_SYS_TYPES_H = *CBMc::HAVE_SYS_TYPES_H; - *HAVE_TIME_H = *CBMc::HAVE_TIME_H; - *HAVE_UNISTD_H = *CBMc::HAVE_UNISTD_H; - *PACKAGE = *CBMc::PACKAGE; - *PACKAGE_BUGREPORT = *CBMc::PACKAGE_BUGREPORT; - *PACKAGE_NAME = *CBMc::PACKAGE_NAME; - *PACKAGE_STRING = *CBMc::PACKAGE_STRING; - *PACKAGE_TARNAME = *CBMc::PACKAGE_TARNAME; - *PACKAGE_VERSION = *CBMc::PACKAGE_VERSION; - *PREFIX = *CBMc::PREFIX; - *STDC_HEADERS = *CBMc::STDC_HEADERS; - *VERSION = *CBMc::VERSION; *H_CBMLIBCOMPBENCHMARKS = *CBMc::H_CBMLIBCOMPBENCHMARKS; *libcompbenchmarks_version = *CBMc::libcompbenchmarks_version; --- 395,398 ---- *************** *** 521,526 **** my %__cbmSystem_hash; ! tie %__cbmSystem_hash,"CBM::CBMSystem", $CBMc::cbmSystem; $cbmSystem= \%__cbmSystem_hash; ! bless $cbmSystem, CBM::CBMSystem; 1; --- 403,408 ---- my %__cbmSystem_hash; ! tie %__cbmSystem_hash,"CBM::System", $CBMc::cbmSystem; $cbmSystem= \%__cbmSystem_hash; ! bless $cbmSystem, CBM::System; 1; Index: Glue.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Glue.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Glue.cpp 10 Jan 2007 20:27:58 -0000 1.4 --- Glue.cpp 21 Jan 2007 20:47:56 -0000 1.5 *************** *** 14,27 **** CBM_SYSTEM *sys; ! CBM_SYSTEM *Init(void) { sys = new CBM_SYSTEM; ! UO_verbose=0; ! UO_fatal=0; sys->init(); return(sys); } ! std::string & stringref(char *str) { std::string *dum = new std::string(str); --- 14,27 ---- CBM_SYSTEM *sys; ! CBM::System *Init(void) { sys = new CBM_SYSTEM; ! CBM::UO_verbose=0; ! CBM::UO_fatal=0; sys->init(); return(sys); } ! std::string &stringref(char *str) { std::string *dum = new std::string(str); Index: CBM.i =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM.i,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CBM.i 17 Jan 2007 19:21:17 -0000 1.4 --- CBM.i 21 Jan 2007 20:47:56 -0000 1.5 *************** *** 2,53 **** %module CBM ! %{ #include "libcompbenchmarks.h" #include "Glue.h" - %} - - %module CBMXML - %{ - #include "System/XML.h" - %} - - %module CBMSystem - %{ #include "System/System.h" - %} - - %module CBMSystemUnix - %{ - #include "System/System-Unix.h" - %} - - %module CBMSystemLinux - %{ - #include "System/System-Linux.h" - %} - - %module CBMPackage - %{ #include "Benchmark/Package.h" - %} - - %module CBMBenchmark - %{ #include "Benchmark/Benchmark.h" - %} - - %module CBMCompiler - %{ #include "Compiler/Compiler.h" ! %} - %include "config.h" %include "libcompbenchmarks.h" - %include "System/System.h" %include "System/XML.h" - %include "System/System-Unix.h" - %include "System/System-Linux.h" %include "Benchmark/Package.h" %include "Benchmark/Benchmark.h" %include "Compiler/Compiler.h" ! %include "Glue.h" --- 2,21 ---- %module CBM ! %{ #include "libcompbenchmarks.h" #include "Glue.h" #include "System/System.h" #include "Benchmark/Package.h" #include "Benchmark/Benchmark.h" #include "Compiler/Compiler.h" ! #include "System/XML.h" ! using namespace CBM; ! %} %include "libcompbenchmarks.h" %include "System/XML.h" %include "Benchmark/Package.h" %include "Benchmark/Benchmark.h" + %include "System/System.h" %include "Compiler/Compiler.h" ! %include "Glue.h" \ No newline at end of file Index: CBM_wrap.cxx =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM_wrap.cxx,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CBM_wrap.cxx 17 Jan 2007 19:21:17 -0000 1.7 --- CBM_wrap.cxx 21 Jan 2007 20:47:56 -0000 1.8 *************** *** 1380,1393 **** /* -------- TYPES TABLE (BEGIN) -------- */ ! #define SWIGTYPE_p_CBMBenchmark swig_types[0] ! #define SWIGTYPE_p_CBMCompiler swig_types[1] ! #define SWIGTYPE_p_CBMCompilerOptions swig_types[2] ! #define SWIGTYPE_p_CBMCompilerSelector swig_types[3] ! #define SWIGTYPE_p_CBMPackage swig_types[4] ! #define SWIGTYPE_p_CBMSystem swig_types[5] ! #define SWIGTYPE_p_CBMSystemLinux swig_types[6] ! #define SWIGTYPE_p_CBMSystemUnix swig_types[7] [...9645 lines suppressed...] /*@SWIG:%set_constant@*/ do { ! SV *sv = get_sv((char*) SWIG_prefix "System_Download", TRUE | 0x2); ! sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast<int >(CBM::System::Download))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; /*@SWIG:%set_constant@*/ do { ! SV *sv = get_sv((char*) SWIG_prefix "System_Status", TRUE | 0x2); ! sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast<int >(CBM::System::Status))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; /*@SWIG:%set_constant@*/ do { ! SV *sv = get_sv((char*) SWIG_prefix "System_Configuration", TRUE | 0x2); ! sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast<int >(CBM::System::Configuration))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; ! SWIG_TypeClientData(SWIGTYPE_p_CBM__System, (void*) "CBM::System"); ! SWIG_TypeClientData(SWIGTYPE_p_CBM__Compiler, (void*) "CBM::Compiler"); ! SWIG_TypeClientData(SWIGTYPE_p_CBM__CompilerSelector, (void*) "CBM::CompilerSelector"); ST(0) = &PL_sv_yes; XSRETURN(1); Index: Glue.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Glue.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Glue.h 4 Jan 2007 19:37:29 -0000 1.2 --- Glue.h 21 Jan 2007 20:47:56 -0000 1.3 *************** *** 14,18 **** #include <Benchmark/Benchmark.h> ! extern CBM_SYSTEM *Init(void); extern std::string & stringref(char *str); --- 14,18 ---- #include <Benchmark/Benchmark.h> ! extern CBM::System *Init(void); extern std::string & stringref(char *str); |
|
From: Frederic T. <xf...@us...> - 2007-01-21 20:47:28
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19900 Modified Files: 00-XML.pl 01-CBMSystem-protected.pl 02-CBMSystem-benchs.pl 03-CBMCompilerSelector-public.pl Log Message: CBM namespace. Index: 02-CBMSystem-benchs.pl =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/02-CBMSystem-benchs.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** 02-CBMSystem-benchs.pl 17 Jan 2007 19:14:05 -0000 1.3 --- 02-CBMSystem-benchs.pl 21 Jan 2007 20:47:25 -0000 1.4 *************** *** 32,35 **** --- 32,36 ---- next; } + $p=$b->Package(); ok(defined($p), "package for $_"); Index: 01-CBMSystem-protected.pl =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/01-CBMSystem-protected.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 01-CBMSystem-protected.pl 28 Dec 2006 18:52:32 -0000 1.2 --- 01-CBMSystem-protected.pl 21 Jan 2007 20:47:25 -0000 1.3 *************** *** 71,77 **** --- 71,80 ---- ok($num >= 1); } + print "here\n"; $sys = CBM::Init(); + print "there\n"; + test_exec0(); test_arch(); Index: 03-CBMCompilerSelector-public.pl =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/03-CBMCompilerSelector-public.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** 03-CBMCompilerSelector-public.pl 4 Jan 2007 19:37:50 -0000 1.3 --- 03-CBMCompilerSelector-public.pl 21 Jan 2007 20:47:25 -0000 1.4 *************** *** 34,38 **** $sys = CBM::Init(); ! my $CS = CBM::CBMCompilerSelector->new($sys); my $reffile; my $co; --- 34,38 ---- $sys = CBM::Init(); ! my $CS = CBM::CompilerSelector->new($sys); my $reffile; my $co; Index: 00-XML.pl =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/00-XML.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 00-XML.pl 17 Jan 2007 19:14:40 -0000 1.1 --- 00-XML.pl 21 Jan 2007 20:47:25 -0000 1.2 *************** *** 71,76 **** sub test_xml { ! my $root = CBM::CBMXMLNode->new("root"); ! my $child = CBM::CBMXMLNode->new("child"); test_node($root, "root", undef, 0); --- 71,76 ---- sub test_xml { ! my $root = CBM::XMLNode->new("root"); ! my $child = CBM::XMLNode->new("child"); test_node($root, "root", undef, 0); *************** *** 90,94 **** test_str($root, "<root>\n <child/>\n root-value\n</root>\n"); ! my $att0 = CBM::CBMXMLAttribute->new("att0"); test_attribute($att0, "att0", undef); $root->add($att0); --- 90,94 ---- test_str($root, "<root>\n <child/>\n root-value\n</root>\n"); ! my $att0 = CBM::XMLAttribute->new("att0"); test_attribute($att0, "att0", undef); $root->add($att0); *************** *** 97,106 **** sub test_xml_sample { ! my $root = CBM::CBMXMLNode->new("point"); $root->addAttribute("x", "0"); $root->addAttribute("y", "1"); $root->addAttribute("z", "-1"); ! my $color = CBM::CBMXMLNode->new("color"); $color->addAttribute("mode", "plain"); $color->setValue("blue"); --- 97,106 ---- sub test_xml_sample { ! my $root = CBM::XMLNode->new("point"); $root->addAttribute("x", "0"); $root->addAttribute("y", "1"); $root->addAttribute("z", "-1"); ! my $color = CBM::XMLNode->new("color"); $color->addAttribute("mode", "plain"); $color->setValue("blue"); |
|
From: Frederic T. <xf...@us...> - 2007-01-21 20:47:11
|
Update of /cvsroot/compbench/CompBenchmarks++/Benchmark In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19768 Modified Files: Benchmark-DLLoader.cpp Log Message: CBM namespace. Index: Benchmark-DLLoader.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-DLLoader.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Benchmark-DLLoader.cpp 18 Jan 2007 18:44:00 -0000 1.6 --- Benchmark-DLLoader.cpp 21 Jan 2007 20:47:08 -0000 1.7 *************** *** 8,18 **** using namespace CBM; ! std::vector<std::string> cbmlib_paths; ! std::vector<Package*> cbmlib_packages; /* cache... */ std::vector<cbmlib_internal*> cbmlib_loaded_libraries; ! int PACKAGE_AUTOPURGE=1; cbmlib_internal *cbmlib_check_previousload(char *package_id) --- 8,18 ---- using namespace CBM; ! std::vector<std::string> CBM::cbmlib_paths; ! std::vector<Package*> CBM::cbmlib_packages; /* cache... */ std::vector<cbmlib_internal*> cbmlib_loaded_libraries; ! int CBM::PACKAGE_AUTOPURGE=1; cbmlib_internal *cbmlib_check_previousload(char *package_id) *************** *** 74,78 **** } ! cbmlib_internal *cbmlib_load(char *package_id) { std::string tmp; --- 74,78 ---- } ! cbmlib_internal *CBM::cbmlib_load(char *package_id) { std::string tmp; *************** *** 95,99 **** } ! void cbmlib_done(void) { int i; --- 95,99 ---- } ! void CBM::cbmlib_done(void) { int i; |
|
From: Frederic T. <xf...@us...> - 2007-01-21 20:46:50
|
Update of /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19477 Modified Files: Benchmark-BENCHPP.cpp Benchmark-BENCHPP.h Benchmark-BENCHPP.libwrapper.h Benchmark-BENCHPPLINUX.cpp Benchmark-BENCHPPLINUX.h Benchmark-BENCHPPLINUX.libwrapper.h Benchmark-LINPACKC.cpp Benchmark-LINPACKC.h Benchmark-LINPACKC.libwrapper.h Benchmark-SCIMARK2.cpp Benchmark-SCIMARK2.h Log Message: CBM namespace. Index: Benchmark-BENCHPP.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPP.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Benchmark-BENCHPP.cpp 3 Jan 2007 22:06:26 -0000 1.3 --- Benchmark-BENCHPP.cpp 21 Jan 2007 20:46:46 -0000 1.4 *************** *** 8,42 **** #include <SupportedBenchmarks/Benchmark-BENCHPP.libwrapper.h> ! CBMPackageBENCHPP::CBMPackageBENCHPP(CBMSystem *_system) ! : CBMPackage(_system) { } ! std::string CBMPackageBENCHPP::downloadURL(void) { return(""); } ! std::string CBMPackageBENCHPP::expectedMD5(void) { return("61f961031fd3ca116787fffd442ef872"); } ! std::string CBMPackageBENCHPP::packageName(void) { return("benchpp"); } ! std::string CBMPackageBENCHPP::packageVersion(void) { return("1.1"); } ! int CBMPackageBENCHPP::packageSize(void) { return(177532); } ! std::string CBMPackageBENCHPP::packageComments(void) { return("The suite is based on the Ada PIWG suite, and therefore is " \ --- 8,42 ---- #include <SupportedBenchmarks/Benchmark-BENCHPP.libwrapper.h> ! PackageBENCHPP::PackageBENCHPP(CBM::System *_system) ! : Package(_system) { } ! std::string PackageBENCHPP::downloadURL(void) { return(""); } ! std::string PackageBENCHPP::expectedMD5(void) { return("61f961031fd3ca116787fffd442ef872"); } ! std::string PackageBENCHPP::packageName(void) { return("benchpp"); } ! std::string PackageBENCHPP::packageVersion(void) { return("1.1"); } ! int PackageBENCHPP::packageSize(void) { return(177532); } ! std::string PackageBENCHPP::packageComments(void) { return("The suite is based on the Ada PIWG suite, and therefore is " \ *************** *** 56,80 **** } ! std::string CBMPackageBENCHPP::localPackageName(void) { return("bench_plus_plus_1.1.tar.Z"); } ! std::string CBMPackageBENCHPP::language(void) { return("C++"); } ! char* CBMPackageBENCHPP::extractDirectory(void) { return("bench++"); } ! int CBMPackageBENCHPP::hasPatch(void) { return(1); } ! int CBMPackageBENCHPP::patch(int _force) { std::string cmd; --- 56,80 ---- } ! std::string PackageBENCHPP::localPackageName(void) { return("bench_plus_plus_1.1.tar.Z"); } ! std::string PackageBENCHPP::language(void) { return("C++"); } ! char* PackageBENCHPP::extractDirectory(void) { return("bench++"); } ! int PackageBENCHPP::hasPatch(void) { return(1); } ! int PackageBENCHPP::patch(int _force) { std::string cmd; *************** *** 83,87 **** std::string patch; ! patch+=system->temporaryDirectory(CBMSystem::Patches); patch+="/benchpp.patch.gz"; --- 83,87 ---- std::string patch; ! patch+=system->temporaryDirectory(CBM::System::Patches); patch+="/benchpp.patch.gz"; *************** *** 102,106 **** } ! int CBMPackageBENCHPP::extract(int _force) { std::string localFile = localPackageAbsoluteName(); --- 102,106 ---- } ! int PackageBENCHPP::extract(int _force) { std::string localFile = localPackageAbsoluteName(); *************** *** 109,113 **** cmd+="cd "; ! cmd+=system->temporaryDirectory(CBMSystem::Extract); cmd+=" && "; cmd+=CBM_PROG_ZCAT; --- 109,113 ---- cmd+="cd "; ! cmd+=system->temporaryDirectory(CBM::System::Extract); cmd+=" && "; cmd+=CBM_PROG_ZCAT; *************** *** 121,131 **** } ! int CBMPackageBENCHPP::preConfigure(int _force) { return(1); } ! int CBMPackageBENCHPP::configure(CBMCompiler *_currentCompiler, ! CBMCompilerOptions *_currentOptions) { std::string cmd; --- 121,131 ---- } ! int PackageBENCHPP::preConfigure(int _force) { return(1); } ! int PackageBENCHPP::configure(CBM::Compiler *_currentCompiler, ! CBM::CompilerOptions *_currentOptions) { std::string cmd; *************** *** 150,154 **** } ! int CBMPackageBENCHPP::make(void) { std::string cmd; --- 150,154 ---- } ! int PackageBENCHPP::make(void) { std::string cmd; *************** *** 188,192 **** } ! int CBMPackageBENCHPP::release(void) { std::string cmd; --- 188,192 ---- } ! int PackageBENCHPP::release(void) { std::string cmd; *************** *** 202,235 **** } ! std::string CBMPackageBENCHPP::license(void) { return("Public domain"); } ! std::string CBMPackageBENCHPP::homePage(void) { return("http://web.archive.org/web/20050307095704/www.research.att.com/~orost/bench_plus_plus.html"); } ! std::string CBMPackageBENCHPP::author(void) { return("Joseph M. Orost"); } ! int CBMPackageBENCHPP::benchmarkSize(void) { return(packageSize()); } ! CBMPackageBENCHPP::~CBMPackageBENCHPP() { } ! CBMBenchmarkBENCHPP::CBMBenchmarkBENCHPP(CBMPackage *_package) ! : CBMBenchmark(_package) { } ! std::string CBMBenchmarkBENCHPP::benchmarkComments(void) { std::string comment; --- 202,235 ---- } ! std::string PackageBENCHPP::license(void) { return("Public domain"); } ! std::string PackageBENCHPP::homePage(void) { return("http://web.archive.org/web/20050307095704/www.research.att.com/~orost/bench_plus_plus.html"); } ! std::string PackageBENCHPP::author(void) { return("Joseph M. Orost"); } ! int PackageBENCHPP::benchmarkSize(void) { return(packageSize()); } ! PackageBENCHPP::~PackageBENCHPP() { } ! BenchmarkBENCHPP::BenchmarkBENCHPP(CBM::Package *_package) ! : Benchmark(_package) { } ! std::string BenchmarkBENCHPP::benchmarkComments(void) { std::string comment; *************** *** 241,245 **** } ! std::string CBMBenchmarkBENCHPP::bench(void) { std::string cmd; --- 241,245 ---- } ! std::string BenchmarkBENCHPP::bench(void) { std::string cmd; *************** *** 264,326 **** } ! CBMBenchmarkBENCHPP::~CBMBenchmarkBENCHPP() { } ! CBMBenchmarkBENCHPP_DHRYSTONE::CBMBenchmarkBENCHPP_DHRYSTONE(CBMPackage *_package) ! : CBMBenchmarkBENCHPP(_package) { } ! std::string CBMBenchmarkBENCHPP_DHRYSTONE::benchmarkName(void) { return("benchpp-dhrystone"); } ! std::string CBMBenchmarkBENCHPP_DHRYSTONE::benchppBenchmark(void) { return("a000091"); } ! std::string CBMBenchmarkBENCHPP_DHRYSTONE::benchmarkBENCHPPComments(void) { return("C++ implementation of the Dhrystone benchmark (see http://www.cs.wisc.edu/~thomas/comp.benchmarks.FAQ.html)."); } ! CBMBenchmarkBENCHPP_DHRYSTONE::~CBMBenchmarkBENCHPP_DHRYSTONE() { } ! CBMBenchmarkBENCHPP_WHETSTONE::CBMBenchmarkBENCHPP_WHETSTONE(CBMPackage *_package) ! : CBMBenchmarkBENCHPP(_package) { } ! std::string CBMBenchmarkBENCHPP_WHETSTONE::benchmarkName(void) { return("benchpp-whetstone"); } ! std::string CBMBenchmarkBENCHPP_WHETSTONE::benchppBenchmark(void) { return("a000092"); } ! std::string CBMBenchmarkBENCHPP_WHETSTONE::benchmarkBENCHPPComments(void) { return("C++ implementation of the Whetstone benchmark (see http://www.cs.wisc.edu/~thomas/comp.benchmarks.FAQ.html)."); } ! CBMBenchmarkBENCHPP_WHETSTONE::~CBMBenchmarkBENCHPP_WHETSTONE() { } ! CBMBenchmarkBENCHPP_STEPANOV::CBMBenchmarkBENCHPP_STEPANOV(CBMPackage *_package) ! : CBMBenchmarkBENCHPP(_package) { } ! std::string CBMBenchmarkBENCHPP_STEPANOV::bench(void) { std::string cmd; --- 264,326 ---- } ! BenchmarkBENCHPP::~BenchmarkBENCHPP() { } ! BenchmarkBENCHPP_DHRYSTONE::BenchmarkBENCHPP_DHRYSTONE(CBM::Package *_package) ! : BenchmarkBENCHPP(_package) { } ! std::string BenchmarkBENCHPP_DHRYSTONE::benchmarkName(void) { return("benchpp-dhrystone"); } ! std::string BenchmarkBENCHPP_DHRYSTONE::benchppBenchmark(void) { return("a000091"); } ! std::string BenchmarkBENCHPP_DHRYSTONE::benchmarkBENCHPPComments(void) { return("C++ implementation of the Dhrystone benchmark (see http://www.cs.wisc.edu/~thomas/comp.benchmarks.FAQ.html)."); } ! BenchmarkBENCHPP_DHRYSTONE::~BenchmarkBENCHPP_DHRYSTONE() { } ! BenchmarkBENCHPP_WHETSTONE::BenchmarkBENCHPP_WHETSTONE(CBM::Package *_package) ! : BenchmarkBENCHPP(_package) { } ! std::string BenchmarkBENCHPP_WHETSTONE::benchmarkName(void) { return("benchpp-whetstone"); } ! std::string BenchmarkBENCHPP_WHETSTONE::benchppBenchmark(void) { return("a000092"); } ! std::string BenchmarkBENCHPP_WHETSTONE::benchmarkBENCHPPComments(void) { return("C++ implementation of the Whetstone benchmark (see http://www.cs.wisc.edu/~thomas/comp.benchmarks.FAQ.html)."); } ! BenchmarkBENCHPP_WHETSTONE::~BenchmarkBENCHPP_WHETSTONE() { } ! BenchmarkBENCHPP_STEPANOV::BenchmarkBENCHPP_STEPANOV(CBM::Package *_package) ! : BenchmarkBENCHPP(_package) { } ! std::string BenchmarkBENCHPP_STEPANOV::bench(void) { std::string cmd; *************** *** 344,372 **** } ! CBMBenchmarkBENCHPP_STEPANOV::~CBMBenchmarkBENCHPP_STEPANOV() { } ! CBMBenchmarkBENCHPP_STEPANOV_AL12::CBMBenchmarkBENCHPP_STEPANOV_AL12(CBMPackage *_package) ! : CBMBenchmarkBENCHPP_STEPANOV(_package) { } ! std::string CBMBenchmarkBENCHPP_STEPANOV_AL12::benchmarkName(void) { return("benchpp-stepanov-al12"); } ! std::string CBMBenchmarkBENCHPP_STEPANOV_AL12::benchppBenchmark(void) { return("s000005a"); } ! std::string CBMBenchmarkBENCHPP_STEPANOV_AL12::benchmarkBENCHPPComments(void) { return("Stepanov AL-12 benchmark. Measures C++ overhead in a code which extensively uses abstraction."); } ! CBMBenchmarkBENCHPP_STEPANOV_AL12::~CBMBenchmarkBENCHPP_STEPANOV_AL12() { } --- 344,372 ---- } ! BenchmarkBENCHPP_STEPANOV::~BenchmarkBENCHPP_STEPANOV() { } ! BenchmarkBENCHPP_STEPANOV_AL12::BenchmarkBENCHPP_STEPANOV_AL12(CBM::Package *_package) ! : BenchmarkBENCHPP_STEPANOV(_package) { } ! std::string BenchmarkBENCHPP_STEPANOV_AL12::benchmarkName(void) { return("benchpp-stepanov-al12"); } ! std::string BenchmarkBENCHPP_STEPANOV_AL12::benchppBenchmark(void) { return("s000005a"); } ! std::string BenchmarkBENCHPP_STEPANOV_AL12::benchmarkBENCHPPComments(void) { return("Stepanov AL-12 benchmark. Measures C++ overhead in a code which extensively uses abstraction."); } ! BenchmarkBENCHPP_STEPANOV_AL12::~BenchmarkBENCHPP_STEPANOV_AL12() { } Index: Benchmark-LINPACKC.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-LINPACKC.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Benchmark-LINPACKC.h 11 Jan 2007 20:14:06 -0000 1.5 --- Benchmark-LINPACKC.h 21 Jan 2007 20:46:47 -0000 1.6 *************** *** 13,134 **** #include <Benchmark/Package.h> ! /** \brief Defines the linpackc package. ! */ ! class CBMPackageLINPACKC : public CBMPackageAutotools ! { ! public: ! private: ! virtual std::string downloadURL(void); ! virtual std::string expectedMD5(void); ! virtual std::string packageName(void); ! virtual std::string packageVersion(void); ! virtual int packageSize(void); /* in bytes */ ! virtual std::string packageComments(void); ! virtual std::string localPackageName(void); ! protected: ! virtual std::string language(void); ! virtual char *extractDirectory(void); ! virtual int preConfigure(int _force); ! public: ! CBMPackageLINPACKC(class CBMSystem *_system); ! DLPackageWrapper_declare(); ! virtual std::string license(void); ! virtual std::string homePage(void); ! virtual std::string author(void); ! virtual int benchmarkSize(void); ! virtual ~CBMPackageLINPACKC(); ! }; ! /** \brief Abstract class for CBMPackageLINPACKC benchmarks ! */ ! class CBMBenchmarkLINPACKC : public CBMBenchmark ! { ! protected: ! CBMBenchmarkLINPACKC(CBMPackage *_package); ! virtual std::string benchmarkComments(void); ! virtual std::string benchmarkLINPACKCComments(void) = 0; ! virtual std::string bench(void); ! virtual ~CBMBenchmarkLINPACKC(); ! }; ! /** \brief Defines the single precision unrolled benchmark within linpackc package. ! */ ! class CBMBenchmarkLINPACKC_SP_UNROLL : public CBMBenchmarkLINPACKC ! { ! public: ! private: ! protected: ! virtual std::string benchmarkLINPACKCComments(void); ! public: ! CBMBenchmarkLINPACKC_SP_UNROLL(CBMPackage *_package); ! virtual std::string benchmarkName(void); ! virtual ~CBMBenchmarkLINPACKC_SP_UNROLL(); ! }; ! /** \brief Defines the single precision 'rolled' benchmark within linpackc package. ! */ ! class CBMBenchmarkLINPACKC_SP_ROLL : public CBMBenchmarkLINPACKC ! { ! public: ! private: ! protected: ! virtual std::string benchmarkLINPACKCComments(void); ! public: ! CBMBenchmarkLINPACKC_SP_ROLL(CBMPackage *_package); ! virtual std::string benchmarkName(void); ! virtual ~CBMBenchmarkLINPACKC_SP_ROLL(); ! }; ! /** \brief Defines the double precision unrolled benchmark within linpackc package. ! */ ! class CBMBenchmarkLINPACKC_DP_UNROLL : public CBMBenchmarkLINPACKC ! { ! public: ! private: ! protected: ! virtual std::string benchmarkLINPACKCComments(void); ! public: ! CBMBenchmarkLINPACKC_DP_UNROLL(CBMPackage *_package); ! virtual std::string benchmarkName(void); ! virtual ~CBMBenchmarkLINPACKC_DP_UNROLL(); ! }; ! /** \brief Defines the double precision 'rolled' benchmark within linpackc package. ! */ ! class CBMBenchmarkLINPACKC_DP_ROLL : public CBMBenchmarkLINPACKC ! { ! public: ! private: ! protected: ! virtual std::string benchmarkLINPACKCComments(void); ! public: ! CBMBenchmarkLINPACKC_DP_ROLL(CBMPackage *_package); ! virtual std::string benchmarkName(void); ! virtual ~CBMBenchmarkLINPACKC_DP_ROLL(); ! }; DLdeclare(); --- 13,136 ---- #include <Benchmark/Package.h> ! namespace CBM { ! /** \brief Defines the linpackc package. ! */ ! class PackageLINPACKC : public PackageAutotools ! { ! public: ! private: ! virtual std::string downloadURL(void); ! virtual std::string expectedMD5(void); ! virtual std::string packageName(void); ! virtual std::string packageVersion(void); ! virtual int packageSize(void); /* in bytes */ ! virtual std::string packageComments(void); ! virtual std::string localPackageName(void); ! protected: ! virtual std::string language(void); ! virtual char *extractDirectory(void); ! virtual int preConfigure(int _force); ! public: ! PackageLINPACKC(class System *_system); ! DLPackageWrapper_declare(); ! virtual std::string license(void); ! virtual std::string homePage(void); ! virtual std::string author(void); ! virtual int benchmarkSize(void); ! virtual ~PackageLINPACKC(); ! }; ! /** \brief Abstract class for PackageLINPACKC benchmarks ! */ ! class BenchmarkLINPACKC : public Benchmark ! { ! protected: ! BenchmarkLINPACKC(CBM::Package *_package); ! virtual std::string benchmarkComments(void); ! virtual std::string benchmarkLINPACKCComments(void) = 0; ! virtual std::string bench(void); ! virtual ~BenchmarkLINPACKC(); ! }; ! /** \brief Defines the single precision unrolled benchmark within linpackc package. ! */ ! class BenchmarkLINPACKC_SP_UNROLL : public BenchmarkLINPACKC ! { ! public: ! private: ! protected: ! virtual std::string benchmarkLINPACKCComments(void); ! public: ! BenchmarkLINPACKC_SP_UNROLL(CBM::Package *_package); ! virtual std::string benchmarkName(void); ! virtual ~BenchmarkLINPACKC_SP_UNROLL(); ! }; ! /** \brief Defines the single precision 'rolled' benchmark within linpackc package. ! */ ! class BenchmarkLINPACKC_SP_ROLL : public BenchmarkLINPACKC ! { ! public: ! private: ! protected: ! virtual std::string benchmarkLINPACKCComments(void); ! public: ! BenchmarkLINPACKC_SP_ROLL(CBM::Package *_package); ! virtual std::string benchmarkName(void); ! virtual ~BenchmarkLINPACKC_SP_ROLL(); ! }; ! /** \brief Defines the double precision unrolled benchmark within linpackc package. ! */ ! class BenchmarkLINPACKC_DP_UNROLL : public BenchmarkLINPACKC ! { ! public: ! private: ! protected: ! virtual std::string benchmarkLINPACKCComments(void); ! public: ! BenchmarkLINPACKC_DP_UNROLL(CBM::Package *_package); ! virtual std::string benchmarkName(void); ! virtual ~BenchmarkLINPACKC_DP_UNROLL(); ! }; ! /** \brief Defines the double precision 'rolled' benchmark within linpackc package. ! */ ! class BenchmarkLINPACKC_DP_ROLL : public BenchmarkLINPACKC ! { ! public: ! private: ! protected: ! virtual std::string benchmarkLINPACKCComments(void); ! public: ! BenchmarkLINPACKC_DP_ROLL(CBM::Package *_package); ! virtual std::string benchmarkName(void); ! virtual ~BenchmarkLINPACKC_DP_ROLL(); ! }; ! } DLdeclare(); Index: Benchmark-SCIMARK2.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-SCIMARK2.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Benchmark-SCIMARK2.h 3 Jan 2007 22:06:27 -0000 1.3 --- Benchmark-SCIMARK2.h 21 Jan 2007 20:46:47 -0000 1.4 *************** *** 12,150 **** #include <Benchmark/Package.h> ! /** \brief Defines the scimark2 package. ! */ ! class CBMPackageSCIMARK2 : public CBMPackage ! { ! public: ! private: ! virtual std::string downloadURL(void); ! virtual std::string expectedMD5(void); ! ! virtual std::string packageName(void); ! virtual std::string packageVersion(void); ! virtual int packageSize(void); /* in bytes */ ! virtual std::string packageComments(void); ! virtual std::string localPackageName(void); ! protected: ! virtual std::string language(void); ! virtual char* extractDirectory(void); ! virtual int hasPatch(void); ! virtual int patch(int _force = 0); ! virtual int extract(int _force = 0); ! virtual int preConfigure(int _force); ! virtual int configure(CBMCompiler *_currentCompiler, ! CBMCompilerOptions *_currentOptions); ! virtual int make(void); ! virtual int release(void); ! public: ! CBMPackageSCIMARK2(class CBMSystem *_system); ! DLPackageWrapper_declare(); ! virtual std::string license(void); ! virtual std::string homePage(void); ! virtual std::string author(void); ! virtual int benchmarkSize(void); ! virtual ~CBMPackageSCIMARK2(); ! }; ! /** \brief Defines abstract benchmark for CBMPackageSCIMARK2 ! */ ! class CBMBenchmarkSCIMARK2 : public CBMBenchmark ! { ! protected: ! CBMBenchmarkSCIMARK2(CBMPackage *_package); ! virtual std::string benchmarkComments(void); ! virtual std::string benchmarkName(void) = 0; ! virtual std::string benchmarkSCIMARK2Comments(void) = 0; ! virtual std::string scimark2BenchmarkLabel(void) = 0; ! virtual std::string bench(void); ! virtual ~CBMBenchmarkSCIMARK2(); ! }; ! /** \brief Defines the fourier benchmark within scimark2 package. ! */ ! class CBMBenchmarkSCIMARK2_FOURIER : public CBMBenchmarkSCIMARK2 ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkSCIMARK2Comments(void); ! virtual std::string scimark2BenchmarkLabel(void); ! public: ! CBMBenchmarkSCIMARK2_FOURIER(CBMPackage *_package); ! virtual ~CBMBenchmarkSCIMARK2_FOURIER(); ! }; ! /** \brief Defines the sor benchmark within scimark2 package. ! */ ! class CBMBenchmarkSCIMARK2_SOR : public CBMBenchmarkSCIMARK2 ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkSCIMARK2Comments(void); ! virtual std::string scimark2BenchmarkLabel(void); ! public: ! CBMBenchmarkSCIMARK2_SOR(CBMPackage *_package); ! virtual ~CBMBenchmarkSCIMARK2_SOR(); ! }; ! /** \brief Defines the mc benchmark within scimark2 package. ! */ ! class CBMBenchmarkSCIMARK2_MC : public CBMBenchmarkSCIMARK2 ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkSCIMARK2Comments(void); ! virtual std::string scimark2BenchmarkLabel(void); ! public: ! CBMBenchmarkSCIMARK2_MC(CBMPackage *_package); ! virtual ~CBMBenchmarkSCIMARK2_MC(); ! }; ! /** \brief Defines the smm benchmark within scimark2 package. ! */ ! class CBMBenchmarkSCIMARK2_SMM : public CBMBenchmarkSCIMARK2 ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkSCIMARK2Comments(void); ! virtual std::string scimark2BenchmarkLabel(void); ! public: ! CBMBenchmarkSCIMARK2_SMM(CBMPackage *_package); ! virtual ~CBMBenchmarkSCIMARK2_SMM(); ! }; ! /** \brief Defines the lu benchmark within scimark2 package. ! */ ! class CBMBenchmarkSCIMARK2_LU : public CBMBenchmarkSCIMARK2 ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkSCIMARK2Comments(void); ! virtual std::string scimark2BenchmarkLabel(void); ! public: ! CBMBenchmarkSCIMARK2_LU(CBMPackage *_package); ! virtual ~CBMBenchmarkSCIMARK2_LU(); ! }; DLdeclare(); --- 12,151 ---- #include <Benchmark/Package.h> + namespace CBM { + /** \brief Defines the scimark2 package. + */ + class PackageSCIMARK2 : public Package + { + public: + private: + virtual std::string downloadURL(void); + virtual std::string expectedMD5(void); ! virtual std::string packageName(void); ! virtual std::string packageVersion(void); ! virtual int packageSize(void); /* in bytes */ ! virtual std::string packageComments(void); ! virtual std::string localPackageName(void); ! protected: ! virtual std::string language(void); ! virtual char* extractDirectory(void); ! virtual int hasPatch(void); ! virtual int patch(int _force = 0); ! virtual int extract(int _force = 0); ! virtual int preConfigure(int _force); ! virtual int configure(Compiler *_currentCompiler, ! CompilerOptions *_currentOptions); ! virtual int make(void); ! virtual int release(void); ! public: ! PackageSCIMARK2(class System *_system); ! DLPackageWrapper_declare(); ! virtual std::string license(void); ! virtual std::string homePage(void); ! virtual std::string author(void); ! virtual int benchmarkSize(void); ! virtual ~PackageSCIMARK2(); ! }; ! /** \brief Defines abstract benchmark for PackageSCIMARK2 ! */ ! class BenchmarkSCIMARK2 : public Benchmark ! { ! protected: ! BenchmarkSCIMARK2(CBM::Package *_package); ! virtual std::string benchmarkComments(void); ! virtual std::string benchmarkName(void) = 0; ! virtual std::string benchmarkSCIMARK2Comments(void) = 0; ! virtual std::string scimark2BenchmarkLabel(void) = 0; ! virtual std::string bench(void); ! virtual ~BenchmarkSCIMARK2(); ! }; ! /** \brief Defines the fourier benchmark within scimark2 package. ! */ ! class BenchmarkSCIMARK2_FOURIER : public BenchmarkSCIMARK2 ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkSCIMARK2Comments(void); ! virtual std::string scimark2BenchmarkLabel(void); ! public: ! BenchmarkSCIMARK2_FOURIER(CBM::Package *_package); ! virtual ~BenchmarkSCIMARK2_FOURIER(); ! }; ! /** \brief Defines the sor benchmark within scimark2 package. ! */ ! class BenchmarkSCIMARK2_SOR : public BenchmarkSCIMARK2 ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkSCIMARK2Comments(void); ! virtual std::string scimark2BenchmarkLabel(void); ! public: ! BenchmarkSCIMARK2_SOR(CBM::Package *_package); ! virtual ~BenchmarkSCIMARK2_SOR(); ! }; ! /** \brief Defines the mc benchmark within scimark2 package. ! */ ! class BenchmarkSCIMARK2_MC : public BenchmarkSCIMARK2 ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkSCIMARK2Comments(void); ! virtual std::string scimark2BenchmarkLabel(void); ! public: ! BenchmarkSCIMARK2_MC(CBM::Package *_package); ! virtual ~BenchmarkSCIMARK2_MC(); ! }; ! /** \brief Defines the smm benchmark within scimark2 package. ! */ ! class BenchmarkSCIMARK2_SMM : public BenchmarkSCIMARK2 ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkSCIMARK2Comments(void); ! virtual std::string scimark2BenchmarkLabel(void); ! public: ! BenchmarkSCIMARK2_SMM(CBM::Package *_package); ! virtual ~BenchmarkSCIMARK2_SMM(); ! }; ! /** \brief Defines the lu benchmark within scimark2 package. ! */ ! class BenchmarkSCIMARK2_LU : public BenchmarkSCIMARK2 ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkSCIMARK2Comments(void); ! virtual std::string scimark2BenchmarkLabel(void); ! public: ! BenchmarkSCIMARK2_LU(CBM::Package *_package); ! virtual ~BenchmarkSCIMARK2_LU(); ! }; ! } DLdeclare(); Index: Benchmark-LINPACKC.libwrapper.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-LINPACKC.libwrapper.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Benchmark-LINPACKC.libwrapper.h 15 Jan 2007 20:07:20 -0000 1.4 --- Benchmark-LINPACKC.libwrapper.h 21 Jan 2007 20:46:47 -0000 1.5 *************** *** 2,10 **** #include <UI/UI.h> ! int CBMPackageLINPACKC::benchmarkNumber(void) { return(4); } ! BenchmarkVector& CBMPackageLINPACKC::Benchmarks(void) { if (benchmarks.size()) return(benchmarks); benchmarks.push_back("linpackc-sp-unroll"); --- 2,12 ---- #include <UI/UI.h> ! using namespace CBM; ! ! int PackageLINPACKC::benchmarkNumber(void) { return(4); } ! CBM::BenchmarkVector& PackageLINPACKC::Benchmarks(void) { if (benchmarks.size()) return(benchmarks); benchmarks.push_back("linpackc-sp-unroll"); *************** *** 15,40 **** } ! CBMBenchmark *CBMPackageLINPACKC::Benchmark(std::string bid) { if (bid == "linpackc-sp-unroll") { ! return(new CBMBenchmarkLINPACKC_SP_UNROLL(this)); } if (bid == "linpackc-dp-roll") { ! return(new CBMBenchmarkLINPACKC_DP_ROLL(this)); } if (bid == "linpackc-dp-unroll") { ! return(new CBMBenchmarkLINPACKC_DP_UNROLL(this)); } if (bid == "linpackc-sp-roll") { ! return(new CBMBenchmarkLINPACKC_SP_ROLL(this)); } ! UI->Fatal("Unknown benchmark"); return(0); } ! CBMPackage *package_LINPACKC = 0; ! CBMPackage *cbmlib_getPackage(void) { if (!package_LINPACKC) { ! package_LINPACKC=new CBMPackageLINPACKC(cbmSystem); ! cbmlib_packages.push_back(package_LINPACKC); } return(package_LINPACKC); --- 17,42 ---- } ! CBM::Benchmark *PackageLINPACKC::Benchmark(std::string bid) { if (bid == "linpackc-sp-unroll") { ! return(new CBM::BenchmarkLINPACKC_SP_UNROLL(this)); } if (bid == "linpackc-dp-roll") { ! return(new CBM::BenchmarkLINPACKC_DP_ROLL(this)); } if (bid == "linpackc-dp-unroll") { ! return(new CBM::BenchmarkLINPACKC_DP_UNROLL(this)); } if (bid == "linpackc-sp-roll") { ! return(new CBM::BenchmarkLINPACKC_SP_ROLL(this)); } ! CBM::cbmUI->Fatal("Unknown benchmark"); return(0); } ! CBM::Package *package_LINPACKC = 0; ! CBM::Package *cbmlib_getPackage(void) { if (!package_LINPACKC) { ! package_LINPACKC=new PackageLINPACKC(CBM::cbmSystem); ! CBM::cbmlib_packages.push_back(package_LINPACKC); } return(package_LINPACKC); Index: Benchmark-BENCHPPLINUX.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPPLINUX.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Benchmark-BENCHPPLINUX.h 3 Jan 2007 22:06:26 -0000 1.3 --- Benchmark-BENCHPPLINUX.h 21 Jan 2007 20:46:46 -0000 1.4 *************** *** 13,685 **** #include <Benchmark/Package.h> ! /** \brief Defines the benchpp-linux package. ! */ ! class CBMPackageBENCHPPLINUX : public CBMPackage ! { ! public: ! private: ! virtual std::string downloadURL(void); ! virtual std::string expectedMD5(void); [...1319 lines suppressed...] ! /** \brief Defines the 'String Ops', hand optimized, ! * benchmark within benchpp-linux package. ! */ ! class BenchmarkBENCHPPLINUX_STRINGOPS_HO : public BenchmarkBENCHPPLINUX_IterationsPerSec ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkBENCHPPLINUXComments(void); ! virtual std::string benchppBenchmark(void); ! public: ! BenchmarkBENCHPPLINUX_STRINGOPS_HO(CBM::Package *_package); ! virtual ~BenchmarkBENCHPPLINUX_STRINGOPS_HO(); ! }; ! } DLdeclare(); Index: Benchmark-SCIMARK2.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-SCIMARK2.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Benchmark-SCIMARK2.cpp 3 Jan 2007 22:06:27 -0000 1.3 --- Benchmark-SCIMARK2.cpp 21 Jan 2007 20:46:47 -0000 1.4 *************** *** 14,73 **** #include <SupportedBenchmarks/Benchmark-SCIMARK2.libwrapper.h> ! CBMPackageSCIMARK2::CBMPackageSCIMARK2(CBMSystem *_system) ! : CBMPackage(_system) { } ! std::string CBMPackageSCIMARK2::downloadURL(void) { return("http://math.nist.gov/scimark2/scimark2_1c.zip"); } ! std::string CBMPackageSCIMARK2::expectedMD5(void) { return("6cc8d6d5312a07e32316c03580e0206b"); } ! std::string CBMPackageSCIMARK2::packageName(void) { return("scimark2"); } ! std::string CBMPackageSCIMARK2::packageVersion(void) { return("2.0"); } ! int CBMPackageSCIMARK2::packageSize(void) { return(13792); } ! std::string CBMPackageSCIMARK2::packageComments(void) { return("Official SciMark 2.0 package. Yet, a minor patch held locally is applied by benchmark suite."); } ! std::string CBMPackageSCIMARK2::localPackageName(void) { return("scimark2_1c.zip"); } ! std::string CBMPackageSCIMARK2::language(void) { return("C"); } ! char* CBMPackageSCIMARK2::extractDirectory(void) { return("scimark2"); } ! int CBMPackageSCIMARK2::hasPatch(void) { return(1); } ! int CBMPackageSCIMARK2::patch(int _force) { std::string cmd; --- 14,75 ---- #include <SupportedBenchmarks/Benchmark-SCIMARK2.libwrapper.h> ! using namespace CBM; ! ! PackageSCIMARK2::PackageSCIMARK2(CBM::System *_system) ! : Package(_system) { } ! std::string PackageSCIMARK2::downloadURL(void) { return("http://math.nist.gov/scimark2/scimark2_1c.zip"); } ! std::string PackageSCIMARK2::expectedMD5(void) { return("6cc8d6d5312a07e32316c03580e0206b"); } ! std::string PackageSCIMARK2::packageName(void) { return("scimark2"); } ! std::string PackageSCIMARK2::packageVersion(void) { return("2.0"); } ! int PackageSCIMARK2::packageSize(void) { return(13792); } ! std::string PackageSCIMARK2::packageComments(void) { return("Official SciMark 2.0 package. Yet, a minor patch held locally is applied by benchmark suite."); } ! std::string PackageSCIMARK2::localPackageName(void) { return("scimark2_1c.zip"); } ! std::string PackageSCIMARK2::language(void) { return("C"); } ! char* PackageSCIMARK2::extractDirectory(void) { return("scimark2"); } ! int PackageSCIMARK2::hasPatch(void) { return(1); } ! int PackageSCIMARK2::patch(int _force) { std::string cmd; *************** *** 76,80 **** std::string patch; ! patch+=system->temporaryDirectory(CBMSystem::Patches); patch+="/scimark2.patch.gz"; --- 78,82 ---- std::string patch; ! patch+=system->temporaryDirectory(CBM::System::Patches); patch+="/scimark2.patch.gz"; *************** *** 95,99 **** } ! int CBMPackageSCIMARK2::extract(int _force) { std::string localFile = localPackageAbsoluteName(); --- 97,101 ---- } ! int PackageSCIMARK2::extract(int _force) { std::string localFile = localPackageAbsoluteName(); *************** *** 102,106 **** cmd+="cd "; ! cmd+=system->temporaryDirectory(CBMSystem::Extract); cmd+=" && "; cmd+=CBM_PROG_MKDIR; --- 104,108 ---- cmd+="cd "; ! cmd+=system->temporaryDirectory(CBM::System::Extract); cmd+=" && "; cmd+=CBM_PROG_MKDIR; *************** *** 112,116 **** cmd+=CBM_PROG_UNZIP; cmd+=" "; ! cmd+=system->temporaryDirectory(CBMSystem::Download); cmd+="/"; cmd+=localPackageName(); --- 114,118 ---- cmd+=CBM_PROG_UNZIP; cmd+=" "; ! cmd+=system->temporaryDirectory(CBM::System::Download); cmd+="/"; cmd+=localPackageName(); *************** *** 119,134 **** } ! int CBMPackageSCIMARK2::preConfigure(int _force) { return(1); } ! int CBMPackageSCIMARK2::configure(CBMCompiler *_currentCompiler, ! CBMCompilerOptions *_currentOptions) { return(1); } ! int CBMPackageSCIMARK2::make(void) { std::string cmd; --- 121,136 ---- } ! int PackageSCIMARK2::preConfigure(int _force) { return(1); } ! int PackageSCIMARK2::configure(CBM::Compiler *_currentCompiler, ! CBM::CompilerOptions *_currentOptions) { return(1); } ! int PackageSCIMARK2::make(void) { std::string cmd; *************** *** 168,172 **** } ! int CBMPackageSCIMARK2::release(void) { std::string cmd; --- 170,174 ---- } ! int PackageSCIMARK2::release(void) { std::string cmd; *************** *** 182,215 **** } ! std::string CBMPackageSCIMARK2::license(void) { return("Not specified"); } ! std::string CBMPackageSCIMARK2::homePage(void) { return("http://math.nist.gov/scimark/"); } ! std::string CBMPackageSCIMARK2::author(void) { return("Roldan Pozo & Bruce R Miller"); } ! int CBMPackageSCIMARK2::benchmarkSize(void) { return(packageSize()); } ! CBMPackageSCIMARK2::~CBMPackageSCIMARK2() { } ! CBMBenchmarkSCIMARK2::CBMBenchmarkSCIMARK2(CBMPackage *_package) ! : CBMBenchmark(_package) { } ! std::string CBMBenchmarkSCIMARK2::benchmarkComments(void) { std::string comment; --- 184,217 ---- } ! std::string PackageSCIMARK2::license(void) { return("Not specified"); } ! std::string PackageSCIMARK2::homePage(void) { return("http://math.nist.gov/scimark/"); } ! std::string PackageSCIMARK2::author(void) { return("Roldan Pozo & Bruce R Miller"); } ! int PackageSCIMARK2::benchmarkSize(void) { return(packageSize()); } ! PackageSCIMARK2::~PackageSCIMARK2() { } ! BenchmarkSCIMARK2::BenchmarkSCIMARK2(CBM::Package *_package) ! : Benchmark(_package) { } ! std::string BenchmarkSCIMARK2::benchmarkComments(void) { std::string comment; *************** *** 221,225 **** } ! std::string CBMBenchmarkSCIMARK2::bench(void) { std::string cmd; --- 223,227 ---- } ! std::string BenchmarkSCIMARK2::bench(void) { std::string cmd; *************** *** 245,269 **** } ! CBMBenchmarkSCIMARK2::~CBMBenchmarkSCIMARK2() { } ! CBMBenchmarkSCIMARK2_FOURIER::CBMBenchmarkSCIMARK2_FOURIER(CBMPackage *_package) ! : CBMBenchmarkSCIMARK2(_package) { } ! std::string CBMBenchmarkSCIMARK2_FOURIER::benchmarkName(void) { return("scimark2-fourier"); } ! std::string CBMBenchmarkSCIMARK2_FOURIER::scimark2BenchmarkLabel(void) { return("FFT"); } ! std::string CBMBenchmarkSCIMARK2_FOURIER::benchmarkSCIMARK2Comments(void) { return("Fast Fourier Transform (FFT) performs a" \ --- 247,271 ---- } ! BenchmarkSCIMARK2::~BenchmarkSCIMARK2() { } ! BenchmarkSCIMARK2_FOURIER::BenchmarkSCIMARK2_FOURIER(CBM::Package *_package) ! : BenchmarkSCIMARK2(_package) { } ! std::string BenchmarkSCIMARK2_FOURIER::benchmarkName(void) { return("scimark2-fourier"); } ! std::string BenchmarkSCIMARK2_FOURIER::scimark2BenchmarkLabel(void) { return("FFT"); } ! std::string BenchmarkSCIMARK2_FOURIER::benchmarkSCIMARK2Comments(void) { return("Fast Fourier Transform (FFT) performs a" \ *************** *** 278,301 **** } ! CBMBenchmarkSCIMARK2_FOURIER::~CBMBenchmarkSCIMARK2_FOURIER() { } ! CBMBenchmarkSCIMARK2_SOR::CBMBenchmarkSCIMARK2_SOR(CBMPackage *_package) ! : CBMBenchmarkSCIMARK2(_package) { } ! std::string CBMBenchmarkSCIMARK2_SOR::benchmarkName(void) { return("scimark2-sor"); } ! std::string CBMBenchmarkSCIMARK2_SOR::scimark2BenchmarkLabel(void) { return("SOR"); } ! std::string CBMBenchmarkSCIMARK2_SOR::benchmarkSCIMARK2Comments(void) { return("Jacobi Successive Over-relaxation (SOR) on " \ --- 280,303 ---- } ! BenchmarkSCIMARK2_FOURIER::~BenchmarkSCIMARK2_FOURIER() { } ! BenchmarkSCIMARK2_SOR::BenchmarkSCIMARK2_SOR(CBM::Package *_package) ! : BenchmarkSCIMARK2(_package) { } ! std::string BenchmarkSCIMARK2_SOR::benchmarkName(void) { return("scimark2-sor"); } ! std::string BenchmarkSCIMARK2_SOR::scimark2BenchmarkLabel(void) { return("SOR"); } ! std::string BenchmarkSCIMARK2_SOR::benchmarkSCIMARK2Comments(void) { return("Jacobi Successive Over-relaxation (SOR) on " \ *************** *** 310,333 **** } ! CBMBenchmarkSCIMARK2_SOR::~CBMBenchmarkSCIMARK2_SOR() { } ! CBMBenchmarkSCIMARK2_MC::CBMBenchmarkSCIMARK2_MC(CBMPackage *_package) ! : CBMBenchmarkSCIMARK2(_package) { } ! std::string CBMBenchmarkSCIMARK2_MC::benchmarkName(void) { return("scimark2-mc"); } ! std::string CBMBenchmarkSCIMARK2_MC::scimark2BenchmarkLabel(void) { return("MC"); } ! std::string CBMBenchmarkSCIMARK2_MC::benchmarkSCIMARK2Comments(void) { return("Monte Carlo integration approximates the " \ --- 312,335 ---- } ! BenchmarkSCIMARK2_SOR::~BenchmarkSCIMARK2_SOR() { } ! BenchmarkSCIMARK2_MC::BenchmarkSCIMARK2_MC(CBM::Package *_package) ! : BenchmarkSCIMARK2(_package) { } ! std::string BenchmarkSCIMARK2_MC::benchmarkName(void) { return("scimark2-mc"); } ! std::string BenchmarkSCIMARK2_MC::scimark2BenchmarkLabel(void) { return("MC"); } ! std::string BenchmarkSCIMARK2_MC::benchmarkSCIMARK2Comments(void) { return("Monte Carlo integration approximates the " \ *************** *** 342,365 **** } ! CBMBenchmarkSCIMARK2_MC::~CBMBenchmarkSCIMARK2_MC() { } ! CBMBenchmarkSCIMARK2_SMM::CBMBenchmarkSCIMARK2_SMM(CBMPackage *_package) ! : CBMBenchmarkSCIMARK2(_package) { } ! std::string CBMBenchmarkSCIMARK2_SMM::benchmarkName(void) { return("scimark2-smm"); } ! std::string CBMBenchmarkSCIMARK2_SMM::scimark2BenchmarkLabel(void) { return("SMM"); } ! std::string CBMBenchmarkSCIMARK2_SMM::benchmarkSCIMARK2Comments(void) { return("Sparse matrix multiply uses an " \ --- 344,367 ---- } ! BenchmarkSCIMARK2_MC::~BenchmarkSCIMARK2_MC() { } ! BenchmarkSCIMARK2_SMM::BenchmarkSCIMARK2_SMM(CBM::Package *_package) ! : BenchmarkSCIMARK2(_package) { } ! std::string BenchmarkSCIMARK2_SMM::benchmarkName(void) { return("scimark2-smm"); } ! std::string BenchmarkSCIMARK2_SMM::scimark2BenchmarkLabel(void) { return("SMM"); } ! std::string BenchmarkSCIMARK2_SMM::benchmarkSCIMARK2Comments(void) { return("Sparse matrix multiply uses an " \ *************** *** 371,394 **** } ! CBMBenchmarkSCIMARK2_SMM::~CBMBenchmarkSCIMARK2_SMM() { } ! CBMBenchmarkSCIMARK2_LU::CBMBenchmarkSCIMARK2_LU(CBMPackage *_package) ! : CBMBenchmarkSCIMARK2(_package) { } ! std::string CBMBenchmarkSCIMARK2_LU::benchmarkName(void) { return("scimark2-lu"); } ! std::string CBMBenchmarkSCIMARK2_LU::scimark2BenchmarkLabel(void) { return("LU"); } ! std::string CBMBenchmarkSCIMARK2_LU::benchmarkSCIMARK2Comments(void) { return("Dense LU matrix factorization; computes " \ --- 373,396 ---- } ! BenchmarkSCIMARK2_SMM::~BenchmarkSCIMARK2_SMM() { } ! BenchmarkSCIMARK2_LU::BenchmarkSCIMARK2_LU(CBM::Package *_package) ! : BenchmarkSCIMARK2(_package) { } ! std::string BenchmarkSCIMARK2_LU::benchmarkName(void) { return("scimark2-lu"); } ! std::string BenchmarkSCIMARK2_LU::scimark2BenchmarkLabel(void) { return("LU"); } ! std::string BenchmarkSCIMARK2_LU::benchmarkSCIMARK2Comments(void) { return("Dense LU matrix factorization; computes " \ *************** *** 401,405 **** } ! CBMBenchmarkSCIMARK2_LU::~CBMBenchmarkSCIMARK2_LU() { } --- 403,407 ---- } ! BenchmarkSCIMARK2_LU::~BenchmarkSCIMARK2_LU() { } Index: Benchmark-BENCHPP.libwrapper.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPP.libwrapper.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Benchmark-BENCHPP.libwrapper.h 15 Jan 2007 20:07:20 -0000 1.3 --- Benchmark-BENCHPP.libwrapper.h 21 Jan 2007 20:46:46 -0000 1.4 *************** *** 2,10 **** #include <UI/UI.h> ! int CBMPackageBENCHPP::benchmarkNumber(void) { return(3); } ! BenchmarkVector& CBMPackageBENCHPP::Benchmarks(void) { if (benchmarks.size()) return(benchmarks); benchmarks.push_back("benchpp-stepanov-al12"); --- 2,12 ---- #include <UI/UI.h> ! using namespace CBM; ! ! int PackageBENCHPP::benchmarkNumber(void) { return(3); } ! CBM::BenchmarkVector& PackageBENCHPP::Benchmarks(void) { if (benchmarks.size()) return(benchmarks); benchmarks.push_back("benchpp-stepanov-al12"); *************** *** 14,36 **** } ! CBMBenchmark *CBMPackageBENCHPP::Benchmark(std::string bid) { if (bid == "benchpp-stepanov-al12") { ! return(new CBMBenchmarkBENCHPP_STEPANOV_AL12(this)); } if (bid == "benchpp-whetstone") { ! return(new CBMBenchmarkBENCHPP_WHETSTONE(this)); } if (bid == "benchpp-dhrystone") { ! return(new CBMBenchmarkBENCHPP_DHRYSTONE(this)); } ! UI->Fatal("Unknown benchmark"); return(0); } ! CBMPackage *package_BENCHPP = 0; ! CBMPackage *cbmlib_getPackage(void) { if (!package_BENCHPP) { ! package_BENCHPP=new CBMPackageBENCHPP(cbmSystem); ! cbmlib_packages.push_back(package_BENCHPP); } return(package_BENCHPP); --- 16,38 ---- } ! CBM::Benchmark *PackageBENCHPP::Benchmark(std::string bid) { if (bid == "benchpp-stepanov-al12") { ! return(new CBM::BenchmarkBENCHPP_STEPANOV_AL12(this)); } if (bid == "benchpp-whetstone") { ! return(new CBM::BenchmarkBENCHPP_WHETSTONE(this)); } if (bid == "benchpp-dhrystone") { ! return(new CBM::BenchmarkBENCHPP_DHRYSTONE(this)); } ! CBM::cbmUI->Fatal("Unknown benchmark"); return(0); } ! CBM::Package *package_BENCHPP = 0; ! CBM::Package *cbmlib_getPackage(void) { if (!package_BENCHPP) { ! package_BENCHPP=new PackageBENCHPP(CBM::cbmSystem); ! CBM::cbmlib_packages.push_back(package_BENCHPP); } return(package_BENCHPP); Index: Benchmark-BENCHPP.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPP.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Benchmark-BENCHPP.h 3 Jan 2007 22:06:26 -0000 1.3 --- Benchmark-BENCHPP.h 21 Jan 2007 20:46:46 -0000 1.4 *************** *** 13,131 **** #include <Benchmark/Package.h> ! /** \brief Defines the benchpp package. ! */ ! class CBMPackageBENCHPP : public CBMPackage ! { ! public: ! private: ! virtual std::string downloadURL(void); ! virtual std::string expectedMD5(void); ! virtual std::string packageName(void); ! virtual std::string packageVersion(void); ! virtual int packageSize(void); /* in bytes */ ! virtual std::string packageComments(void); ! virtual std::string localPackageName(void); ! protected: ! virtual std::string language(void); ! virtual char* extractDirectory(void); ! virtual int hasPatch(void); ! virtual int patch(int _force = 0); ! virtual int extract(int _force = 0); ! virtual int preConfigure(int _force); ! virtual int configure(CBMCompiler *_currentCompiler, ! CBMCompilerOptions *_currentOptions); ! virtual int make(void); ! virtual int release(void); ! public: ! CBMPackageBENCHPP(class CBMSystem *_system); ! DLPackageWrapper_declare(); ! virtual std::string license(void); ! virtual std::string homePage(void); ! virtual std::string author(void); ! virtual int benchmarkSize(void); ! virtual ~CBMPackageBENCHPP(); ! }; ! /** \brief Abstract benchmark definition for CBMPackageBENCHPP ! */ ! class CBMBenchmarkBENCHPP : public CBMBenchmark ! { ! protected: ! CBMBenchmarkBENCHPP(CBMPackage *_package); ! virtual std::string benchmarkComments(void); ! virtual std::string benchmarkBENCHPPComments(void) = 0; ! virtual std::string benchmarkName(void) = 0; ! virtual std::string benchppBenchmark(void) = 0; ! virtual std::string bench(void); ! virtual ~CBMBenchmarkBENCHPP(); ! }; ! /** \brief Defines the dhrystone benchmark within benchpp package. ! */ ! class CBMBenchmarkBENCHPP_DHRYSTONE : public CBMBenchmarkBENCHPP ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkBENCHPPComments(void); ! virtual std::string benchppBenchmark(void); ! public: ! CBMBenchmarkBENCHPP_DHRYSTONE(CBMPackage *_package); ! virtual ~CBMBenchmarkBENCHPP_DHRYSTONE(); ! }; ! /** \brief Defines the whetstone benchmark within benchpp package. ! */ ! class CBMBenchmarkBENCHPP_WHETSTONE : public CBMBenchmarkBENCHPP ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkBENCHPPComments(void); ! virtual std::string benchppBenchmark(void); ! public: ! CBMBenchmarkBENCHPP_WHETSTONE(CBMPackage *_package); ! virtual ~CBMBenchmarkBENCHPP_WHETSTONE(); ! }; ! /** \brief Defines base stuff for stephanov benchmarks within benchpp package. ! */ ! class CBMBenchmarkBENCHPP_STEPANOV : public CBMBenchmarkBENCHPP ! { ! protected: ! virtual std::string bench(void); ! public: ! CBMBenchmarkBENCHPP_STEPANOV(CBMPackage *_package); ! virtual ~CBMBenchmarkBENCHPP_STEPANOV(); ! }; ! /** \brief Defines the stephanov-al12 benchmark within benchpp package. ! */ ! class CBMBenchmarkBENCHPP_STEPANOV_AL12 : public CBMBenchmarkBENCHPP_STEPANOV ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkBENCHPPComments(void); ! virtual std::string benchppBenchmark(void); ! public: ! CBMBenchmarkBENCHPP_STEPANOV_AL12(CBMPackage *_package); ! virtual ~CBMBenchmarkBENCHPP_STEPANOV_AL12(); ! }; DLdeclare(); --- 13,133 ---- #include <Benchmark/Package.h> ! namespace CBM { ! /** \brief Defines the benchpp package. ! */ ! class PackageBENCHPP : public Package ! { ! public: ! private: ! virtual std::string downloadURL(void); ! virtual std::string expectedMD5(void); ! virtual std::string packageName(void); ! virtual std::string packageVersion(void); ! virtual int packageSize(void); /* in bytes */ ! virtual std::string packageComments(void); ! virtual std::string localPackageName(void); ! protected: ! virtual std::string language(void); ! virtual char* extractDirectory(void); ! virtual int hasPatch(void); ! virtual int patch(int _force = 0); ! virtual int extract(int _force = 0); ! virtual int preConfigure(int _force); ! virtual int configure(CBM::Compiler *_currentCompiler, ! CBM::CompilerOptions *_currentOptions); ! virtual int make(void); ! virtual int release(void); ! public: ! PackageBENCHPP(class System *_system); ! DLPackageWrapper_declare(); ! virtual std::string license(void); ! virtual std::string homePage(void); ! virtual std::string author(void); ! virtual int benchmarkSize(void); ! virtual ~PackageBENCHPP(); ! }; ! /** \brief Abstract benchmark definition for PackageBENCHPP ! */ ! class BenchmarkBENCHPP : public Benchmark ! { ! protected: ! BenchmarkBENCHPP(CBM::Package *_package); ! virtual std::string benchmarkComments(void); ! virtual std::string benchmarkBENCHPPComments(void) = 0; ! virtual std::string benchmarkName(void) = 0; ! virtual std::string benchppBenchmark(void) = 0; ! virtual std::string bench(void); ! virtual ~BenchmarkBENCHPP(); ! }; ! /** \brief Defines the dhrystone benchmark within benchpp package. ! */ ! class BenchmarkBENCHPP_DHRYSTONE : public BenchmarkBENCHPP ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkBENCHPPComments(void); ! virtual std::string benchppBenchmark(void); ! public: ! BenchmarkBENCHPP_DHRYSTONE(CBM::Package *_package); ! virtual ~BenchmarkBENCHPP_DHRYSTONE(); ! }; ! /** \brief Defines the whetstone benchmark within benchpp package. ! */ ! class BenchmarkBENCHPP_WHETSTONE : public BenchmarkBENCHPP ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkBENCHPPComments(void); ! virtual std::string benchppBenchmark(void); ! public: ! BenchmarkBENCHPP_WHETSTONE(CBM::Package *_package); ! virtual ~BenchmarkBENCHPP_WHETSTONE(); ! }; ! /** \brief Defines base stuff for stephanov benchmarks within benchpp package. ! */ ! class BenchmarkBENCHPP_STEPANOV : public BenchmarkBENCHPP ! { ! protected: ! virtual std::string bench(void); ! public: ! BenchmarkBENCHPP_STEPANOV(CBM::Package *_package); ! virtual ~BenchmarkBENCHPP_STEPANOV(); ! }; ! /** \brief Defines the stephanov-al12 benchmark within benchpp package. ! */ ! class BenchmarkBENCHPP_STEPANOV_AL12 : public BenchmarkBENCHPP_STEPANOV ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkBENCHPPComments(void); ! virtual std::string benchppBenchmark(void); ! public: ! BenchmarkBENCHPP_STEPANOV_AL12(CBM::Package *_package); ! virtual ~BenchmarkBENCHPP_STEPANOV_AL12(); ! }; ! } DLdeclare(); Index: Benchmark-BENCHPPLINUX.libwrapper.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPPLINUX.libwrapper.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Benchmark-BENCHPPLINUX.libwrapper.h 15 Jan 2007 20:07:20 -0000 1.3 --- Benchmark-BENCHPPLINUX.libwrapper.h 21 Jan 2007 20:46:47 -0000 1.4 *************** *** 2,10 **** #include <UI/UI.h> ! int CBMPackageBENCHPPLINUX::benchmarkNumber(void) { return(35); } ! BenchmarkVector& CBMPackageBENCHPPLINUX::Benchmarks(void) { if (benchmarks.size()) return(benchmarks); benchmarks.push_back("benchpplinux-bool-assign"); --- 2,12 ---- #include <UI/UI.h> ! using namespace CBM; ! ! int PackageBENCHPPLINUX::benchmarkNumber(void) { return(35); } ! CBM::BenchmarkVector& PackageBENCHPPLINUX::Benchmarks(void) { if (benchmarks.size()) return(benchmarks); benchmarks.push_back("benchpplinux-bool-assign"); *************** *** 46,164 **** } ! CBMBenchmark *CBMPackageBENCHPPLINUX::Benchmark(std::string bid) { if (bid == "benchpplinux-bool-assign") { ! return(new CBMBenchmarkBENCHPPLINUX_BOOL_ASSIGN(this)); } if (bid == "benchpplinux-constantpropagation") { ! return(new CBMBenchmarkBENCHPPLINUX_CONSTPROP(this)); } if (bid == "benchpplinux-10wsparseswitch") { ! return(new CBMBenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH(this)); } if (bid == "benchpplinux-dhrystone") { ! return(new CBMBenchmarkBENCHPPLINUX_DHRYSTONE(this)); } if (bid == "benchpplinux-inducvar-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_INDUCVAR_HO(this)); } if (bid == "benchpplinux-loopjamming-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_LOOPJAMMING_HO(this)); } if (bid == "benchpplinux-codemotion") { ! return(new CBMBenchmarkBENCHPPLINUX_CODEMOTION(this)); } if (bid == "benchpplinux-10wvfc") { ! return(new CBMBenchmarkBENCHPPLINUX_10WAY_VFC(this)); } if (bid == "benchpplinux-2wifelse") { ! return(new CBMBenchmarkBENCHPPLINUX_2WAY_IFELSE(this)); } if (bid == "benchpplinux-globalcommonse-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_GLOBALCSE_HO(this)); } if (bid == "benchpplinux-bitfields") { ! return(new CBMBenchmarkBENCHPPLINUX_BITFIELDS(this)); } if (bid == "benchpplinux-globalcommonse") { ! return(new CBMBenchmarkBENCHPPLINUX_GLOBALCSE(this)); } if (bid == "benchpplinux-2wswitch") { ! return(new CBMBenchmarkBENCHPPLINUX_2WAY_SWITCH(this)); } if (bid == "benchpplinux-inducvar") { ! return(new CBMBenchmarkBENCHPPLINUX_INDUCVAR(this)); } if (bid == "benchpplinux-bitfields-pba") { ! return(new CBMBenchmarkBENCHPPLINUX_BITFIELDS_PBA(this)); } if (bid == "benchpplinux-deadcode") { ! return(new CBMBenchmarkBENCHPPLINUX_DEADCODE(this)); } if (bid == "benchpplinux-reduncode-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_REDUNCODE_HO(this)); } if (bid == "benchpplinux-10wifelse") { ! return(new CBMBenchmarkBENCHPPLINUX_10WAY_IFELSE(this)); } if (bid == "benchpplinux-unneccopy-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_UNNECCOPY_HO(this)); } if (bid == "benchpplinux-10wswitch") { ! return(new CBMBenchmarkBENCHPPLINUX_10WAY_SWITCH(this)); } if (bid == "benchpplinux-packunpackobjets") { ! return(new CBMBenchmarkBENCHPPLINUX_PACKUNPACKOBJ(this)); } if (bid == "benchpplinux-bool-if") { ! return(new CBMBenchmarkBENCHPPLINUX_BOOL_IF(this)); } if (bid == "benchpplinux-unneccopy") { ! return(new CBMBenchmarkBENCHPPLINUX_UNNECCOPY(this)); } if (bid == "benchpplinux-reducstrength-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_REDUCSTRENGTH_HO(this)); } if (bid == "benchpplinux-deadcode-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_DEADCODE_HO(this)); } if (bid == "benchpplinux-reduncode") { ! return(new CBMBenchmarkBENCHPPLINUX_REDUNCODE(this)); } if (bid == "benchpplinux-constantpropagation-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_CONSTPROP_HO(this)); } if (bid == "benchpplinux-codemotion-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_CODEMOTION_HO(this)); } if (bid == "benchpplinux-whetstone") { ! return(new CBMBenchmarkBENCHPPLINUX_WHETSTONE(this)); } if (bid == "benchpplinux-stringops") { ! return(new CBMBenchmarkBENCHPPLINUX_STRINGOPS(this)); } if (bid == "benchpplinux-localcommonse-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_LOCALCSE_HO(this)); } if (bid == "benchpplinux-localcommonse") { ! return(new CBMBenchmarkBENCHPPLINUX_LOCALCSE(this)); } if (bid == "benchpplinux-stringops-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_STRINGOPS_HO(this)); } if (bid == "benchpplinux-packedbitarray") { ! return(new CBMBenchmarkBENCHPPLINUX_PACKEDBITARRAY(this)); } if (bid == "benchpplinux-loopjamming") { ! return(new CBMBenchmarkBENCHPPLINUX_LOOPJAMMING(this)); } ! UI->Fatal("Unknown benchmark"); return(0); } ! CBMPackage *package_BENCHPPLINUX = 0; ! CBMPackage *cbmlib_getPackage(void) { if (!package_BENCHPPLINUX) { ! package_BENCHPPLINUX=new CBMPackageBENCHPPLINUX(cbmSystem); ! cbmlib_packages.push_back(package_BENCHPPLINUX); } return(package_BENCHPPLINUX); --- 48,166 ---- } ! CBM::Benchmark *PackageBENCHPPLINUX::Benchmark(std::string bid) { if (bid == "benchpplinux-bool-assign") { ! return(new CBM::BenchmarkBENCHPPLINUX_BOOL_ASSIGN(this)); } if (bid == "benchpplinux-constantpropagation") { ! return(new CBM::BenchmarkBENCHPPLINUX_CONSTPROP(this)); } if (bid == "benchpplinux-10wsparseswitch") { ! return(new CBM::BenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH(this)); } if (bid == "benchpplinux-dhrystone") { ! return(new CBM::BenchmarkBENCHPPLINUX_DHRYSTONE(this)); } if (bid == "benchpplinux-inducvar-ho") { ! return(new CBM::BenchmarkBENCHPPLINUX_INDUCVAR_HO(this)); } if (bid == "benchpplinux-loopjamming-ho") { ! return(new CBM::BenchmarkBENCHPPLINUX_LOOPJAMMING_HO(this)); } if (bid == "benchpplinux-codemotion") { ! return(new CBM::BenchmarkBENCHPPLINUX_CODEMOTION(this)); } if (bid == "benchpplinux-10wvfc") { ! return(new CBM::BenchmarkBENCHPPLINUX_10WAY_VFC(this)); } if (bid == "benchpplinux-2wifelse") { ! return(new CBM::BenchmarkBENCHPPLINUX_2WAY_IFELSE(this)); } if (bid == "benchpplinux-globalcommonse-ho") { ! return(new CBM::BenchmarkBENCHPPLINUX_GLOBALCSE_HO(this)); } if (bid == "benchpplinux-bitfields") { ! return(new CBM::BenchmarkBENCHPPLINUX_BITFIELDS(this)); } if (bid == "benchpplinux-globalcommonse") { ! return(new CBM::BenchmarkBENCHPPLINUX_GLOBALCSE(this)); } if (bid == "benchpplinux-2wswitch") { ! return(new CBM::BenchmarkBENCHPPLINUX_2WAY_SWITCH(this)); } if (bid == "benchpplinux-inducvar") { ! return(new CBM::BenchmarkBENCHPPLINUX_INDUCVAR(this)); } if (bid == "benchpplinux-bitfields-pba") { ! return(new CBM::BenchmarkBENCHPPLINUX_BITFIELDS_PBA(this)); } if (bid == "benchpplinux-deadcode") { ! return(new CBM::BenchmarkBENCHPPLINUX_DEADCODE(this)); } if (bid == "benchpplinux-reduncode-ho") { ! return(new CBM::BenchmarkBENCHPPLINUX_REDUNCODE_HO(this)); } if (bid == "benchpplinux-10wifelse") { ! return(new CBM::BenchmarkBENCHPPLINUX_10WAY_IFELSE(this)); } if (bid == "benchpplinux-unneccopy-ho") { ! return(new CBM::BenchmarkBENCHPPLINUX_UNNECCOPY_HO(this)); } if (bid == "benchpplinux-10wswitch") { ! return(new CBM::BenchmarkBENCHPPLINUX_10WAY_SWITCH(this)); } if (bid == "benchpplinux-packunpackobjets") { ! return(new CBM::BenchmarkBENCHPPLINUX_PACKUNPACKOBJ(this)); } if (bid == "benchpplinux-bool-if") { ! return(new CBM::BenchmarkBENCHPPLINUX_BOOL_IF(this)); } if (bid == "benchpplinux-unneccopy") { ! return(new CBM::BenchmarkBENCHPPLINUX_UNNECCOPY(this)); } if (bid == "benchpplinux-reducstrength-ho") { ! return(new CBM::BenchmarkBENCHPPLINUX_REDUCSTRENGTH_HO(this)); } if (bid == "benchpplinux-deadcode-ho") { ! return(new CBM::BenchmarkBENCHPPLINUX_DEADCODE_HO(this)); } if (bid == "benchpplinux-reduncode") { ! return(new CBM::BenchmarkBENCHPPLINUX_REDUNCODE(this)); } if (bid == "benchpplinux-constantpropagation-ho") { ! return(new CBM::BenchmarkBENCHPPLINUX_CONSTPROP_HO(this)); } if (bid == "benchpplinux-codemotion-ho") { ! return(new CBM::BenchmarkBENCHPPLINUX_CODEMOTION_HO(this)); } if (bid == "benchpplinux-whetstone") { ! return(new CBM::BenchmarkBENCHPPLINUX_WHETSTONE(this)); } if (bid == "benchpplinux-stringops") { ! return(new CBM::BenchmarkBENCHPPLINUX_STRINGOPS(this)); } if (bid == "benchpplinux-localcommonse-ho") { ! return(new CBM::BenchmarkBENCHPPLINUX_LOCALC... [truncated message content] |
|
From: Frederic T. <xf...@us...> - 2007-01-21 20:46:00
|
Update of /cvsroot/compbench/CompBenchmarks++/System In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19108 Modified Files: System.cpp System.h Log Message: API changes. CBM namespace. Index: System.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/System/System.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** System.cpp 18 Jan 2007 18:43:02 -0000 1.21 --- System.cpp 21 Jan 2007 20:45:57 -0000 1.22 *************** *** 130,133 **** --- 130,177 ---- } + std::string System::arch(void) + { + return(""); + } + + std::string System::hostid(void) + { + return(""); + } + + std::string System::hostname(void) + { + return(""); + } + + std::string System::os(void) + { + return(""); + } + + std::string System::os_version(void) + { + return(""); + } + + std::string System::processor_name(void) + { + return(""); + } + + std::string System::processor_mhz(void) + { + return(""); + } + + std::string System::processor_cache(void) + { + return(""); + } + + std::string System::processor_number(void) + { + return(""); + } PackageVector &System::packageList(int _force) Index: System.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/System/System.h,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** System.h 18 Jan 2007 18:43:02 -0000 1.21 --- System.h 21 Jan 2007 20:45:57 -0000 1.22 *************** *** 75,97 **** virtual std::string exec0(char *command); ! /** Returns host's architecture. ! * As uname -m on UNIX. ! * \return Host's architecture */ ! virtual std::string arch(void) = 0; /** Get host ID * As hostid command does on UNIX. * \return Host ID as string.*/ ! virtual std::string hostid(void) = 0; /** Returns hostname * Returns the shortname. * \return hostname */ ! virtual std::string hostname(void) = 0; /** Returns operating system name * \return Operating system name (as uname command on UNIX) */ ! virtual std::string os(void) = 0; /** Returns operating system version * \return Operating system version (as uname -r command on most UNIXes) */ ! virtual std::string os_version(void) = 0; /** Returns processor name * Here we infer that each processor on the node are identical, which is the case --- 75,110 ---- virtual std::string exec0(char *command); ! /** Checks a given directory. ! Directory is given according to its purpose in CompBenchmarks. ! \sa Temp ! \sa checkDirectory() ! \return 1 if ok. ! */ ! virtual int CheckDirectory(Temp where); ! ! public: ! /** Initialize for CompBenchmarks usage. ! * Checks for temporary directories. ! * \return 1 if ok. ! * \sa CheckDirectory() */ ! virtual int init(void); ! /** Get host ID * As hostid command does on UNIX. * \return Host ID as string.*/ ! virtual std::string hostid(void); /** Returns hostname * Returns the shortname. * \return hostname */ ! ! virtual std::string hostname(void); /** Returns operating system name * \return Operating system name (as uname command on UNIX) */ ! ! virtual std::string os(void); /** Returns operating system version * \return Operating system version (as uname -r command on most UNIXes) */ ! virtual std::string os_version(void); /** Returns processor name * Here we infer that each processor on the node are identical, which is the case *************** *** 99,132 **** * \return Processor name, as clear text * \sa processor_number() */ ! virtual std::string processor_name(void) = 0; /** Returns processor speed * Processor speed in MHz. Integer expected. * \return std::string coding an integer matching the (first) processor speed, in MHz. */ ! virtual std::string processor_mhz(void) = 0; /** Returns processor cache * Processor second level cache in Kb. Integer expected. * \return std::string coding the (first) processor second level cache in Kb. */ ! virtual std::string processor_cache(void) = 0; /** Returns processors' number * \return std::string coding the number of processors (physical and logical) on host */ ! virtual std::string processor_number(void) = 0; - /** Checks a given directory. - Directory is given according to its purpose in CompBenchmarks. - \sa Temp - \sa checkDirectory() - \return 1 if ok. - */ - virtual int CheckDirectory(Temp where); ! public: ! /** Initialize for CompBenchmarks usage. ! * Checks for temporary directories. ! * \return 1 if ok. ! * \sa CheckDirectory() */ ! virtual int init(void); /** Give a list containing the compatible benchmarks --- 112,136 ---- * \return Processor name, as clear text * \sa processor_number() */ ! virtual std::string processor_name(void); /** Returns processor speed * Processor speed in MHz. Integer expected. * \return std::string coding an integer matching the (first) processor speed, in MHz. */ ! virtual std::string processor_mhz(void); /** Returns processor cache * Processor second level cache in Kb. Integer expected. * \return std::string coding the (first) processor second level cache in Kb. */ ! virtual std::string processor_cache(void); /** Returns processors' number * \return std::string coding the number of processors (physical and logical) on host */ ! virtual std::string processor_number(void); ! /** Returns host's architecture. ! * As uname -m on UNIX. ! * \return Host's architecture */ ! virtual std::string arch(void); /** Give a list containing the compatible benchmarks |
|
From: Frederic T. <xf...@us...> - 2007-01-21 20:45:14
|
Update of /cvsroot/compbench/CompBenchmarks++/System In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18838 Modified Files: XML.cpp XML.h Log Message: CBM namespace. Index: XML.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/System/XML.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** XML.h 18 Jan 2007 18:43:02 -0000 1.3 --- XML.h 21 Jan 2007 20:45:09 -0000 1.4 *************** *** 14,148 **** namespace CBM { ! namespace XML { ! ! /** \brief XML Attribute ! * Internal representation for an XML attribute. ! */ ! class Attribute ! { ! protected: ! std::string name; /*!< Attribute name */ ! std::string value; /*!< Attribute value */ ! public: ! /** Constructor ! * Initialise a new attribute. ! * \param _name Attribute's name ! * \param _value Attribute's value (optional) */ ! Attribute(std::string _name, ! std::string _value = ""); ! /** Get attribute's name ! \return a std::string */ ! virtual std::string Name(void); ! /** Get attribute's value ! \return a std::string */ ! virtual std::string Value(void); ! /** Set attribute's value ! \param _value new value (std::string) ! */ ! virtual void setValue(std::string _value); ! /** Destructor */ ! virtual ~Attribute(); ! }; ! /** \brief XML Node ! * Internal representation of an XML node. ! */ ! class Node ! { ! protected: ! std::vector<Node*> childs; /*!< Child nodes */ ! std::vector<Attribute*> attributes; /*!< Node's attributes */ ! std::string name; /*!< Node's name */ ! std::string value; /*!< Node value */ ! virtual void indent(std::string& str, ! int _indent); ! public: ! /** Constructor ! * Initialise a new node. ! * \param _name Node's name ! * \param _value Node's value (optional) */ ! Node(std::string _name, ! std::string _value = ""); ! /** Get node's name ! \return a std::string */ ! virtual std::string Name(void); ! /** Get node's value ! \return a std::string */ ! virtual std::string Value(void); ! /** Set node's value ! \param _value new value (std::string) ! */ ! virtual void setValue(std::string _value); ! /** Get childs' number ! * \return number of nodes held by current node ! * \sa getChild() */ ! virtual int childNumber(void); ! /** Get a child node according to its index ! * \return A node ! * \sa childNumber() */ ! virtual Node *getChild(int _index); ! /** Get attributes' number ! * \return number of attributes on current node ! * \sa getAttribute() */ ! virtual int attributeNumber(void); ! /** Get an attribute according to its index ! * \return An attribute ! * \sa attributeNumber() */ ! virtual Attribute *getAttribute(int _index); ! /** Add a node into current node ! * \param _child node to add ! * \return node added (_child) ! * \sa addNode() */ ! virtual Node *add(Node *_child); ! /** Add a node into current node ! * \param _name name of the node ! * \param _value value of the node (optional) ! * \return node added (_child) ! * \sa add() */ ! virtual Node *addNode(std::string _name, ! std::string _value = ""); ! /** Add an attribute on current node ! * \param _attribute to add ! * \return attribute added (_attribute) ! * \sa addAttribute() */ ! virtual Attribute *add(Attribute *_attribute); ! /** Add an attribute on current node ! * \param _name name of the attribute ! * \param _value value of the attribute (optional) ! * \return attribute added (_attribute) ! * \sa add() */ ! virtual Attribute *addAttribute(std::string _name, ! std::string _value = ""); ! /** Get textual (XML) representation of the node ! * Build a string corresponding to the XML elements of current node and ! * childs (includes attributes and value). ! * \param _indent Optional indentation level; internal use only. ! * \return string (XML formatted) */ ! virtual std::string str(int _indent = 0); ! virtual ~Node(); ! }; ! } } --- 14,147 ---- namespace CBM { ! /** \brief XML Attribute ! * Internal representation for an XML attribute. ! * \sa XMLNode ! */ ! class XMLAttribute ! { ! protected: ! std::string name; /*!< Attribute name */ ! std::string value; /*!< Attribute value */ ! public: ! /** Constructor ! * Initialise a new attribute. ! * \param _name Attribute's name ! * \param _value Attribute's value (optional) */ ! XMLAttribute(std::string _name, ! std::string _value = ""); ! /** Get attribute's name ! \return a std::string */ ! virtual std::string Name(void); ! /** Get attribute's value ! \return a std::string */ ! virtual std::string Value(void); ! /** Set attribute's value ! \param _value new value (std::string) ! */ ! virtual void setValue(std::string _value); ! /** Destructor */ ! virtual ~XMLAttribute(); ! }; ! /** \brief XML Node ! * Internal representation of an XML node. ! * \sa XMLAttribute ! */ ! class XMLNode ! { ! protected: ! std::vector<XMLNode*> childs; /*!< Child nodes */ ! std::vector<XMLAttribute*> attributes; /*!< Node's attributes */ ! std::string name; /*!< Node's name */ ! std::string value; /*!< Node value */ ! virtual void indent(std::string& str, ! int _indent); ! public: ! /** Constructor ! * Initialise a new node. ! * \param _name Node's name ! * \param _value Node's value (optional) */ ! XMLNode(std::string _name, ! std::string _value = ""); ! /** Get node's name ! \return a std::string */ ! virtual std::string Name(void); ! /** Get node's value ! \return a std::string */ ! virtual std::string Value(void); ! /** Set node's value ! \param _value new value (std::string) ! */ ! virtual void setValue(std::string _value); ! /** Get childs' number ! * \return number of nodes held by current node ! * \sa getChild() */ ! virtual int childNumber(void); ! /** Get a child node according to its index ! * \return A node ! * \sa childNumber() */ ! virtual XMLNode *getChild(int _index); ! /** Get attributes' number ! * \return number of attributes on current node ! * \sa getAttribute() */ ! virtual int attributeNumber(void); ! /** Get an attribute according to its index ! * \return An attribute ! * \sa attributeNumber() */ ! virtual XMLAttribute *getAttribute(int _index); ! /** Add a node into current node ! * \param _child node to add ! * \return node added (_child) ! * \sa addNode() */ ! virtual XMLNode *add(XMLNode *_child); ! /** Add a node into current node ! * \param _name name of the node ! * \param _value value of the node (optional) ! * \return node added (_child) ! * \sa add() */ ! virtual XMLNode *addNode(std::string _name, ! std::string _value = ""); ! /** Add an attribute on current node ! * \param _attribute to add ! * \return attribute added (_attribute) ! * \sa addAttribute() */ ! virtual XMLAttribute *add(XMLAttribute *_attribute); ! /** Add an attribute on current node ! * \param _name name of the attribute ! * \param _value value of the attribute (optional) ! * \return attribute added (_attribute) ! * \sa add() */ ! virtual XMLAttribute *addAttribute(std::string _name, ! std::string _value = ""); ! /** Get textual (XML) representation of the node ! * Build a string corresponding to the XML elements of current node and ! * childs (includes attributes and value). ! * \param _indent Optional indentation level; internal use only. ! * \return string (XML formatted) */ ! virtual std::string str(int _indent = 0); ! virtual ~XMLNode(); ! }; } Index: XML.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/System/XML.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** XML.cpp 18 Jan 2007 18:43:02 -0000 1.2 --- XML.cpp 21 Jan 2007 20:45:09 -0000 1.3 *************** *** 8,15 **** #include <System/XML.h> ! using namespace CBM::XML; ! Attribute::Attribute(std::string _name, ! std::string _value) { name=_name; --- 8,15 ---- #include <System/XML.h> ! using namespace CBM; ! XMLAttribute::XMLAttribute(std::string _name, ! std::string _value) { name=_name; *************** *** 17,40 **** } ! std::string Attribute::Name(void) { return(name); } ! std::string Attribute::Value(void) { return(value); } ! void Attribute::setValue(std::string _value) { value=_value; } ! Attribute::~Attribute() { } ! Node::Node(std::string _name, std::string _value) { --- 17,40 ---- } ! std::string XMLAttribute::Name(void) { return(name); } ! std::string XMLAttribute::Value(void) { return(value); } ! void XMLAttribute::setValue(std::string _value) { value=_value; } ! XMLAttribute::~XMLAttribute() { } ! XMLNode::XMLNode(std::string _name, std::string _value) { *************** *** 43,47 **** } ! void Node::indent(std::string& str, int _indent) { --- 43,47 ---- } ! void XMLNode::indent(std::string& str, int _indent) { *************** *** 50,84 **** } ! std::string Node::Name(void) { return(name); } ! std::string Node::Value(void) { return(value); } ! void Node::setValue(std::string _value) { value=_value; } ! int Node::childNumber(void) { return(childs.size()); } ! Node *Node::getChild(int _index) { return(childs[_index]); } ! int Node::attributeNumber(void) { return(attributes.size()); } ! Attribute *Node::getAttribute(int _index) { return(attributes[_index]); --- 50,84 ---- } ! std::string XMLNode::Name(void) { return(name); } ! std::string XMLNode::Value(void) { return(value); } ! void XMLNode::setValue(std::string _value) { value=_value; } ! int XMLNode::childNumber(void) { return(childs.size()); } ! XMLNode *XMLNode::getChild(int _index) { return(childs[_index]); } ! int XMLNode::attributeNumber(void) { return(attributes.size()); } ! XMLAttribute *XMLNode::getAttribute(int _index) { return(attributes[_index]); *************** *** 86,90 **** ! Node *Node::add(Node *_child) { childs.push_back(_child); --- 86,90 ---- ! XMLNode *XMLNode::add(XMLNode *_child) { childs.push_back(_child); *************** *** 92,104 **** } ! Node *Node::addNode(std::string _name, ! std::string _value) { ! Node *result = new Node(_name, _value); return(add(result)); } ! Attribute *Node::add(Attribute *_attribute) { attributes.push_back(_attribute); --- 92,104 ---- } ! XMLNode *XMLNode::addNode(std::string _name, ! std::string _value) { ! XMLNode *result = new XMLNode(_name, _value); return(add(result)); } ! XMLAttribute *XMLNode::add(XMLAttribute *_attribute) { attributes.push_back(_attribute); *************** *** 106,121 **** } ! Attribute *Node::addAttribute(std::string _name, ! std::string _value) { ! Attribute *result = new Attribute(_name, _value); return(add(result)); } ! std::string Node::str(int _indent) { std::string result; ! Attribute *att; int i; int n_child; --- 106,121 ---- } ! XMLAttribute *XMLNode::addAttribute(std::string _name, ! std::string _value) { ! XMLAttribute *result = new XMLAttribute(_name, _value); return(add(result)); } ! std::string XMLNode::str(int _indent) { std::string result; ! XMLAttribute *att; int i; int n_child; *************** *** 173,177 **** } ! Node::~Node() { } --- 173,177 ---- } ! XMLNode::~XMLNode() { } |
|
From: Frederic T. <xf...@us...> - 2007-01-21 20:44:12
|
Update of /cvsroot/compbench/CompBenchmarks++/UI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18404 Modified Files: UI.cpp Log Message: CBM namespace. Index: UI.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/UI/UI.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** UI.cpp 18 Jan 2007 18:43:25 -0000 1.7 --- UI.cpp 21 Jan 2007 20:44:05 -0000 1.8 *************** *** 7,11 **** using namespace CBM; ! CBM::UI *cbmUI = 0; UI::UI() --- 7,11 ---- using namespace CBM; ! CBM::UI *CBM::cbmUI = 0; UI::UI() |
|
From: Frederic T. <xf...@us...> - 2007-01-21 20:43:51
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18291 Modified Files: libcompbenchmarks.cpp libcompbenchmarks.h Log Message: CBM namespace. Index: libcompbenchmarks.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** libcompbenchmarks.h 10 Jan 2007 20:32:31 -0000 1.3 --- libcompbenchmarks.h 21 Jan 2007 20:43:42 -0000 1.4 *************** *** 24,49 **** #endif ! /** Enable/disable verbosity ! * \sa UO_verbose */ ! extern void setVerbosity(int v); ! ! /** Defines version of the libcompbenchmarks library */ ! extern char *libcompbenchmarks_version; ! ! /** User option defining if package's test suite has to be run */ ! extern int UO_enableTestSuite; ! /** User option defining 'force' mode */ ! extern int UO_force; ! /** Verbose mode. ! * If set to 0, disable verbose mode (UI messages disabled). */ ! extern int UO_verbose; - /** Enable exits on fatal error. - * Set to 1 in Perl wrapper; defaults to 0. */ - extern int UO_fatal; #endif --- 24,50 ---- #endif ! namespace CBM { ! /** Enable/disable verbosity ! * \sa UO_verbose */ ! extern void setVerbosity(int v); ! /** Defines version of the libcompbenchmarks library */ ! extern char *libcompbenchmarks_version; + /** User option defining if package's test suite has to be run */ + extern int UO_enableTestSuite; ! /** User option defining 'force' mode */ ! extern int UO_force; + /** Verbose mode. + * If set to 0, disable verbose mode (UI messages disabled). */ + extern int UO_verbose; + + /** Enable exits on fatal error. + * Set to 1 in Perl wrapper; defaults to 0. */ + extern int UO_fatal; + } #endif Index: libcompbenchmarks.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** libcompbenchmarks.cpp 10 Jan 2007 20:32:31 -0000 1.3 --- libcompbenchmarks.cpp 21 Jan 2007 20:43:42 -0000 1.4 *************** *** 1,13 **** #include <libcompbenchmarks.h> ! char *libcompbenchmarks_version = VERSION; ! int UO_enableTestSuite = 1; ! int UO_force = 0; ! int UO_verbose = 1; ! int UO_fatal = 1; ! void setVerbosity(int v) { ! UO_verbose=v; } --- 1,13 ---- #include <libcompbenchmarks.h> ! char *CBM::libcompbenchmarks_version = VERSION; ! int CBM::UO_enableTestSuite = 1; ! int CBM::UO_force = 0; ! int CBM::UO_verbose = 1; ! int CBM::UO_fatal = 1; ! void CBM::setVerbosity(int v) { ! CBM::UO_verbose=v; } |
|
From: Frederic T. <xf...@us...> - 2007-01-18 18:44:41
|
Update of /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19223 Modified Files: Benchmark-BZIP2.cpp Benchmark-BZIP2.h Benchmark-BZIP2.libwrapper.h Benchmark-GZIP.cpp Benchmark-GZIP.h Benchmark-GZIP.libwrapper.h Benchmark-NBENCH.cpp Benchmark-NBENCH.h Benchmark-NBENCH.libwrapper.h Benchmark-SCIMARK2.libwrapper.h benchmarks-genlibwrapper.pl Log Message: CBM namespace. Index: Benchmark-NBENCH.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-NBENCH.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Benchmark-NBENCH.h 3 Jan 2007 22:06:27 -0000 1.3 --- Benchmark-NBENCH.h 18 Jan 2007 18:44:36 -0000 1.4 *************** *** 13,237 **** #include <Benchmark/Package.h> ! /** \brief Defines the nbench package. ! */ ! class CBMPackageNBENCH : public CBMPackage ! { ! public: ! private: ! virtual std::string downloadURL(void); ! virtual std::string expectedMD5(void); ! virtual std::string packageName(void); ! virtual std::string packageVersion(void); ! virtual int packageSize(void); /* in bytes */ ! virtual std::string packageComments(void); ! virtual std::string localPackageName(void); ! protected: ! virtual std::string language(void); ! virtual char* extractDirectory(void); ! virtual int extract(int _force = 0); ! virtual int preConfigure(int _force); ! virtual int configure(CBMCompiler *_currentCompiler, ! CBMCompilerOptions *_currentOptions); ! virtual int make(void); ! virtual int release(void); ! public: ! CBMPackageNBENCH(class CBMSystem *_system); ! DLPackageWrapper_declare(); ! virtual std::string license(void); ! virtual std::string homePage(void); ! virtual std::string author(void); ! virtual int benchmarkSize(void); ! virtual ~CBMPackageNBENCH(); ! }; ! /** \brief Abstract benchmark for CBMPackageNBENCH package. ! */ ! class CBMBenchmarkNBENCH : public CBMBenchmark ! { ! protected: ! virtual int nbyteWriteDatFile(void); ! virtual std::string benchmarkComments(void); ! virtual std::string nbyteBenchmark(void) = 0; ! virtual std::string nbyteBenchmarkLabel(void) = 0; ! virtual std::string benchmarkNBENCHComments(void) = 0; ! virtual std::string bench(void); ! CBMBenchmarkNBENCH(CBMPackage *_package); ! virtual ~CBMBenchmarkNBENCH(); ! }; ! /** \brief Defines the numsort benchmark within nbench package. ! */ ! class CBMBenchmarkNBENCH_NUMSORT : public CBMBenchmarkNBENCH ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkNBENCHComments(void); ! virtual std::string nbyteBenchmark(void); ! virtual std::string nbyteBenchmarkLabel(void); ! public: ! CBMBenchmarkNBENCH_NUMSORT(CBMPackage *_package); ! virtual ~CBMBenchmarkNBENCH_NUMSORT(); ! }; ! /** \brief Defines the stringsort benchmark within nbench package. ! */ ! class CBMBenchmarkNBENCH_STRINGSORT : public CBMBenchmarkNBENCH ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkNBENCHComments(void); ! virtual std::string nbyteBenchmark(void); ! virtual std::string nbyteBenchmarkLabel(void); ! public: ! CBMBenchmarkNBENCH_STRINGSORT(CBMPackage *_package); ! virtual ~CBMBenchmarkNBENCH_STRINGSORT(); ! }; ! /** \brief Defines the bitfield benchmark within nbench package. ! */ ! class CBMBenchmarkNBENCH_BITFIELD : public CBMBenchmarkNBENCH ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkNBENCHComments(void); ! virtual std::string nbyteBenchmark(void); ! virtual std::string nbyteBenchmarkLabel(void); ! public: ! CBMBenchmarkNBENCH_BITFIELD(CBMPackage *_package); ! virtual ~CBMBenchmarkNBENCH_BITFIELD(); ! }; ! /** \brief Defines the emf benchmark within nbench package. ! */ ! class CBMBenchmarkNBENCH_EMF : public CBMBenchmarkNBENCH ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkNBENCHComments(void); ! virtual std::string nbyteBenchmark(void); ! virtual std::string nbyteBenchmarkLabel(void); ! public: ! CBMBenchmarkNBENCH_EMF(CBMPackage *_package); ! virtual ~CBMBenchmarkNBENCH_EMF(); ! }; ! /** \brief Defines the fourier benchmark within nbench package. ! */ ! class CBMBenchmarkNBENCH_FOURIER : public CBMBenchmarkNBENCH ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkNBENCHComments(void); ! virtual std::string nbyteBenchmark(void); ! virtual std::string nbyteBenchmarkLabel(void); ! public: ! CBMBenchmarkNBENCH_FOURIER(CBMPackage *_package); ! virtual ~CBMBenchmarkNBENCH_FOURIER(); ! }; ! /** \brief Defines the assign benchmark within nbench package. ! */ ! class CBMBenchmarkNBENCH_ASSIGN : public CBMBenchmarkNBENCH ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkNBENCHComments(void); ! virtual std::string nbyteBenchmark(void); ! virtual std::string nbyteBenchmarkLabel(void); ! public: ! CBMBenchmarkNBENCH_ASSIGN(CBMPackage *_package); ! virtual ~CBMBenchmarkNBENCH_ASSIGN(); ! }; ! /** \brief Defines the huffman benchmark within nbench package. ! */ ! class CBMBenchmarkNBENCH_HUFFMAN : public CBMBenchmarkNBENCH ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkNBENCHComments(void); ! virtual std::string nbyteBenchmark(void); ! virtual std::string nbyteBenchmarkLabel(void); ! public: ! CBMBenchmarkNBENCH_HUFFMAN(CBMPackage *_package); ! virtual ~CBMBenchmarkNBENCH_HUFFMAN(); ! }; ! /** \brief Defines the idea benchmark within nbench package. ! */ ! class CBMBenchmarkNBENCH_IDEA : public CBMBenchmarkNBENCH ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkNBENCHComments(void); ! virtual std::string nbyteBenchmark(void); ! virtual std::string nbyteBenchmarkLabel(void); ! public: ! CBMBenchmarkNBENCH_IDEA(CBMPackage *_package); ! virtual ~CBMBenchmarkNBENCH_IDEA(); ! }; ! /** \brief Defines the nnet benchmark within nbench package. ! */ ! class CBMBenchmarkNBENCH_NNET : public CBMBenchmarkNBENCH ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkNBENCHComments(void); ! virtual std::string nbyteBenchmark(void); ! virtual std::string nbyteBenchmarkLabel(void); ! public: ! CBMBenchmarkNBENCH_NNET(CBMPackage *_package); ! virtual ~CBMBenchmarkNBENCH_NNET(); ! }; ! /** \brief Defines the lu benchmark within nbench package. ! */ ! class CBMBenchmarkNBENCH_LU : public CBMBenchmarkNBENCH ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkNBENCHComments(void); ! virtual std::string nbyteBenchmark(void); ! virtual std::string nbyteBenchmarkLabel(void); ! public: ! CBMBenchmarkNBENCH_LU(CBMPackage *_package); ! virtual ~CBMBenchmarkNBENCH_LU(); ! }; DLdeclare(); --- 13,239 ---- #include <Benchmark/Package.h> ! namespace CBM { ! /** \brief Defines the nbench package. ! */ ! class PackageNBENCH : public Package ! { ! public: ! private: ! virtual std::string downloadURL(void); ! virtual std::string expectedMD5(void); ! virtual std::string packageName(void); ! virtual std::string packageVersion(void); ! virtual int packageSize(void); /* in bytes */ ! virtual std::string packageComments(void); ! virtual std::string localPackageName(void); ! protected: ! virtual std::string language(void); ! virtual char* extractDirectory(void); ! virtual int extract(int _force = 0); ! virtual int preConfigure(int _force); ! virtual int configure(Compiler *_currentCompiler, ! CompilerOptions *_currentOptions); ! virtual int make(void); ! virtual int release(void); ! public: ! PackageNBENCH(class System *_system); ! DLPackageWrapper_declare(); ! virtual std::string license(void); ! virtual std::string homePage(void); ! virtual std::string author(void); ! virtual int benchmarkSize(void); ! virtual ~PackageNBENCH(); ! }; ! /** \brief Abstract benchmark for PackageNBENCH package. ! */ ! class BenchmarkNBENCH : public Benchmark ! { ! protected: ! virtual int nbyteWriteDatFile(void); ! virtual std::string benchmarkComments(void); ! virtual std::string nbyteBenchmark(void) = 0; ! virtual std::string nbyteBenchmarkLabel(void) = 0; ! virtual std::string benchmarkNBENCHComments(void) = 0; ! virtual std::string bench(void); ! BenchmarkNBENCH(CBM::Package *_package); ! virtual ~BenchmarkNBENCH(); ! }; ! /** \brief Defines the numsort benchmark within nbench package. ! */ ! class BenchmarkNBENCH_NUMSORT : public BenchmarkNBENCH ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkNBENCHComments(void); ! virtual std::string nbyteBenchmark(void); ! virtual std::string nbyteBenchmarkLabel(void); ! public: ! BenchmarkNBENCH_NUMSORT(CBM::Package *_package); ! virtual ~BenchmarkNBENCH_NUMSORT(); ! }; ! /** \brief Defines the stringsort benchmark within nbench package. ! */ ! class BenchmarkNBENCH_STRINGSORT : public BenchmarkNBENCH ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkNBENCHComments(void); ! virtual std::string nbyteBenchmark(void); ! virtual std::string nbyteBenchmarkLabel(void); ! public: ! BenchmarkNBENCH_STRINGSORT(CBM::Package *_package); ! virtual ~BenchmarkNBENCH_STRINGSORT(); ! }; ! /** \brief Defines the bitfield benchmark within nbench package. ! */ ! class BenchmarkNBENCH_BITFIELD : public BenchmarkNBENCH ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkNBENCHComments(void); ! virtual std::string nbyteBenchmark(void); ! virtual std::string nbyteBenchmarkLabel(void); ! public: ! BenchmarkNBENCH_BITFIELD(CBM::Package *_package); ! virtual ~BenchmarkNBENCH_BITFIELD(); ! }; ! /** \brief Defines the emf benchmark within nbench package. ! */ ! class BenchmarkNBENCH_EMF : public BenchmarkNBENCH ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkNBENCHComments(void); ! virtual std::string nbyteBenchmark(void); ! virtual std::string nbyteBenchmarkLabel(void); ! public: ! BenchmarkNBENCH_EMF(CBM::Package *_package); ! virtual ~BenchmarkNBENCH_EMF(); ! }; ! /** \brief Defines the fourier benchmark within nbench package. ! */ ! class BenchmarkNBENCH_FOURIER : public BenchmarkNBENCH ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkNBENCHComments(void); ! virtual std::string nbyteBenchmark(void); ! virtual std::string nbyteBenchmarkLabel(void); ! public: ! BenchmarkNBENCH_FOURIER(CBM::Package *_package); ! virtual ~BenchmarkNBENCH_FOURIER(); ! }; ! /** \brief Defines the assign benchmark within nbench package. ! */ ! class BenchmarkNBENCH_ASSIGN : public BenchmarkNBENCH ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkNBENCHComments(void); ! virtual std::string nbyteBenchmark(void); ! virtual std::string nbyteBenchmarkLabel(void); ! public: ! BenchmarkNBENCH_ASSIGN(CBM::Package *_package); ! virtual ~BenchmarkNBENCH_ASSIGN(); ! }; ! /** \brief Defines the huffman benchmark within nbench package. ! */ ! class BenchmarkNBENCH_HUFFMAN : public BenchmarkNBENCH ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkNBENCHComments(void); ! virtual std::string nbyteBenchmark(void); ! virtual std::string nbyteBenchmarkLabel(void); ! public: ! BenchmarkNBENCH_HUFFMAN(CBM::Package *_package); ! virtual ~BenchmarkNBENCH_HUFFMAN(); ! }; ! /** \brief Defines the idea benchmark within nbench package. ! */ ! class BenchmarkNBENCH_IDEA : public BenchmarkNBENCH ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkNBENCHComments(void); ! virtual std::string nbyteBenchmark(void); ! virtual std::string nbyteBenchmarkLabel(void); ! public: ! BenchmarkNBENCH_IDEA(CBM::Package *_package); ! virtual ~BenchmarkNBENCH_IDEA(); ! }; ! /** \brief Defines the nnet benchmark within nbench package. ! */ ! class BenchmarkNBENCH_NNET : public BenchmarkNBENCH ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkNBENCHComments(void); ! virtual std::string nbyteBenchmark(void); ! virtual std::string nbyteBenchmarkLabel(void); ! public: ! BenchmarkNBENCH_NNET(CBM::Package *_package); ! virtual ~BenchmarkNBENCH_NNET(); ! }; ! /** \brief Defines the lu benchmark within nbench package. ! */ ! class BenchmarkNBENCH_LU : public BenchmarkNBENCH ! { ! protected: ! virtual std::string benchmarkName(void); ! virtual std::string benchmarkNBENCHComments(void); ! virtual std::string nbyteBenchmark(void); ! virtual std::string nbyteBenchmarkLabel(void); ! public: ! BenchmarkNBENCH_LU(CBM::Package *_package); ! virtual ~BenchmarkNBENCH_LU(); ! }; ! } DLdeclare(); Index: Benchmark-NBENCH.libwrapper.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-NBENCH.libwrapper.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Benchmark-NBENCH.libwrapper.h 15 Jan 2007 20:07:21 -0000 1.3 --- Benchmark-NBENCH.libwrapper.h 18 Jan 2007 18:44:36 -0000 1.4 *************** *** 2,10 **** #include <UI/UI.h> ! int CBMPackageNBENCH::benchmarkNumber(void) { return(10); } ! BenchmarkVector& CBMPackageNBENCH::Benchmarks(void) { if (benchmarks.size()) return(benchmarks); benchmarks.push_back("nbench-stringsort"); --- 2,12 ---- #include <UI/UI.h> ! using namespace CBM; ! ! int PackageNBENCH::benchmarkNumber(void) { return(10); } ! CBM::BenchmarkVector& PackageNBENCH::Benchmarks(void) { if (benchmarks.size()) return(benchmarks); benchmarks.push_back("nbench-stringsort"); *************** *** 21,64 **** } ! CBMBenchmark *CBMPackageNBENCH::Benchmark(std::string bid) { if (bid == "nbench-stringsort") { ! return(new CBMBenchmarkNBENCH_STRINGSORT(this)); } if (bid == "nbench-lu") { ! return(new CBMBenchmarkNBENCH_LU(this)); } if (bid == "nbench-assign") { ! return(new CBMBenchmarkNBENCH_ASSIGN(this)); } if (bid == "nbench-numsort") { ! return(new CBMBenchmarkNBENCH_NUMSORT(this)); } if (bid == "nbench-fourier") { ! return(new CBMBenchmarkNBENCH_FOURIER(this)); } if (bid == "nbench-bitfield") { ! return(new CBMBenchmarkNBENCH_BITFIELD(this)); } if (bid == "nbench-emf") { ! return(new CBMBenchmarkNBENCH_EMF(this)); } if (bid == "nbench-huffman") { ! return(new CBMBenchmarkNBENCH_HUFFMAN(this)); } if (bid == "nbench-nnet") { ! return(new CBMBenchmarkNBENCH_NNET(this)); } if (bid == "nbench-idea") { ! return(new CBMBenchmarkNBENCH_IDEA(this)); } ! UI->Fatal("Unknown benchmark"); return(0); } ! CBMPackage *package_NBENCH = 0; ! CBMPackage *cbmlib_getPackage(void) { if (!package_NBENCH) { ! package_NBENCH=new CBMPackageNBENCH(cbmSystem); ! cbmlib_packages.push_back(package_NBENCH); } return(package_NBENCH); --- 23,66 ---- } ! CBM::Benchmark *PackageNBENCH::Benchmark(std::string bid) { if (bid == "nbench-stringsort") { ! return(new CBM::BenchmarkNBENCH_STRINGSORT(this)); } if (bid == "nbench-lu") { ! return(new CBM::BenchmarkNBENCH_LU(this)); } if (bid == "nbench-assign") { ! return(new CBM::BenchmarkNBENCH_ASSIGN(this)); } if (bid == "nbench-numsort") { ! return(new CBM::BenchmarkNBENCH_NUMSORT(this)); } if (bid == "nbench-fourier") { ! return(new CBM::BenchmarkNBENCH_FOURIER(this)); } if (bid == "nbench-bitfield") { ! return(new CBM::BenchmarkNBENCH_BITFIELD(this)); } if (bid == "nbench-emf") { ! return(new CBM::BenchmarkNBENCH_EMF(this)); } if (bid == "nbench-huffman") { ! return(new CBM::BenchmarkNBENCH_HUFFMAN(this)); } if (bid == "nbench-nnet") { ! return(new CBM::BenchmarkNBENCH_NNET(this)); } if (bid == "nbench-idea") { ! return(new CBM::BenchmarkNBENCH_IDEA(this)); } ! CBM::cbmUI->Fatal("Unknown benchmark"); return(0); } ! CBM::Package *package_NBENCH = 0; ! CBM::Package *cbmlib_getPackage(void) { if (!package_NBENCH) { ! package_NBENCH=new PackageNBENCH(CBM::cbmSystem); ! CBM::cbmlib_packages.push_back(package_NBENCH); } return(package_NBENCH); Index: Benchmark-GZIP.libwrapper.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-GZIP.libwrapper.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Benchmark-GZIP.libwrapper.h 15 Jan 2007 20:07:20 -0000 1.3 --- Benchmark-GZIP.libwrapper.h 18 Jan 2007 18:44:36 -0000 1.4 *************** *** 2,10 **** #include <UI/UI.h> ! int CBMPackageGZIP::benchmarkNumber(void) { return(2); } ! BenchmarkVector& CBMPackageGZIP::Benchmarks(void) { if (benchmarks.size()) return(benchmarks); benchmarks.push_back("gzip-9c"); --- 2,12 ---- #include <UI/UI.h> ! using namespace CBM; ! ! int PackageGZIP::benchmarkNumber(void) { return(2); } ! CBM::BenchmarkVector& PackageGZIP::Benchmarks(void) { if (benchmarks.size()) return(benchmarks); benchmarks.push_back("gzip-9c"); *************** *** 13,32 **** } ! CBMBenchmark *CBMPackageGZIP::Benchmark(std::string bid) { if (bid == "gzip-9c") { ! return(new CBMBenchmarkGZIP9(this)); } if (bid == "gzip-1c") { ! return(new CBMBenchmarkGZIP1(this)); } ! UI->Fatal("Unknown benchmark"); return(0); } ! CBMPackage *package_GZIP = 0; ! CBMPackage *cbmlib_getPackage(void) { if (!package_GZIP) { ! package_GZIP=new CBMPackageGZIP(cbmSystem); ! cbmlib_packages.push_back(package_GZIP); } return(package_GZIP); --- 15,34 ---- } ! CBM::Benchmark *PackageGZIP::Benchmark(std::string bid) { if (bid == "gzip-9c") { ! return(new CBM::BenchmarkGZIP9(this)); } if (bid == "gzip-1c") { ! return(new CBM::BenchmarkGZIP1(this)); } ! CBM::cbmUI->Fatal("Unknown benchmark"); return(0); } ! CBM::Package *package_GZIP = 0; ! CBM::Package *cbmlib_getPackage(void) { if (!package_GZIP) { ! package_GZIP=new PackageGZIP(CBM::cbmSystem); ! CBM::cbmlib_packages.push_back(package_GZIP); } return(package_GZIP); Index: benchmarks-genlibwrapper.pl =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/benchmarks-genlibwrapper.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** benchmarks-genlibwrapper.pl 15 Jan 2007 20:07:21 -0000 1.2 --- benchmarks-genlibwrapper.pl 18 Jan 2007 18:44:36 -0000 1.3 *************** *** 31,42 **** print "#include <Benchmark/Benchmark-DLLoader.h>\n"; print "#include <UI/UI.h>\n\n"; my $n = (keys %{$DATA{$PACKAGE}})+0; ! print "int CBMPackage$PACKAGE\::benchmarkNumber(void) {\n"; print " return($n);\n}\n\n"; ! print "BenchmarkVector& CBMPackage$PACKAGE\::Benchmarks(void) {\n"; print " if (benchmarks.size()) return(benchmarks);\n"; foreach(keys %{$DATA{$PACKAGE}}) { --- 31,43 ---- print "#include <Benchmark/Benchmark-DLLoader.h>\n"; print "#include <UI/UI.h>\n\n"; + print "using namespace CBM;\n\n"; my $n = (keys %{$DATA{$PACKAGE}})+0; ! print "int Package$PACKAGE\::benchmarkNumber(void) {\n"; print " return($n);\n}\n\n"; ! print "CBM::BenchmarkVector& Package$PACKAGE\::Benchmarks(void) {\n"; print " if (benchmarks.size()) return(benchmarks);\n"; foreach(keys %{$DATA{$PACKAGE}}) { *************** *** 46,64 **** print "}\n\n"; ! print "CBMBenchmark *CBMPackage$PACKAGE\::Benchmark(std::string bid) {\n"; foreach(keys %{$DATA{$PACKAGE}}) { print " if (bid == \"$_\") {\n"; ! print " return(new CBMBenchmark$DATA{$PACKAGE}->{$_}(this));\n"; print " }\n"; } ! print " UI->Fatal(\"Unknown benchmark\");\n"; print " return(0);\n"; print "}\n\n"; ! print "CBMPackage *package_$PACKAGE = 0;\n"; ! print "CBMPackage *cbmlib_getPackage(void) {\n"; print " if (!package_$PACKAGE) {\n"; ! print " package_$PACKAGE=new CBMPackage$PACKAGE(cbmSystem);\n"; ! print " cbmlib_packages.push_back(package_$PACKAGE);\n"; print " }\n"; print " return(package_$PACKAGE);\n"; --- 47,65 ---- print "}\n\n"; ! print "CBM::Benchmark *Package$PACKAGE\::Benchmark(std::string bid) {\n"; foreach(keys %{$DATA{$PACKAGE}}) { print " if (bid == \"$_\") {\n"; ! print " return(new CBM::Benchmark$DATA{$PACKAGE}->{$_}(this));\n"; print " }\n"; } ! print " CBM::cbmUI->Fatal(\"Unknown benchmark\");\n"; print " return(0);\n"; print "}\n\n"; ! print "CBM::Package *package_$PACKAGE = 0;\n"; ! print "CBM::Package *cbmlib_getPackage(void) {\n"; print " if (!package_$PACKAGE) {\n"; ! print " package_$PACKAGE=new Package$PACKAGE(CBM::cbmSystem);\n"; ! print " CBM::cbmlib_packages.push_back(package_$PACKAGE);\n"; print " }\n"; print " return(package_$PACKAGE);\n"; Index: Benchmark-NBENCH.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-NBENCH.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Benchmark-NBENCH.cpp 3 Jan 2007 18:53:17 -0000 1.2 --- Benchmark-NBENCH.cpp 18 Jan 2007 18:44:36 -0000 1.3 *************** *** 7,61 **** #include <SupportedBenchmarks/Benchmark-NBENCH.libwrapper.h> ! CBMPackageNBENCH::CBMPackageNBENCH(CBMSystem *_system) ! : CBMPackage(_system) { } ! std::string CBMPackageNBENCH::downloadURL(void) { return("http://www.tux.org/~mayer/linux/nbench-byte-2.2.2.tar.gz"); } ! std::string CBMPackageNBENCH::expectedMD5(void) { return("174c1917eea8f74bd3e78522592e0658"); } ! std::string CBMPackageNBENCH::packageName(void) { return("nbench"); } ! std::string CBMPackageNBENCH::packageVersion(void) { return("2.2.2"); } ! int CBMPackageNBENCH::packageSize(void) { return(111751); } ! std::string CBMPackageNBENCH::packageComments(void) { return("Uwe F. Mayer's UNIX port of BYTE Magazine's BYTEmark benchmark program"); } ! std::string CBMPackageNBENCH::localPackageName(void) { return("nbench-byte-2.2.2.tar.gz"); } ! std::string CBMPackageNBENCH::language(void) { return("C"); } ! char* CBMPackageNBENCH::extractDirectory(void) { return("nbench-byte-2.2.2"); } ! int CBMPackageNBENCH::extract(int _force) { std::string localFile = localPackageAbsoluteName(); --- 7,63 ---- #include <SupportedBenchmarks/Benchmark-NBENCH.libwrapper.h> ! using namespace CBM; ! ! PackageNBENCH::PackageNBENCH(CBM::System *_system) ! : Package(_system) { } ! std::string PackageNBENCH::downloadURL(void) { return("http://www.tux.org/~mayer/linux/nbench-byte-2.2.2.tar.gz"); } ! std::string PackageNBENCH::expectedMD5(void) { return("174c1917eea8f74bd3e78522592e0658"); } ! std::string PackageNBENCH::packageName(void) { return("nbench"); } ! std::string PackageNBENCH::packageVersion(void) { return("2.2.2"); } ! int PackageNBENCH::packageSize(void) { return(111751); } ! std::string PackageNBENCH::packageComments(void) { return("Uwe F. Mayer's UNIX port of BYTE Magazine's BYTEmark benchmark program"); } ! std::string PackageNBENCH::localPackageName(void) { return("nbench-byte-2.2.2.tar.gz"); } ! std::string PackageNBENCH::language(void) { return("C"); } ! char* PackageNBENCH::extractDirectory(void) { return("nbench-byte-2.2.2"); } ! int PackageNBENCH::extract(int _force) { std::string localFile = localPackageAbsoluteName(); *************** *** 64,68 **** cmd+="cd "; ! cmd+=system->temporaryDirectory(CBMSystem::Extract); cmd+=" && "; cmd+=CBM_PROG_ZCAT; --- 66,70 ---- cmd+="cd "; ! cmd+=system->temporaryDirectory(CBM::System::Extract); cmd+=" && "; cmd+=CBM_PROG_ZCAT; *************** *** 76,80 **** } ! int CBMPackageNBENCH::preConfigure(int _force) { /* !!! */ --- 78,82 ---- } ! int PackageNBENCH::preConfigure(int _force) { /* !!! */ *************** *** 82,92 **** } ! int CBMPackageNBENCH::configure(CBMCompiler *_currentCompiler, ! CBMCompilerOptions *_currentOptions) { return(1); } ! int CBMPackageNBENCH::make(void) { std::string cmd; --- 84,94 ---- } ! int PackageNBENCH::configure(CBM::Compiler *_currentCompiler, ! CBM::CompilerOptions *_currentOptions) { return(1); } ! int PackageNBENCH::make(void) { std::string cmd; *************** *** 126,130 **** } ! int CBMPackageNBENCH::release(void) { std::string cmd; --- 128,132 ---- } ! int PackageNBENCH::release(void) { std::string cmd; *************** *** 140,173 **** } ! std::string CBMPackageNBENCH::license(void) { return("Not specified"); } ! std::string CBMPackageNBENCH::homePage(void) { return("http://www.tux.org/~mayer/linux/bmark.html"); } ! std::string CBMPackageNBENCH::author(void) { return("Uwe F. Mayer"); } ! int CBMPackageNBENCH::benchmarkSize(void) { return(packageSize()); } ! CBMPackageNBENCH::~CBMPackageNBENCH() { } ! CBMBenchmarkNBENCH::CBMBenchmarkNBENCH(CBMPackage *_package) ! : CBMBenchmark(_package) { } ! int CBMBenchmarkNBENCH::nbyteWriteDatFile(void) { std::ofstream OUT; --- 142,175 ---- } ! std::string PackageNBENCH::license(void) { return("Not specified"); } ! std::string PackageNBENCH::homePage(void) { return("http://www.tux.org/~mayer/linux/bmark.html"); } ! std::string PackageNBENCH::author(void) { return("Uwe F. Mayer"); } ! int PackageNBENCH::benchmarkSize(void) { return(packageSize()); } ! PackageNBENCH::~PackageNBENCH() { } ! BenchmarkNBENCH::BenchmarkNBENCH(CBM::Package *_package) ! : Benchmark(_package) { } ! int BenchmarkNBENCH::nbyteWriteDatFile(void) { std::ofstream OUT; *************** *** 188,192 **** } ! std::string CBMBenchmarkNBENCH::benchmarkComments(void) { std::string comment; --- 190,194 ---- } ! std::string BenchmarkNBENCH::benchmarkComments(void) { std::string comment; *************** *** 198,202 **** } ! std::string CBMBenchmarkNBENCH::bench(void) { std::string cmd; --- 200,204 ---- } ! std::string BenchmarkNBENCH::bench(void) { std::string cmd; *************** *** 221,249 **** } ! CBMBenchmarkNBENCH::~CBMBenchmarkNBENCH() { } ! CBMBenchmarkNBENCH_NUMSORT::CBMBenchmarkNBENCH_NUMSORT(CBMPackage *_package) ! : CBMBenchmarkNBENCH(_package) { } ! std::string CBMBenchmarkNBENCH_NUMSORT::nbyteBenchmark(void) { return("DONUMSORT"); } ! std::string CBMBenchmarkNBENCH_NUMSORT::benchmarkName(void) { return("nbench-numsort"); } ! std::string CBMBenchmarkNBENCH_NUMSORT::nbyteBenchmarkLabel(void) { return("NUMERIC SORT"); } ! std::string CBMBenchmarkNBENCH_NUMSORT::benchmarkNBENCHComments(void) { return("Generic integer performance. Should " \ --- 223,251 ---- } ! BenchmarkNBENCH::~BenchmarkNBENCH() { } ! BenchmarkNBENCH_NUMSORT::BenchmarkNBENCH_NUMSORT(CBM::Package *_package) ! : BenchmarkNBENCH(_package) { } ! std::string BenchmarkNBENCH_NUMSORT::nbyteBenchmark(void) { return("DONUMSORT"); } ! std::string BenchmarkNBENCH_NUMSORT::benchmarkName(void) { return("nbench-numsort"); } ! std::string BenchmarkNBENCH_NUMSORT::nbyteBenchmarkLabel(void) { return("NUMERIC SORT"); } ! std::string BenchmarkNBENCH_NUMSORT::benchmarkNBENCHComments(void) { return("Generic integer performance. Should " \ *************** *** 254,282 **** } ! CBMBenchmarkNBENCH_NUMSORT::~CBMBenchmarkNBENCH_NUMSORT() { } ! CBMBenchmarkNBENCH_STRINGSORT::CBMBenchmarkNBENCH_STRINGSORT(CBMPackage *_package) ! : CBMBenchmarkNBENCH(_package) { } ! std::string CBMBenchmarkNBENCH_STRINGSORT::nbyteBenchmark(void) { return("DOSTRINGSORT"); } ! std::string CBMBenchmarkNBENCH_STRINGSORT::benchmarkName(void) { return("nbench-stringsort"); } ! std::string CBMBenchmarkNBENCH_STRINGSORT::nbyteBenchmarkLabel(void) { return("STRING SORT"); } ! std::string CBMBenchmarkNBENCH_STRINGSORT::benchmarkNBENCHComments(void) { return("Tests memory-move performance. " \ --- 256,284 ---- } ! BenchmarkNBENCH_NUMSORT::~BenchmarkNBENCH_NUMSORT() { } ! BenchmarkNBENCH_STRINGSORT::BenchmarkNBENCH_STRINGSORT(CBM::Package *_package) ! : BenchmarkNBENCH(_package) { } ! std::string BenchmarkNBENCH_STRINGSORT::nbyteBenchmark(void) { return("DOSTRINGSORT"); } ! std::string BenchmarkNBENCH_STRINGSORT::benchmarkName(void) { return("nbench-stringsort"); } ! std::string BenchmarkNBENCH_STRINGSORT::nbyteBenchmarkLabel(void) { return("STRING SORT"); } ! std::string BenchmarkNBENCH_STRINGSORT::benchmarkNBENCHComments(void) { return("Tests memory-move performance. " \ *************** *** 291,319 **** } ! CBMBenchmarkNBENCH_STRINGSORT::~CBMBenchmarkNBENCH_STRINGSORT() { } ! CBMBenchmarkNBENCH_BITFIELD::CBMBenchmarkNBENCH_BITFIELD(CBMPackage *_package) ! : CBMBenchmarkNBENCH(_package) { } ! std::string CBMBenchmarkNBENCH_BITFIELD::nbyteBenchmark(void) { return("DOBITFIELD"); } ! std::string CBMBenchmarkNBENCH_BITFIELD::benchmarkName(void) { return("nbench-bitfield"); } ! std::string CBMBenchmarkNBENCH_BITFIELD::nbyteBenchmarkLabel(void) { return("BITFIELD"); } ! std::string CBMBenchmarkNBENCH_BITFIELD::benchmarkNBENCHComments(void) { return("Exercises \"bit twiddling\" performance. " \ --- 293,321 ---- } ! BenchmarkNBENCH_STRINGSORT::~BenchmarkNBENCH_STRINGSORT() { } ! BenchmarkNBENCH_BITFIELD::BenchmarkNBENCH_BITFIELD(CBM::Package *_package) ! : BenchmarkNBENCH(_package) { } ! std::string BenchmarkNBENCH_BITFIELD::nbyteBenchmark(void) { return("DOBITFIELD"); } ! std::string BenchmarkNBENCH_BITFIELD::benchmarkName(void) { return("nbench-bitfield"); } ! std::string BenchmarkNBENCH_BITFIELD::nbyteBenchmarkLabel(void) { return("BITFIELD"); } ! std::string BenchmarkNBENCH_BITFIELD::benchmarkNBENCHComments(void) { return("Exercises \"bit twiddling\" performance. " \ *************** *** 327,355 **** } ! CBMBenchmarkNBENCH_BITFIELD::~CBMBenchmarkNBENCH_BITFIELD() { } ! CBMBenchmarkNBENCH_EMF::CBMBenchmarkNBENCH_EMF(CBMPackage *_package) ! : CBMBenchmarkNBENCH(_package) { } ! std::string CBMBenchmarkNBENCH_EMF::nbyteBenchmark(void) { return("DOEMF"); } ! std::string CBMBenchmarkNBENCH_EMF::benchmarkName(void) { return("nbench-emf"); } ! std::string CBMBenchmarkNBENCH_EMF::nbyteBenchmarkLabel(void) { return("FP EMULATION"); } ! std::string CBMBenchmarkNBENCH_EMF::benchmarkNBENCHComments(void) { return("Past experience has shown this test " \ --- 329,357 ---- } ! BenchmarkNBENCH_BITFIELD::~BenchmarkNBENCH_BITFIELD() { } ! BenchmarkNBENCH_EMF::BenchmarkNBENCH_EMF(CBM::Package *_package) ! : BenchmarkNBENCH(_package) { } ! std::string BenchmarkNBENCH_EMF::nbyteBenchmark(void) { return("DOEMF"); } ! std::string BenchmarkNBENCH_EMF::benchmarkName(void) { return("nbench-emf"); } ! std::string BenchmarkNBENCH_EMF::nbyteBenchmarkLabel(void) { return("FP EMULATION"); } ! std::string BenchmarkNBENCH_EMF::benchmarkNBENCHComments(void) { return("Past experience has shown this test " \ *************** *** 358,386 **** } ! CBMBenchmarkNBENCH_EMF::~CBMBenchmarkNBENCH_EMF() { } ! CBMBenchmarkNBENCH_FOURIER::CBMBenchmarkNBENCH_FOURIER(CBMPackage *_package) ! : CBMBenchmarkNBENCH(_package) { } ! std::string CBMBenchmarkNBENCH_FOURIER::nbyteBenchmark(void) { return("DOFOUR"); } ! std::string CBMBenchmarkNBENCH_FOURIER::benchmarkName(void) { return("nbench-fourier"); } ! std::string CBMBenchmarkNBENCH_FOURIER::nbyteBenchmarkLabel(void) { return("FOURIER"); } ! std::string CBMBenchmarkNBENCH_FOURIER::benchmarkNBENCHComments(void) { return("Good measure of transcendental and " \ --- 360,388 ---- } ! BenchmarkNBENCH_EMF::~BenchmarkNBENCH_EMF() { } ! BenchmarkNBENCH_FOURIER::BenchmarkNBENCH_FOURIER(CBM::Package *_package) ! : BenchmarkNBENCH(_package) { } ! std::string BenchmarkNBENCH_FOURIER::nbyteBenchmark(void) { return("DOFOUR"); } ! std::string BenchmarkNBENCH_FOURIER::benchmarkName(void) { return("nbench-fourier"); } ! std::string BenchmarkNBENCH_FOURIER::nbyteBenchmarkLabel(void) { return("FOURIER"); } ! std::string BenchmarkNBENCH_FOURIER::benchmarkNBENCHComments(void) { return("Good measure of transcendental and " \ *************** *** 391,420 **** } ! CBMBenchmarkNBENCH_FOURIER::~CBMBenchmarkNBENCH_FOURIER() { } ! CBMBenchmarkNBENCH_ASSIGN::CBMBenchmarkNBENCH_ASSIGN(CBMPackage *_package) ! : CBMBenchmarkNBENCH(_package) { } ! std::string CBMBenchmarkNBENCH_ASSIGN::nbyteBenchmark(void) { return("DOASSIGN"); } ! std::string CBMBenchmarkNBENCH_ASSIGN::benchmarkName(void) { return("nbench-assign"); } ! std::string CBMBenchmarkNBENCH_ASSIGN::nbyteBenchmarkLabel(void) { return("ASSIGNMENT"); } ! std::string CBMBenchmarkNBENCH_ASSIGN::benchmarkNBENCHComments(void) { return("The test moves through large integer " \ --- 393,422 ---- } ! BenchmarkNBENCH_FOURIER::~BenchmarkNBENCH_FOURIER() { } ! BenchmarkNBENCH_ASSIGN::BenchmarkNBENCH_ASSIGN(CBM::Package *_package) ! : BenchmarkNBENCH(_package) { } ! std::string BenchmarkNBENCH_ASSIGN::nbyteBenchmark(void) { return("DOASSIGN"); } ! std::string BenchmarkNBENCH_ASSIGN::benchmarkName(void) { return("nbench-assign"); } ! std::string BenchmarkNBENCH_ASSIGN::nbyteBenchmarkLabel(void) { return("ASSIGNMENT"); } ! std::string BenchmarkNBENCH_ASSIGN::benchmarkNBENCHComments(void) { return("The test moves through large integer " \ *************** *** 430,458 **** } ! CBMBenchmarkNBENCH_ASSIGN::~CBMBenchmarkNBENCH_ASSIGN() { } ! CBMBenchmarkNBENCH_HUFFMAN::CBMBenchmarkNBENCH_HUFFMAN(CBMPackage *_package) ! : CBMBenchmarkNBENCH(_package) { } ! std::string CBMBenchmarkNBENCH_HUFFMAN::nbyteBenchmark(void) { return("DOHUFF"); } ! std::string CBMBenchmarkNBENCH_HUFFMAN::benchmarkName(void) { return("nbench-huffman"); } ! std::string CBMBenchmarkNBENCH_HUFFMAN::nbyteBenchmarkLabel(void) { return("HUFFMAN"); } ! std::string CBMBenchmarkNBENCH_HUFFMAN::benchmarkNBENCHComments(void) { return("A combination of byte operations, " \ --- 432,460 ---- } ! BenchmarkNBENCH_ASSIGN::~BenchmarkNBENCH_ASSIGN() { } ! BenchmarkNBENCH_HUFFMAN::BenchmarkNBENCH_HUFFMAN(CBM::Package *_package) ! : BenchmarkNBENCH(_package) { } ! std::string BenchmarkNBENCH_HUFFMAN::nbyteBenchmark(void) { return("DOHUFF"); } ! std::string BenchmarkNBENCH_HUFFMAN::benchmarkName(void) { return("nbench-huffman"); } ! std::string BenchmarkNBENCH_HUFFMAN::nbyteBenchmarkLabel(void) { return("HUFFMAN"); } ! std::string BenchmarkNBENCH_HUFFMAN::benchmarkNBENCHComments(void) { return("A combination of byte operations, " \ *************** *** 462,490 **** } ! CBMBenchmarkNBENCH_HUFFMAN::~CBMBenchmarkNBENCH_HUFFMAN() { } ! CBMBenchmarkNBENCH_IDEA::CBMBenchmarkNBENCH_IDEA(CBMPackage *_package) ! : CBMBenchmarkNBENCH(_package) { } ! std::string CBMBenchmarkNBENCH_IDEA::nbyteBenchmark(void) { return("DOIDEA"); } ! std::string CBMBenchmarkNBENCH_IDEA::benchmarkName(void) { return("nbench-idea"); } ! std::string CBMBenchmarkNBENCH_IDEA::nbyteBenchmarkLabel(void) { return("IDEA"); } ! std::string CBMBenchmarkNBENCH_IDEA::benchmarkNBENCHComments(void) { return("Moves through data sequentally in " \ --- 464,492 ---- } ! BenchmarkNBENCH_HUFFMAN::~BenchmarkNBENCH_HUFFMAN() { } ! BenchmarkNBENCH_IDEA::BenchmarkNBENCH_IDEA(CBM::Package *_package) ! : BenchmarkNBENCH(_package) { } ! std::string BenchmarkNBENCH_IDEA::nbyteBenchmark(void) { return("DOIDEA"); } ! std::string BenchmarkNBENCH_IDEA::benchmarkName(void) { return("nbench-idea"); } ! std::string BenchmarkNBENCH_IDEA::nbyteBenchmarkLabel(void) { return("IDEA"); } ! std::string BenchmarkNBENCH_IDEA::benchmarkNBENCHComments(void) { return("Moves through data sequentally in " \ *************** *** 493,521 **** } ! CBMBenchmarkNBENCH_IDEA::~CBMBenchmarkNBENCH_IDEA() { } ! CBMBenchmarkNBENCH_NNET::CBMBenchmarkNBENCH_NNET(CBMPackage *_package) ! : CBMBenchmarkNBENCH(_package) { } ! std::string CBMBenchmarkNBENCH_NNET::nbyteBenchmark(void) { return("DONNET"); } ! std::string CBMBenchmarkNBENCH_NNET::benchmarkName(void) { return("nbench-nnet"); } ! std::string CBMBenchmarkNBENCH_NNET::nbyteBenchmarkLabel(void) { return("NEURAL NET"); } ! std::string CBMBenchmarkNBENCH_NNET::benchmarkNBENCHComments(void) { return("Small-array floating-point test " \ --- 495,523 ---- } ! BenchmarkNBENCH_IDEA::~BenchmarkNBENCH_IDEA() { } ! BenchmarkNBENCH_NNET::BenchmarkNBENCH_NNET(CBM::Package *_package) ! : BenchmarkNBENCH(_package) { } ! std::string BenchmarkNBENCH_NNET::nbyteBenchmark(void) { return("DONNET"); } ! std::string BenchmarkNBENCH_NNET::benchmarkName(void) { return("nbench-nnet"); } ! std::string BenchmarkNBENCH_NNET::nbyteBenchmarkLabel(void) { return("NEURAL NET"); } ! std::string BenchmarkNBENCH_NNET::benchmarkNBENCHComments(void) { return("Small-array floating-point test " \ *************** *** 527,555 **** } ! CBMBenchmarkNBENCH_NNET::~CBMBenchmarkNBENCH_NNET() { } ! CBMBenchmarkNBENCH_LU::CBMBenchmarkNBENCH_LU(CBMPackage *_package) ! : CBMBenchmarkNBENCH(_package) { } ! std::string CBMBenchmarkNBENCH_LU::nbyteBenchmark(void) { return("DOLU"); } ! std::string CBMBenchmarkNBENCH_LU::benchmarkName(void) { return("nbench-lu"); } ! std::string CBMBenchmarkNBENCH_LU::nbyteBenchmarkLabel(void) { return("LU DECOMPOSITION"); } ! std::string CBMBenchmarkNBENCH_LU::benchmarkNBENCHComments(void) { return("A floating-point test that moves " \ --- 529,557 ---- } ! BenchmarkNBENCH_NNET::~BenchmarkNBENCH_NNET() { } ! BenchmarkNBENCH_LU::BenchmarkNBENCH_LU(CBM::Package *_package) ! : BenchmarkNBENCH(_package) { } ! std::string BenchmarkNBENCH_LU::nbyteBenchmark(void) { return("DOLU"); } ! std::string BenchmarkNBENCH_LU::benchmarkName(void) { return("nbench-lu"); } ! std::string BenchmarkNBENCH_LU::nbyteBenchmarkLabel(void) { return("LU DECOMPOSITION"); } ! std::string BenchmarkNBENCH_LU::benchmarkNBENCHComments(void) { return("A floating-point test that moves " \ *************** *** 560,564 **** } ! CBMBenchmarkNBENCH_LU::~CBMBenchmarkNBENCH_LU() { } --- 562,566 ---- } ! BenchmarkNBENCH_LU::~BenchmarkNBENCH_LU() { } Index: Benchmark-GZIP.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-GZIP.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Benchmark-GZIP.cpp 3 Jan 2007 22:06:26 -0000 1.4 --- Benchmark-GZIP.cpp 18 Jan 2007 18:44:36 -0000 1.5 *************** *** 7,62 **** #include <SupportedBenchmarks/Benchmark-GZIP.libwrapper.h> ! CBMPackageGZIP::CBMPackageGZIP(CBMSystem *_system) ! : CBMPackagexZIP(_system) { } ! std::string CBMPackageGZIP::downloadURL(void) { return("ftp://ftp.netscape.com/pub/unsupported/gnu/gzip-1.2.4.tar.Z"); } ! std::string CBMPackageGZIP::expectedMD5(void) { return("bfc104a6eaf1704be524c879bc9d29bc"); } ! std::string CBMPackageGZIP::packageName(void) { return("gzip"); } ! std::string CBMPackageGZIP::packageVersion(void) { return("1.2.4"); } ! int CBMPackageGZIP::packageSize(void) { return(327865); } ! std::string CBMPackageGZIP::packageComments(void) { return("Official gzip-1.2.4 source package."); } ! std::string CBMPackageGZIP::localPackageName(void) { return("gzip-1.2.4.tar.Z"); } ! std::string CBMPackageGZIP::language(void) { return("C"); } ! int CBMPackageGZIP::hasTest(void) { return(1); } ! int CBMPackageGZIP::test(void) { std::string cmd; --- 7,66 ---- #include <SupportedBenchmarks/Benchmark-GZIP.libwrapper.h> + #include <Benchmark/Benchmark-DLLoader.h> + #include <UI/UI.h> ! using namespace CBM; ! ! PackageGZIP::PackageGZIP(CBM::System *_system) ! : PackagexZIP(_system) { } ! std::string PackageGZIP::downloadURL(void) { return("ftp://ftp.netscape.com/pub/unsupported/gnu/gzip-1.2.4.tar.Z"); } ! std::string PackageGZIP::expectedMD5(void) { return("bfc104a6eaf1704be524c879bc9d29bc"); } ! std::string PackageGZIP::packageName(void) { return("gzip"); } ! std::string PackageGZIP::packageVersion(void) { return("1.2.4"); } ! int PackageGZIP::packageSize(void) { return(327865); } ! std::string PackageGZIP::packageComments(void) { return("Official gzip-1.2.4 source package."); } ! std::string PackageGZIP::localPackageName(void) { return("gzip-1.2.4.tar.Z"); } ! std::string PackageGZIP::language(void) { return("C"); } ! int PackageGZIP::hasTest(void) { return(1); } ! int PackageGZIP::test(void) { std::string cmd; *************** *** 72,163 **** } ! char* CBMPackageGZIP::extractDirectory(void) { return("gzip-1.2.4"); } ! std::string CBMPackageGZIP::license(void) { return("GPL v2"); } ! std::string CBMPackageGZIP::homePage(void) { return("http://www.gzip.org"); } ! std::string CBMPackageGZIP::author(void) { return("Jean-loup Gailly & Mark Adler"); } ! int CBMPackageGZIP::benchmarkSize(void) { return(76546048); } ! CBMPackageGZIP::~CBMPackageGZIP() { } ! CBMBenchmarkGZIP::CBMBenchmarkGZIP(CBMPackage *_package) ! : CBMBenchmarkxZIP(_package) { } ! std::string CBMBenchmarkGZIP::benchmarkProgram(void) { return("gzip"); } ! CBMBenchmarkGZIP::~CBMBenchmarkGZIP() { } ! CBMBenchmarkGZIP1::CBMBenchmarkGZIP1(CBMPackage *_package) ! : CBMBenchmarkGZIP(_package) { } ! std::string CBMBenchmarkGZIP1::benchmarkName(void) { return("gzip-1c"); } ! char* CBMBenchmarkGZIP1::compressionLevel(void) { return("1"); } ! std::string CBMBenchmarkGZIP1::benchmarkComments(void) { return("Uses generated gzip binary with fastest compression"); } ! CBMBenchmarkGZIP1::~CBMBenchmarkGZIP1() { } ! CBMBenchmarkGZIP9::CBMBenchmarkGZIP9(CBMPackage *_package) ! : CBMBenchmarkGZIP(_package) { } ! std::string CBMBenchmarkGZIP9::benchmarkName(void) { return("gzip-9c"); } ! char* CBMBenchmarkGZIP9::compressionLevel(void) { return("9"); } ! std::string CBMBenchmarkGZIP9::benchmarkComments(void) { return("Uses generated gzip binary with maximum compression"); } ! CBMBenchmarkGZIP9::~CBMBenchmarkGZIP9() { } --- 76,167 ---- } ! char* PackageGZIP::extractDirectory(void) { return("gzip-1.2.4"); } ! std::string PackageGZIP::license(void) { return("GPL v2"); } ! std::string PackageGZIP::homePage(void) { return("http://www.gzip.org"); } ! std::string PackageGZIP::author(void) { return("Jean-loup Gailly & Mark Adler"); } ! int PackageGZIP::benchmarkSize(void) { return(76546048); } ! PackageGZIP::~PackageGZIP() { } ! BenchmarkGZIP::BenchmarkGZIP(CBM::Package *_package) ! : BenchmarkxZIP(_package) { } ! std::string BenchmarkGZIP::benchmarkProgram(void) { return("gzip"); } ! BenchmarkGZIP::~BenchmarkGZIP() { } ! BenchmarkGZIP1::BenchmarkGZIP1(CBM::Package *_package) ! : BenchmarkGZIP(_package) { } ! std::string BenchmarkGZIP1::benchmarkName(void) { return("gzip-1c"); } ! char* BenchmarkGZIP1::compressionLevel(void) { return("1"); } ! std::string BenchmarkGZIP1::benchmarkComments(void) { return("Uses generated gzip binary with fastest compression"); } ! BenchmarkGZIP1::~BenchmarkGZIP1() { } ! BenchmarkGZIP9::BenchmarkGZIP9(CBM::Package *_package) ! : BenchmarkGZIP(_package) { } ! std::string BenchmarkGZIP9::benchmarkName(void) { return("gzip-9c"); } ! char* BenchmarkGZIP9::compressionLevel(void) { return("9"); } ! std::string BenchmarkGZIP9::benchmarkComments(void) { return("Uses generated gzip binary with maximum compression"); } ! BenchmarkGZIP9::~BenchmarkGZIP9() { } Index: Benchmark-BZIP2.libwrapper.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BZIP2.libwrapper.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Benchmark-BZIP2.libwrapper.h 15 Jan 2007 20:07:20 -0000 1.3 --- Benchmark-BZIP2.libwrapper.h 18 Jan 2007 18:44:36 -0000 1.4 *************** *** 2,10 **** #include <UI/UI.h> ! int CBMPackageBZIP2::benchmarkNumber(void) { return(2); } ! BenchmarkVector& CBMPackageBZIP2::Benchmarks(void) { if (benchmarks.size()) return(benchmarks); benchmarks.push_back("bzip2-1c"); --- 2,12 ---- #include <UI/UI.h> ! using namespace CBM; ! ! int PackageBZIP2::benchmarkNumber(void) { return(2); } ! CBM::BenchmarkVector& PackageBZIP2::Benchmarks(void) { if (benchmarks.size()) return(benchmarks); benchmarks.push_back("bzip2-1c"); *************** *** 13,32 **** } ! CBMBenchmark *CBMPackageBZIP2::Benchmark(std::string bid) { if (bid == "bzip2-1c") { ! return(new CBMBenchmarkBZIP21(this)); } if (bid == "bzip2-9c") { ! return(new CBMBenchmarkBZIP29(this)); } ! UI->Fatal("Unknown benchmark"); return(0); } ! CBMPackage *package_BZIP2 = 0; ! CBMPackage *cbmlib_getPackage(void) { if (!package_BZIP2) { ! package_BZIP2=new CBMPackageBZIP2(cbmSystem); ! cbmlib_packages.push_back(package_BZIP2); } return(package_BZIP2); --- 15,34 ---- } ! CBM::Benchmark *PackageBZIP2::Benchmark(std::string bid) { if (bid == "bzip2-1c") { ! return(new CBM::BenchmarkBZIP21(this)); } if (bid == "bzip2-9c") { ! return(new CBM::BenchmarkBZIP29(this)); } ! CBM::cbmUI->Fatal("Unknown benchmark"); return(0); } ! CBM::Package *package_BZIP2 = 0; ! CBM::Package *cbmlib_getPackage(void) { if (!package_BZIP2) { ! package_BZIP2=new PackageBZIP2(CBM::cbmSystem); ! CBM::cbmlib_packages.push_back(package_BZIP2); } return(package_BZIP2); Index: Benchmark-BZIP2.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BZIP2.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Benchmark-BZIP2.cpp 3 Jan 2007 22:06:26 -0000 1.4 --- Benchmark-BZIP2.cpp 18 Jan 2007 18:44:36 -0000 1.5 *************** *** 6,64 **** #include <fstream> - #include <SupportedBenchmarks/Benchmark-BZIP2.libwrapper.h> ! CBMPackageBZIP2::CBMPackageBZIP2(CBMSystem *_system) ! : CBMPackagexZIP(_system) { } ! std::string CBMPackageBZIP2::downloadURL(void) { return("http://www.bzip.org/1.0.3/bzip2-1.0.3.tar.gz"); } ! std::string CBMPackageBZIP2::expectedMD5(void) { return("8a716bebecb6e647d2e8a29ea5d8447f"); } ! std::string CBMPackageBZIP2::packageName(void) { return("bzip2"); } ! std::string CBMPackageBZIP2::packageVersion(void) { return("1.0.3"); } ! int CBMPackageBZIP2::packageSize(void) { return(669075); } ! std::string CBMPackageBZIP2::packageComments(void) { return("Official bzip2-1.0.3 source package."); } ! std::string CBMPackageBZIP2::localPackageName(void) { return("bzip2-1.0.3.tar.Z"); } ! std::string CBMPackageBZIP2::language(void) { return("C"); } ! int CBMPackageBZIP2::configure(CBMCompiler *_currentCompiler, ! CBMCompilerOptions *_currentOptions) { return(1); } ! int CBMPackageBZIP2::make(void) { std::string cmd; --- 6,65 ---- #include <fstream> #include <SupportedBenchmarks/Benchmark-BZIP2.libwrapper.h> ! using namespace CBM; ! ! PackageBZIP2::PackageBZIP2(CBM::System *_system) ! : PackagexZIP(_system) { } ! std::string PackageBZIP2::downloadURL(void) { return("http://www.bzip.org/1.0.3/bzip2-1.0.3.tar.gz"); } ! std::string PackageBZIP2::expectedMD5(void) { return("8a716bebecb6e647d2e8a29ea5d8447f"); } ! std::string PackageBZIP2::packageName(void) { return("bzip2"); } ! std::string PackageBZIP2::packageVersion(void) { return("1.0.3"); } ! int PackageBZIP2::packageSize(void) { return(669075); } ! std::string PackageBZIP2::packageComments(void) { return("Official bzip2-1.0.3 source package."); } ! std::string PackageBZIP2::localPackageName(void) { return("bzip2-1.0.3.tar.Z"); } ! std::string PackageBZIP2::language(void) { return("C"); } ! int PackageBZIP2::configure(Compiler *_currentCompiler, ! CompilerOptions *_currentOptions) { return(1); } ! int PackageBZIP2::make(void) { std::string cmd; *************** *** 98,107 **** } ! int CBMPackageBZIP2::hasTest(void) { return(1); } ! int CBMPackageBZIP2::test(void) { std::string cmd; --- 99,108 ---- } ! int PackageBZIP2::hasTest(void) { return(1); } ! int PackageBZIP2::test(void) { std::string cmd; *************** *** 117,208 **** } ! char* CBMPackageBZIP2::extractDirectory(void) { return("bzip2-1.0.3"); } ! std::string CBMPackageBZIP2::license(void) { return("BSD-style"); } ! std::string CBMPackageBZIP2::homePage(void) { return("http://www.bzip.org"); } ! std::string CBMPackageBZIP2::author(void) { return("Julian Seward"); } ! int CBMPackageBZIP2::benchmarkSize(void) { return(76546048); } ! CBMPackageBZIP2::~CBMPackageBZIP2() { } ! CBMBenchmarkBZIP2::CBMBenchmarkBZIP2(CBMPackage *_package) ! : CBMBenchmarkxZIP(_package) { } ! std::string CBMBenchmarkBZIP2::benchmarkProgram(void) { return("bzip2"); } ! CBMBenchmarkBZIP2::~CBMBenchmarkBZIP2() { } ! CBMBenchmarkBZIP21::CBMBenchmarkBZIP21(CBMPackage *_package) ! : CBMBenchmarkBZIP2(_package) { } ! std::string CBMBenchmarkBZIP21::benchmarkName(void) { return("bzip2-1c"); } ! char* CBMBenchmarkBZIP21::compressionLevel(void) { return("1"); } ! std::string CBMBenchmarkBZIP21::benchmarkComments(void) { return("Uses generated bzip2 binary with fastest compression"); } ! CBMBenchmarkBZIP21::~CBMBenchmarkBZIP21() { } ! CBMBenchmarkBZIP29::CBMBenchmarkBZIP29(CBMPackage *_package) ! : CBMBenchmarkBZIP2(_package) { } ! std::string CBMBenchmarkBZIP29::benchmarkName(void) { return("bzip2-9c"); } ! char* CBMBenchmarkBZIP29::compressionLevel(void) { return("9"); } ! std::string CBMBenchmarkBZIP29::benchmarkComments(void) { return("Uses generated bzip2 binary with maximum compression"); } ! CBMBenchmarkBZIP29::~CBMBenchmarkBZIP29() { } --- 118,209 ---- } ! char* PackageBZIP2::extractDirectory(void) { return("bzip2-1.0.3"); } ! std::string PackageBZIP2::license(void) { return("BSD-style"); } ! std::string PackageBZIP2::homePage(void) { return("http://www.bzip.org"); } ! std::string PackageBZIP2::author(void) { return("Julian Seward"); } ! int PackageBZIP2::benchmarkSize(void) { return(76546048); } ! PackageBZIP2::~PackageBZIP2() { } ! BenchmarkBZIP2::BenchmarkBZIP2(CBM::Package *_package) ! : BenchmarkxZIP(_package) { } ! std::string BenchmarkBZIP2::benchmarkProgram(void) { return("bzip2"); } ! BenchmarkBZIP2::~BenchmarkBZIP2() { } ! BenchmarkBZIP21::BenchmarkBZIP21(CBM::Package *_package) ! : BenchmarkBZIP2(_package) { } ! std::string BenchmarkBZIP21::benchmarkName(void) { return("bzip2-1c"); } ! char* BenchmarkBZIP21::compressionLevel(void) { return("1"); } ! std::string BenchmarkBZIP21::benchmarkComments(void) { return("Uses generated bzip2 binary with fastest compression"); } ! BenchmarkBZIP21::~BenchmarkBZIP21() { } ! BenchmarkBZIP29::BenchmarkBZIP29(CBM::Package *_package) ! : BenchmarkBZIP2(_package) { } ! std::string BenchmarkBZIP29::benchmarkName(void) { return("bzip2-9c"); } ! char* BenchmarkBZIP29::compressionLevel(void) { return("9"); } ! std::string BenchmarkBZIP29::benchmarkComments(void) { return("Uses generated bzip2 binary with maximum compression"); } ! BenchmarkBZIP29::~BenchmarkBZIP29() { } Index: Benchmark-GZIP.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-GZIP.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Benchmark-GZIP.h 3 Jan 2007 22:06:27 -0000 1.3 --- Benchmark-GZIP.h 18 Jan 2007 18:44:36 -0000 1.4 *************** *** 12,88 **** #include <Benchmark/Benchmark-xZIP.h> ! /** \brief Defines the gzip package. ! */ ! class CBMPackageGZIP : public CBMPackagexZIP ! { ! private: ! virtual std::string downloadURL(void); ! virtual std::string expectedMD5(void); ! virtual std::string packageName(void); ! virtual std::string packageVersion(void); ! virtual int packageSize(void); /* in bytes */ ! virtual std::string packageComments(void); ! virtual std::string localPackageName(void); ! virtual char* extractDirectory(void); ! virtual std::string language(void); ! protected: ! virtual int hasTest(void); ! virtual int test(void); ! public: ! CBMPackageGZIP(class CBMSystem *_system); ! DLPackageWrapper_declare(); ! virtual std::string license(void); ! virtual std::string homePage(void); ! virtual std::string author(void); ! virtual int benchmarkSize(void); ! virtual ~CBMPackageGZIP(); ! }; ! /** \brief Abstract class for gzip benchmarks */ ! class CBMBenchmarkGZIP : public CBMBenchmarkxZIP ! { ! protected: ! CBMBenchmarkGZIP(CBMPackage *_package); ! virtual std::string benchmarkProgram(void); ! virtual ~CBMBenchmarkGZIP(); ! }; ! /** \brief Defines the gzip benchmark using fastest compression level. ! */ ! class CBMBenchmarkGZIP1 : public CBMBenchmarkGZIP ! { ! protected: ! virtual char* compressionLevel(void); ! virtual std::string benchmarkComments(void); ! public: ! CBMBenchmarkGZIP1(CBMPackage *_package); ! virtual std::string benchmarkName(void); ! virtual ~CBMBenchmarkGZIP1(); ! }; ! /** \brief Defines the gzip benchmark using maximum compression level. ! */ ! class CBMBenchmarkGZIP9 : public CBMBenchmarkGZIP ! { ! protected: ! virtual char* compressionLevel(void); ! virtual std::string benchmarkComments(void); ! public: ! CBMBenchmarkGZIP9(CBMPackage *_package); ! virtual std::string benchmarkName(void); ! virtual ~CBMBenchmarkGZIP9(); ! }; DLdeclare(); --- 12,90 ---- #include <Benchmark/Benchmark-xZIP.h> ! namespace CBM { ! /** \brief Defines the gzip package. ! */ ! class PackageGZIP : public PackagexZIP ! { ! private: ! virtual std::string downloadURL(void); ! virtual std::string expectedMD5(void); ! virtual std::string packageName(void); ! virtual std::string packageVersion(void); ! virtual int packageSize(void); /* in bytes */ ! virtual std::string packageComments(void); ! virtual std::string localPackageName(void); ! virtual char* extractDirectory(void); ! virtual std::string language(void); ! protected: ! virtual int hasTest(void); ! virtual int test(void); ! public: ! PackageGZIP(class System *_system); ! DLPackageWrapper_declare(); ! virtual std::string license(void); ! virtual std::string homePage(void); ! virtual std::string author(void); ! virtual int benchmarkSize(void); ! virtual ~PackageGZIP(); ! }; ! /** \brief Abstract class for gzip benchmarks */ ! class BenchmarkGZIP : public BenchmarkxZIP ! { ! protected: ! BenchmarkGZIP(CBM::Package *_package); ! virtual std::string benchmarkProgram(void); ! virtual ~BenchmarkGZIP(); ! }; ! /** \brief Defines the gzip benchmark using fastest compression level. ! */ ! class BenchmarkGZIP1 : public BenchmarkGZIP ! { ! protected: ! virtual char* compressionLevel(void); ! virtual std::string benchmarkComments(void); ! public: ! BenchmarkGZIP1(CBM::Package *_package); ! virtual std::string benchmarkName(void); ! virtual ~BenchmarkGZIP1(); ! }; ! /** \brief Defines the gzip benchmark using maximum compression level. ! */ ! class BenchmarkGZIP9 : public BenchmarkGZIP ! { ! protected: ! virtual char* compressionLevel(void); ! virtual std::string benchmarkComments(void); ! public: ! BenchmarkGZIP9(CBM::Package *_package); ! virtual std::string benchmarkName(void); ! virtual ~BenchmarkGZIP9(); ! }; ! } DLdeclare(); Index: Benchmark-SCIMARK2.libwrapper.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-SCIMARK2.libwrapper.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Benchmark-SCIMARK2.libwrapper.h 15 Jan 2007 20:07:21 -0000 1.3 --- Benchmark-SCIMARK2.libwrapper.h 18 Jan 2007 18:44:36 -0000 1.4 *************** *** 2,10 **** #include <UI/UI.h> ! int CBMPackageSCIMARK2::benchmarkNumber(void) { return(5); } ! BenchmarkVector& CBMPackageSCIMARK2::Benchmarks(void) { if (benchmarks.size()) return(benchmarks); benchmarks.push_back("scimark2-smm"); --- 2,12 ---- #include <UI/UI.h> ! using namespace CBM; ! ! int PackageSCIMARK2::benchmarkNumber(void) { return(5); } ! CBM::BenchmarkVector& PackageSCIMARK2::Benchmarks(void) { if (benchmarks.size()) return(benchmarks); benchmarks.push_back("scimark2-smm"); *************** *** 16,44 **** } ! CBMBenchmark *CBMPackageSCIMARK2::Benchmark(std::string bid) { if (bid == "scimark2-smm") { ! return(new CBMBenchmarkSCIMARK2_SMM(this)); } if (bid == "scimark2-lu") { ! return(new CBMBenchmarkSCIMARK2_LU(this)); } if (bid == "scimark2-fourier") { ! return(new CBMBenchmarkSCIMARK2_FOURIER(this)); } if (bid == "scimark2-mc") { ! return(new CBMBenchmarkSCIMARK2_MC(this)); } if (bid == "scimark2-sor") { !... [truncated message content] |
|
From: Frederic T. <xf...@us...> - 2007-01-18 18:44:11
|
Update of /cvsroot/compbench/CompBenchmarks++/Benchmark In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18777 Modified Files: Benchmark-Autotools.cpp Benchmark-Autotools.h Benchmark-DLLoader.cpp Benchmark-DLLoader.h Benchmark-xZIP.cpp Benchmark-xZIP.h Benchmark.cpp Benchmark.h Package.cpp Package.h Log Message: CBM namespace. Index: Benchmark.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Benchmark.h 15 Jan 2007 20:09:09 -0000 1.16 --- Benchmark.h 18 Jan 2007 18:44:01 -0000 1.17 *************** *** 15,83 **** #include <vector> ! class CBMSystem; ! /** \brief Defines an abstract benchmark. ! * ! * This class can be overloaded in order to get new external benchmarks and packages ! * supported by CompBenchmarks. Basically it sets up packages (like gzip), prepare, ! * and run associated benchmarks according to a given context. ! * ! * As most of times a distributed package have many benchmarks, it is usual that ! * a first abstraction defines all methods related to package is then overloaded to ! * get consistant informations about all related benchmarks. ! */ ! class CBMBenchmark ! { ! public: ! class CBMPackage *Package(void); ! private: ! protected: ! class CBMPackage *package; ! /** Constructor ! * Initialise the CBMBenchmark::system variable. */ ! CBMBenchmark(class CBMPackage *_package); ! /** Give object for underlaying system. ! Use package pointer. ! \sa package ! */ ! virtual CBMSystem *System(void); ! /** Pure virtual method to run benchmark ! * \return Benchmark's result (as number). ! */ ! virtual std::string bench(void) = 0; ! public: ! /** Display informations about benchmark ! */ ! void display(void); ! /** Benchmark name ! \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. ! * Uses bench(). Overloading is unadvised. ! * This step won't be done and'll return 1 if getStatus()>=CBMPackage::Benchmarked. ! * \return benchmark's result (performance) as a non-null positive number. May changes status. ! * \sa Make() ! * \sa status */ ! virtual std::string Bench(void); ! /** Virtual destructor */ ! virtual ~CBMBenchmark(); ! }; ! #define DLdeclare() \ ! extern "C" CBMPackage *cbmlib_getPackage(void) ! #define DLPackageWrapper_declare() \ ! virtual BenchmarkVector& Benchmarks(void); \ ! virtual CBMBenchmark *Benchmark(std::string bid); \ virtual int benchmarkNumber(void) --- 15,85 ---- #include <vector> ! namespace CBM { ! class System; ! /** \brief Defines an abstract benchmark. ! * ! * This class can be overloaded in order to get new external benchmarks and packages ! * supported by CompBenchmarks. Basically it sets up packages (like gzip), prepare, ! * and run associated benchmarks according to a given context. ! * ! * As most of times a distributed package have many benchmarks, it is usual that ! * a first abstraction defines all methods related to package is then overloaded to ! * get consistant informations about all related benchmarks. ! */ ! class Benchmark ! { ! public: ! class Package *Package(void); ! private: ! protected: ! class Package *package; ! /** Constructor ! * Initialise the Benchmark::system variable. */ ! Benchmark(class Package *_package); ! /** Give object for underlaying system. ! Use package pointer. ! \sa package ! */ ! virtual class System *System(void); ! /** Pure virtual method to run benchmark ! * \return Benchmark's result (as number). ! */ ! virtual std::string bench(void) = 0; ! public: ! /** Display informations about benchmark ! */ ! void display(void); ! /** Benchmark name ! \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. ! * Uses bench(). Overloading is unadvised. ! * This step won't be done and'll return 1 if getStatus()>=Package::Benchmarked. ! * \return benchmark's result (performance) as a non-null positive number. May changes status. ! * \sa Make() ! * \sa status */ ! virtual std::string Bench(void); ! /** Virtual destructor */ ! virtual ~Benchmark(); ! }; ! } ! #define DLdeclare() \ ! extern "C" CBM::Package *cbmlib_getPackage(void) ! #define DLPackageWrapper_declare() \ ! virtual CBM::BenchmarkVector& Benchmarks(void); \ ! virtual CBM::Benchmark *Benchmark(std::string bid); \ virtual int benchmarkNumber(void) Index: Benchmark-DLLoader.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-DLLoader.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Benchmark-DLLoader.cpp 4 Jan 2007 18:56:13 -0000 1.5 --- Benchmark-DLLoader.cpp 18 Jan 2007 18:44:00 -0000 1.6 *************** *** 7,12 **** #include <config.h> std::vector<std::string> cbmlib_paths; ! std::vector<CBMPackage*> cbmlib_packages; /* cache... */ --- 7,13 ---- #include <config.h> + using namespace CBM; std::vector<std::string> cbmlib_paths; ! std::vector<Package*> cbmlib_packages; /* cache... */ *************** *** 79,86 **** int i; ! int n = cbmlib_paths.size(); for(i=0; i<n; i++) { ! tmp=cbmlib_paths[i]; tmp+="/libcompbenchmarks-bm-"; tmp+=package_id; --- 80,87 ---- int i; ! int n = CBM::cbmlib_paths.size(); for(i=0; i<n; i++) { ! tmp=CBM::cbmlib_paths[i]; tmp+="/libcompbenchmarks-bm-"; tmp+=package_id; *************** *** 100,108 **** cbmlib_internal *l; ! s = cbmlib_packages.size(); ! PACKAGE_AUTOPURGE=0; for(i=0; i<s; i++) { ! delete(cbmlib_packages[i]); } --- 101,109 ---- cbmlib_internal *l; ! s = CBM::cbmlib_packages.size(); ! CBM::PACKAGE_AUTOPURGE=0; for(i=0; i<s; i++) { ! delete(CBM::cbmlib_packages[i]); } Index: Package.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Package.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Package.h 15 Jan 2007 20:42:20 -0000 1.6 --- Package.h 18 Jan 2007 18:44:01 -0000 1.7 *************** *** 15,412 **** #include <vector> ! class CBMSystem; ! /** Defines a vector of benchmarks. ! Basically owned by CBMPackage instance. ! */ ! typedef std::vector<std::string> BenchmarkVector; ! /** \brief Defines an abstract package. ! * ! * This class can be overloaded in order to get new external packages ! * supported by CompBenchmarks. Basically it sets up packages (like gzip), ! * and prepares related benchmarks for evaluation. ! * ! * \sa CBMBenchmark ! */ ! class CBMPackage ! { ! public: ! /** Package status ! * Defines typedef used to code internal status of a given package */ ! typedef enum Status { Unknown, /*!< Unkown; benchmark/package probably ! * not yet installed */ ! Downloaded, /*!< Package has been downloaded and checksum ! * is Ok. */ ! Extracted, /*!< Package has been successfuly extracted */ ! Patched, /*!< Package has been patched (optional step) */ ! Preconfigured, /*!< Package is now preconfigured. Also ! * optionnal, but each package goes throught ! * that step */ ! Configured, /*!< Package is configured (./configure) */ ! Made, /*!< Package has been made (make) */ ! Tested, /*!< Package has been tested */ ! Benchmarked }; /*!< Benchmarked */ ! private: ! /** Package status ! * \sa CBMPackage::Status ! * \sa storeStatus() ! * \sa getStatus() ! * \sa readStatus() */ ! Status status; ! /** Expected MD5 on downloaded package ! * \return MD5 expected, as an std::string */ ! virtual std::string expectedMD5(void) = 0; ! /** Package's status ! * Initialise the status from file in the directory defined ! * by CBMSystem::Status. ! * ! * \sa CBMBenchmark::Status ! * \return 1 if ok. */ ! virtual int readStatus(void); ! protected: ! /** \sa Benchmarks() */ ! BenchmarkVector benchmarks; ! /** Stores current compiler. */ ! CBMCompiler *currentCompiler; ! /** Stores current (compiler) options. */ ! CBMCompilerOptions *currentOptions; ! /** System used */ ! class CBMSystem *system; ! /** Constructor ! * Initialise the CBMPackage::system variable. */ ! CBMPackage(class CBMSystem *_system); ! /** Pure method to extract package ! \return 1 if ok ! \sa Extract() ! \sa localPackageAbsoluteDirectory() */ ! virtual int extract(int _force = 0) = 0; ! /** Method to patch package ! * Must be overloaded to patch package. ! * \sa Patch() */ ! virtual int patch(int _force = 0); ! /** Method to test package. ! * Must be overloaded to test package using a method provided by package ! * maintainers. ! * \sa Test() */ ! virtual int test(int _force = 0); ! /** Pure virtual method to pre-configure package ! * Pre-configuration creates any needed elements (files or what ever) to benchmark ! * package. ! * \return 1 if ok. ! * \sa PreConfigure() ! */ ! virtual int preConfigure(int _force) = 0; ! /** Pure virtual method to configure package ! * Broadly speaking, this is ./configure ! * \sa Configure() ! * \return 1 if ok */ ! virtual int configure(CBMCompiler *_currentCompiler, ! CBMCompilerOptions *_currentOptions) = 0; ! /** Pure virtual method to build package ! * This could be a simple make, for instance. ! * \return 1 if ok ! * \sa Make() */ ! virtual int make(void) = 0; ! /** Pure virtual method to clean-up sources ! * Useful bettween two Make() to get all sources compiled with same environment. ! * \sa Release() ! * \sa Configure() ! * \sa Make() */ ! virtual int release(void) = 0; ! /** Uninstall benchmark ! * Removes information used by CompBenchmarks as well as any downloaded, extracted ! * or built element. Default behaviour should be ok in most case. ! * \return 1 if ok. */ ! virtual int uninstall(void); ! /** Gets a context ID ! * Give an unique ID according to compiler and options used. This can avoid useless ! * recompilations. ! * \return ID (MD5) as std::string ! * \sa Make() ! * \sa storeContext() ! * \sa ContextMatches() ! */ ! virtual std::string contextID(CBMCompiler *_currentCompiler, ! CBMCompilerOptions *_currentOptions); ! /** Stores (compilation) context ID ! * Stores the context ID for the current benchmark. ! * \sa contextID() ! * \sa ContextMatches() ! * \return 1 if ok ! */ ! virtual int storeContext(CBMCompiler *_currentCompiler, ! CBMCompilerOptions *_currentOptions); ! public: ! /** Indicates if the package needs patching ! * Must be overloaded if so. Returns 0 by default. ! * \return 0 by default, 1 if patch is needed. ! * \sa patch() ! * \sa Patch() ! */ ! virtual int hasPatch(void); ! /** Remove context. ! * \sa storeContext() ! */ ! virtual int resetContext(void); ! /** Display informations about package */ ! virtual void display(void); ! /** Display informations about all supported benchmarks */ ! virtual void displayBenchmarks(void); ! /** Get system abstraction object ! \return CBMSystem ! */ ! virtual CBMSystem *System(void); ! /** Get all supported benchmarks. ! \return Array of std::string. */ ! virtual BenchmarkVector& Benchmarks(void); ! /** Get supported benchmarks' number ! \return An integer */ ! virtual int benchmarkNumber(void); ! /** Get a benchmark according to its index ! \sa Benchmarks() ! \return A pointer to the benchmark instance */ ! virtual class CBMBenchmark *Benchmark(int i); ! /** Get a benchmark according to its identifier. ! \return References to a CBMBenchmark object */ ! virtual class CBMBenchmark *Benchmark(std::string bid); ! /** Stores benchmark status ! * Probably internal usage only. ! * \return 1 if ok ! * \sa readStatus() ! */ ! virtual int storeStatus(Status _status); ! /** Package name ! * \return a std::string like 'gzip', without quotes */ ! virtual std::string packageName(void); ! /** Package version ! * \return a std::string like '1.2.4', without quotes */ ! virtual std::string packageVersion(void) = 0; ! /** Package size, in bytes ! * \return an integer coding the size of package's archive (to download) in bytes. ! */ ! virtual int packageSize(void) = 0; ! /** Package comments ! * Gives comments about package. Short description, or what ever. ! * \return comments, as std::string ! */ ! virtual std::string packageComments(void) = 0; ! /** Package local filename ! * \return a relative filename containing the local name of the uncompressed ! * package (like 'gzip-1.2.4.tar.Z', without quotes) */ ! virtual std::string localPackageName(void) = 0; ! /** Benchmark's language ! * \return std::string (C or C++) */ ! virtual std::string language(void) = 0; ! /** Returns package or benchmark license ! \return a std::string describing license */ ! virtual std::string license(void) = 0; ! /** Returns package home page ! \return URL in std::string */ ! virtual std::string homePage(void) = 0; ! /** Author(s) of package ! \return std::string containing authors. */ ! virtual std::string author(void) = 0; ! /** Convenience method ! * \return local uncompressed absolute archive filename for benchmark. ! * \sa localPackageName() */ ! virtual std::string localPackageAbsoluteName(void); ! /** Convenience method ! * \return directory used for extracting package ! * \sa CBMSystem::Extract */ ! virtual std::string localPackageAbsoluteDirectory(void); ! /** Relative directory to extract package ! * \return relative directory to use (or used, depending) for package extraction ! * \sa CBMSystem::Extract */ ! virtual char* extractDirectory(void) = 0; ! /** Indicates if the package provides a test method. ! * Must be overloaded if so. Returns 0 by default. ! * \return 0 by default, 1 if patch is needed. ! * \sa test() ! * \sa Test() ! */ ! virtual int hasTest(void); ! /** URL used for downloading package. ! * \return std::string representing the URL of the package ! * \sa expectedMD5() */ ! virtual std::string downloadURL(void) = 0; ! /** Total size of the package ! * \return Total size, in bytes, of thepackage. This comprises data used ! * in pre-configuration step. ! * \sa preConfigure() ! * \sa packageSize() */ ! virtual int benchmarkSize(void); ! /** Compairs previous compilation context to current one ! * \return 1 if they match. ! * \sa contextID() ! * \sa storeContext() ! * \sa Make() ! */ ! virtual int ContextMatches(CBMCompiler *_currentCompiler, ! CBMCompilerOptions *_currentOptions); ! /** Download package. ! * Gets downloadURL() object from Internet and verify checksum. ! * Uses download(). Overloading is unadvised. ! * This step won't be done and'll return 1 if getStatus()>=CBMPackage::Downloaded. ! * \param _force sets to 1 to force operation. May changes status. ! * \return 1 if ok. ! * \sa status */ ! virtual int Download(int _force = 0); ! /** Extract package. ! * Extracts downloaded package. ! * Uses extract(). Overloading is unadvised. ! * This step won't be done and'll return 1 if getStatus()>=CBMPackage::Extracted. ! * \param _force sets to 1 to force operation. May changes status. ! * \return 1 if ok. ! * \sa Download() ! * \sa status */ ! virtual int Extract(int _force = 0); ! /** Patch package. ! * Patches extracted package. ! * Overloading is unadvised, 1 is returned without any action, by default. ! * If hasPatch() returns 1, uses patch(). ! * This step won't be done and'll return 1 if getStatus()>=CBMPackage::Patched. ! * \param _force sets to 1 to force operation. May changes status. ! * \return 1 if ok. ! * \sa Extract() ! * \sa status */ ! virtual int Patch(int _force = 0); ! /** Preconfigure package. ! * Preconfigure downloaded package. ! * Uses preConfigure(). Overloading is unadvised. ! * This step won't be done and'll return 1 if ! * getStatus()>=CBMPackage::PreConfigured. May changes status. ! * \param _force sets to 1 to force operation. ! * \return 1 if ok. ! * \sa Patch() ! * \sa status */ ! virtual int PreConfigure(int _force = 0); ! /** Configure package. ! * Configure downloaded package. ! * Uses configure(). Overloading is unadvised. Argument are used to keep ! * compiler and options used for current bench (context), even ! * if ./configure script is not present : they'll be used by Make(). ! * This step won't be done and'll return 1 if getStatus()>=CBMPackage::Configured. May changes status. ! * \return 1 if ok. ! * \sa Download() ! * \sa Release() ! * \sa ContextMatches() ! * \sa Make(). ! * \sa status */ ! virtual int Configure(CBMCompiler *_currentCompiler, ! CBMCompilerOptions *_currentOptions); ! /** Build package. ! * Builds package. ! * Uses make(). Overloading is unadvised. ! * This step won't be done and'll return 1 if getStatus()>=CBMPackage::Made. ! * \param _force sets to 1 to force operation. May changes status. ! * \return 1 if ok. May changes status. ! * \sa Configure() ! * \sa Release() ! * \sa status ! * \sa ContextMatches() */ ! virtual int Make(int _force = 0); ! /** Test a package. ! * Test a built package. ! * Overloading is unadvised, 1 is returned without any action, by default. ! * If hasPatch() returns 1, uses patch(). ! * This step won't be done and'll return 1 if getStatus()>=CBMPackage::Benchmarked. ! * \param _force sets to 1 to force operation. May changes status. ! * \return 1 if ok. ! * \sa Make() ! * \sa status */ ! virtual int Test(int _force = 0); ! /** Clean objects. ! * Uses release(). Overloading is unadvised. ! * This step won't be done and'll return 0 if getStatus()<CBMPackage::Made. May changes status. ! * \return 1 if ok. ! * \sa Bench() */ ! virtual int Release(void); ! /** Install package. ! * Installs package, uses, in that order Download(), Extract(), Patch() (if needed) ! * and PreConfigure(). Overloading is unadvised. ! * This step won't be done and'll return 1 if getStatus()>=CBMPackage::PreConfigured. ! * \param _force assign to 1 for forcing operation. ! * \return 1 if ok. May changes status. ! * \sa status */ ! virtual int Install(int _force = 0); ! /** Copy a local archive. ! * Copy package to directory defined by CBMSystem::Download. It'll be ready ! * to be extracted using Install(). ! * \param _source the archive file ! * \param _force assign to 1 for forcing operation. ! * \return 1 if ok. May changes status. ! * \sa status ! * \sa extract */ ! virtual int Fetch(char *_source, int _force = 0); ! /** Uninstall package. ! * Uses uninstall(). Overloading is unadvised. ! * This step won't be done and'll return 1 if getStatus()==CBMPackage::Unknown. ! * \return 1 if ok. May changes status. ! * \sa status */ ! virtual int Uninstall(void); ! /** Returns benchmark's status ! * \return status (enum). ! * \sa CBMPackage::Status */ ! virtual Status getStatus(void); ! /** Virtual destructor */ ! virtual ~CBMPackage(); ! }; #endif --- 15,414 ---- #include <vector> ! namespace CBM { ! class System; ! /** Defines a vector of benchmarks. ! Basically owned by CBM::Package instance. ! */ ! typedef std::vector<std::string> BenchmarkVector; ! /** \brief Defines an abstract package. ! * ! * This class can be overloaded in order to get new external packages ! * supported by CompBenchmarks. Basically it sets up packages (like gzip), ! * and prepares related benchmarks for evaluation. ! * ! * \sa Benchmark */ ! class Package ! { ! public: ! /** Package status ! * Defines typedef used to code internal status of a given package ! */ ! typedef enum Status { Unknown, /*!< Unkown; benchmark/package probably ! * not yet installed */ ! Downloaded, /*!< Package has been downloaded and checksum ! * is Ok. */ ! Extracted, /*!< Package has been successfuly extracted */ ! Patched, /*!< Package has been patched (optional step) */ ! Preconfigured, /*!< Package is now preconfigured. Also ! * optionnal, but each package goes throught ! * that step */ ! Configured, /*!< Package is configured (./configure) */ ! Made, /*!< Package has been made (make) */ ! Tested, /*!< Package has been tested */ ! Benchmarked }; /*!< Benchmarked */ ! private: ! /** Package status ! * \sa Package::Status ! * \sa storeStatus() ! * \sa getStatus() ! * \sa readStatus() */ ! Status status; ! /** Expected MD5 on downloaded package ! * \return MD5 expected, as an std::string */ ! virtual std::string expectedMD5(void) = 0; ! /** Package's status ! * Initialise the status from file in the directory defined ! * by CBM::System::Status. ! * ! * \sa Benchmark::Status ! * \return 1 if ok. */ ! virtual int readStatus(void); ! protected: ! /** \sa Benchmarks() */ ! BenchmarkVector benchmarks; ! /** Stores current compiler. */ ! Compiler *currentCompiler; ! /** Stores current (compiler) options. */ ! CompilerOptions *currentOptions; ! /** System used */ ! class System *system; ! /** Constructor ! * Initialise the Package::system variable. */ ! Package(class System *_system); ! /** Pure method to extract package ! \return 1 if ok ! \sa Extract() ! \sa localPackageAbsoluteDirectory() */ ! virtual int extract(int _force = 0) = 0; ! /** Method to patch package ! * Must be overloaded to patch package. ! * \sa Patch() */ ! virtual int patch(int _force = 0); ! /** Method to test package. ! * Must be overloaded to test package using a method provided by package ! * maintainers. ! * \sa Test() */ ! virtual int test(int _force = 0); ! /** Pure virtual method to pre-configure package ! * Pre-configuration creates any needed elements (files or what ever) to benchmark ! * package. ! * \return 1 if ok. ! * \sa PreConfigure() ! */ ! virtual int preConfigure(int _force) = 0; ! /** Pure virtual method to configure package ! * Broadly speaking, this is ./configure ! * \sa Configure() ! * \return 1 if ok */ ! virtual int configure(Compiler *_currentCompiler, ! CompilerOptions *_currentOptions) = 0; ! /** Pure virtual method to build package ! * This could be a simple make, for instance. ! * \return 1 if ok ! * \sa Make() */ ! virtual int make(void) = 0; ! /** Pure virtual method to clean-up sources ! * Useful bettween two Make() to get all sources compiled with same environment. ! * \sa Release() ! * \sa Configure() ! * \sa Make() */ ! virtual int release(void) = 0; ! /** Uninstall benchmark ! * Removes information used by CompBenchmarks as well as any downloaded, extracted ! * or built element. Default behaviour should be ok in most case. ! * \return 1 if ok. */ ! virtual int uninstall(void); ! /** Gets a context ID ! * Give an unique ID according to compiler and options used. This can avoid useless ! * recompilations. ! * \return ID (MD5) as std::string ! * \sa Make() ! * \sa storeContext() ! * \sa ContextMatches() ! */ ! virtual std::string contextID(Compiler *_currentCompiler, ! CompilerOptions *_currentOptions); ! /** Stores (compilation) context ID ! * Stores the context ID for the current benchmark. ! * \sa contextID() ! * \sa ContextMatches() ! * \return 1 if ok ! */ ! virtual int storeContext(Compiler *_currentCompiler, ! CompilerOptions *_currentOptions); ! public: ! /** Indicates if the package needs patching ! * Must be overloaded if so. Returns 0 by default. ! * \return 0 by default, 1 if patch is needed. ! * \sa patch() ! * \sa Patch() ! */ ! virtual int hasPatch(void); ! /** Remove context. ! * \sa storeContext() ! */ ! virtual int resetContext(void); ! /** Display informations about package */ ! virtual void display(void); ! /** Display informations about all supported benchmarks */ ! virtual void displayBenchmarks(void); ! /** Get system abstraction object ! \return CBM::System ! */ ! virtual class System *System(void); ! /** Get all supported benchmarks. ! \return Array of std::string. */ ! virtual BenchmarkVector& Benchmarks(void); ! /** Get supported benchmarks' number ! \return An integer */ ! virtual int benchmarkNumber(void); ! /** Get a benchmark according to its index ! \sa Benchmarks() ! \return A pointer to the benchmark instance */ ! virtual class Benchmark *Benchmark(int i); ! /** Get a benchmark according to its identifier. ! \return References to a Benchmark object */ ! virtual class Benchmark *Benchmark(std::string bid); ! /** Stores benchmark status ! * Probably internal usage only. ! * \return 1 if ok ! * \sa readStatus() ! */ ! virtual int storeStatus(Status _status); ! /** Package name ! * \return a std::string like 'gzip', without quotes */ ! virtual std::string packageName(void); ! /** Package version ! * \return a std::string like '1.2.4', without quotes */ ! virtual std::string packageVersion(void) = 0; ! /** Package size, in bytes ! * \return an integer coding the size of package's archive (to download) in bytes. ! */ ! virtual int packageSize(void) = 0; ! /** Package comments ! * Gives comments about package. Short description, or what ever. ! * \return comments, as std::string ! */ ! virtual std::string packageComments(void) = 0; ! /** Package local filename ! * \return a relative filename containing the local name of the uncompressed ! * package (like 'gzip-1.2.4.tar.Z', without quotes) */ ! virtual std::string localPackageName(void) = 0; ! /** Benchmark's language ! * \return std::string (C or C++) */ ! virtual std::string language(void) = 0; ! /** Returns package or benchmark license ! \return a std::string describing license */ ! virtual std::string license(void) = 0; ! /** Returns package home page ! \return URL in std::string */ ! virtual std::string homePage(void) = 0; ! /** Author(s) of package ! \return std::string containing authors. */ ! virtual std::string author(void) = 0; ! /** Convenience method ! * \return local uncompressed absolute archive filename for benchmark. ! * \sa localPackageName() */ ! virtual std::string localPackageAbsoluteName(void); ! /** Convenience method ! * \return directory used for extracting package ! * \sa CBM::System::Extract */ ! virtual std::string localPackageAbsoluteDirectory(void); ! /** Relative directory to extract package ! * \return relative directory to use (or used, depending) for package extraction ! * \sa CBM::System::Extract */ ! virtual char* extractDirectory(void) = 0; ! /** Indicates if the package provides a test method. ! * Must be overloaded if so. Returns 0 by default. ! * \return 0 by default, 1 if patch is needed. ! * \sa test() ! * \sa Test() ! */ ! virtual int hasTest(void); ! /** URL used for downloading package. ! * \return std::string representing the URL of the package ! * \sa expectedMD5() */ ! virtual std::string downloadURL(void) = 0; ! /** Total size of the package ! * \return Total size, in bytes, of thepackage. This comprises data used ! * in pre-configuration step. ! * \sa preConfigure() ! * \sa packageSize() */ ! virtual int benchmarkSize(void); ! /** Compairs previous compilation context to current one ! * \return 1 if they match. ! * \sa contextID() ! * \sa storeContext() ! * \sa Make() ! */ ! virtual int ContextMatches(Compiler *_currentCompiler, ! CompilerOptions *_currentOptions); ! /** Download package. ! * Gets downloadURL() object from Internet and verify checksum. ! * Uses download(). Overloading is unadvised. ! * This step won't be done and'll return 1 if getStatus()>=Package::Downloaded. ! * \param _force sets to 1 to force operation. May changes status. ! * \return 1 if ok. ! * \sa status */ ! virtual int Download(int _force = 0); ! /** Extract package. ! * Extracts downloaded package. ! * Uses extract(). Overloading is unadvised. ! * This step won't be done and'll return 1 if getStatus()>=Package::Extracted. ! * \param _force sets to 1 to force operation. May changes status. ! * \return 1 if ok. ! * \sa Download() ! * \sa status */ ! virtual int Extract(int _force = 0); ! /** Patch package. ! * Patches extracted package. ! * Overloading is unadvised, 1 is returned without any action, by default. ! * If hasPatch() returns 1, uses patch(). ! * This step won't be done and'll return 1 if getStatus()>=Package::Patched. ! * \param _force sets to 1 to force operation. May changes status. ! * \return 1 if ok. ! * \sa Extract() ! * \sa status */ ! virtual int Patch(int _force = 0); ! /** Preconfigure package. ! * Preconfigure downloaded package. ! * Uses preConfigure(). Overloading is unadvised. ! * This step won't be done and'll return 1 if ! * getStatus()>=Package::PreConfigured. May changes status. ! * \param _force sets to 1 to force operation. ! * \return 1 if ok. ! * \sa Patch() ! * \sa status */ ! virtual int PreConfigure(int _force = 0); ! /** Configure package. ! * Configure downloaded package. ! * Uses configure(). Overloading is unadvised. Argument are used to keep ! * compiler and options used for current bench (context), even ! * if ./configure script is not present : they'll be used by Make(). ! * This step won't be done and'll return 1 if getStatus()>=Package::Configured. May changes status. ! * \return 1 if ok. ! * \sa Download() ! * \sa Release() ! * \sa ContextMatches() ! * \sa Make(). ! * \sa status */ ! virtual int Configure(Compiler *_currentCompiler, ! CompilerOptions *_currentOptions); ! /** Build package. ! * Builds package. ! * Uses make(). Overloading is unadvised. ! * This step won't be done and'll return 1 if getStatus()>=Package::Made. ! * \param _force sets to 1 to force operation. May changes status. ! * \return 1 if ok. May changes status. ! * \sa Configure() ! * \sa Release() ! * \sa status ! * \sa ContextMatches() */ ! virtual int Make(int _force = 0); ! /** Test a package. ! * Test a built package. ! * Overloading is unadvised, 1 is returned without any action, by default. ! * If hasPatch() returns 1, uses patch(). ! * This step won't be done and'll return 1 if getStatus()>=Package::Benchmarked. ! * \param _force sets to 1 to force operation. May changes status. ! * \return 1 if ok. ! * \sa Make() ! * \sa status */ ! virtual int Test(int _force = 0); ! /** Clean objects. ! * Uses release(). Overloading is unadvised. ! * This step won't be done and'll return 0 if getStatus()<Package::Made. May changes status. ! * \return 1 if ok. ! * \sa Bench() */ ! virtual int Release(void); ! /** Install package. ! * Installs package, uses, in that order Download(), Extract(), Patch() (if needed) ! * and PreConfigure(). Overloading is unadvised. ! * This step won't be done and'll return 1 if getStatus()>=Package::PreConfigured. ! * \param _force assign to 1 for forcing operation. ! * \return 1 if ok. May changes status. ! * \sa status */ ! virtual int Install(int _force = 0); ! /** Copy a local archive. ! * Copy package to directory defined by CBM::System::Download. It'll be ready ! * to be extracted using Install(). ! * \param _source the archive file ! * \param _force assign to 1 for forcing operation. ! * \return 1 if ok. May changes status. ! * \sa status ! * \sa extract */ ! virtual int Fetch(char *_source, int _force = 0); ! /** Uninstall package. ! * Uses uninstall(). Overloading is unadvised. ! * This step won't be done and'll return 1 if getStatus()==Package::Unknown. ! * \return 1 if ok. May changes status. ! * \sa status */ ! virtual int Uninstall(void); ! /** Returns benchmark's status ! * \return status (enum). ! * \sa Package::Status */ ! virtual Status getStatus(void); ! /** Virtual destructor */ ! virtual ~Package(); ! }; ! } #endif Index: Benchmark-xZIP.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-xZIP.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Benchmark-xZIP.cpp 3 Jan 2007 22:02:11 -0000 1.3 --- Benchmark-xZIP.cpp 18 Jan 2007 18:44:00 -0000 1.4 *************** *** 4,13 **** #include <fstream> ! CBMPackagexZIP::CBMPackagexZIP(CBMSystem *_system) ! : CBMPackageAutotools(_system) { } ! int CBMPackagexZIP::preConfigure(int _force) { std::string fileName; --- 4,15 ---- #include <fstream> ! using namespace CBM; ! ! PackagexZIP::PackagexZIP(CBM::System *_system) ! : PackageAutotools(_system) { } ! int PackagexZIP::preConfigure(int _force) { std::string fileName; *************** *** 28,41 **** } ! CBMPackagexZIP::~CBMPackagexZIP() { } ! CBMBenchmarkxZIP::CBMBenchmarkxZIP(CBMPackage *_package) ! : CBMBenchmark(_package) { } ! std::string CBMBenchmarkxZIP::bench(void) { time_t start = System()->Time(); --- 30,43 ---- } ! PackagexZIP::~PackagexZIP() { } ! BenchmarkxZIP::BenchmarkxZIP(CBM::Package *_package) ! : Benchmark(_package) { } ! std::string BenchmarkxZIP::bench(void) { time_t start = System()->Time(); *************** *** 64,68 **** } ! CBMBenchmarkxZIP::~CBMBenchmarkxZIP() { } --- 66,70 ---- } ! BenchmarkxZIP::~BenchmarkxZIP() { } Index: Benchmark.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Benchmark.cpp 4 Jan 2007 18:56:13 -0000 1.19 --- Benchmark.cpp 18 Jan 2007 18:44:01 -0000 1.20 *************** *** 6,15 **** #include <UI/UI.h> ! CBMBenchmark::CBMBenchmark(CBMPackage *_package) { package=_package; } ! void CBMBenchmark::display(void) { std::cout << "benchmark::Name=" << benchmarkName() << std::endl --- 6,17 ---- #include <UI/UI.h> ! using namespace CBM; ! ! Benchmark::Benchmark(CBM::Package *_package) { package=_package; } ! void Benchmark::display(void) { std::cout << "benchmark::Name=" << benchmarkName() << std::endl *************** *** 22,31 **** } ! CBMPackage *CBMBenchmark::Package(void) { return(package); } ! CBMSystem *CBMBenchmark::System(void) { if (package) --- 24,33 ---- } ! Package *Benchmark::Package(void) { return(package); } ! System *Benchmark::System(void) { if (package) *************** *** 35,39 **** } ! std::string CBMBenchmark::Bench(void) { std::string r; --- 37,41 ---- } ! std::string Benchmark::Bench(void) { std::string r; *************** *** 41,55 **** ! if (((Package()->getStatus()<CBMPackage::Tested) && (Package()->hasTest())) && (UO_enableTestSuite)) { info=benchmarkName(); info+=" not tested !"; ! UI->Information(CBMUI::BenchTest, ! info); return("0"); } ! UI->Information(CBMUI::BenchBench, benchmarkName()); --- 43,57 ---- ! if (((Package()->getStatus()<Package::Tested) && (Package()->hasTest())) && (UO_enableTestSuite)) { info=benchmarkName(); info+=" not tested !"; ! cbmUI->Information(CBM::UI::BenchTest, ! info); return("0"); } ! cbmUI->Information(CBM::UI::BenchBench, benchmarkName()); *************** *** 58,68 **** if (r!="0") { ! Package()->storeStatus(CBMPackage::Benchmarked); ! UI->Information(CBMUI::BenchResult, r); } else { info="Benchmarking failed for "; info+=Package()->packageName(); ! UI->Fatal(info); } --- 60,70 ---- if (r!="0") { ! Package()->storeStatus(Package::Benchmarked); ! cbmUI->Information(CBM::UI::BenchResult, r); } else { info="Benchmarking failed for "; info+=Package()->packageName(); ! cbmUI->Fatal(info); } *************** *** 70,74 **** } ! CBMBenchmark::~CBMBenchmark() { } --- 72,76 ---- } ! Benchmark::~Benchmark() { } Index: Benchmark-xZIP.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-xZIP.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Benchmark-xZIP.h 3 Jan 2007 22:02:11 -0000 1.3 --- Benchmark-xZIP.h 18 Jan 2007 18:44:01 -0000 1.4 *************** *** 12,74 **** #include <Benchmark/Benchmark-Autotools.h> ! /** \brief Defines an abstract package based on ZIP utilities. ! * ! * This class can be overloaded in order to get new external packages ! * supported by CompBenchmarks. It provides a 70M (through preConfigure()) ! * file that can be compressed. ! * \sa CBMBenchmarkxZIP ! */ ! class CBMPackagexZIP : public CBMPackageAutotools ! { ! private: ! ! protected: ! /** Pre-configure package ! * Creates a ~70M files used for compression benchmarks. ! * \param _force must be set to 1 to force operation. ! * \sa CBMBenchmark::preConfigure() */ ! virtual int preConfigure(int _force = 0); ! public: ! /** Constructor */ ! CBMPackagexZIP(class CBMSystem *_system); ! /** Virtual destructor */ ! virtual ~CBMPackagexZIP(); ! }; ! /** \brief Defines an abstract benchmark based on ZIP utilities. ! * ! * This class can be overloaded in order to get new external packages ! * supported by CompBenchmarks. It provides a 70M (through preConfigure()) ! * file that can be compressed. ! * \sa CBMPackagexZIP ! */ ! class CBMBenchmarkxZIP : public CBMBenchmark ! { ! protected: ! CBMBenchmarkxZIP(CBMPackage *_package); ! /** Compression level ! \return compression level ("0" .. "9") used. ! */ ! virtual char* compressionLevel(void) = 0; ! /** Program name ! \return std::string like gzip or bzip2. ! */ ! virtual std::string benchmarkProgram(void) = 0; ! /** Runs the benchmark ! * Gives the amount of compressed bytes per seconds (as CompBenchmarks always apply ! * "bigger is better" policy to benchmarks' results, we can just rely on time). */ ! virtual std::string bench(void); ! virtual ~CBMBenchmarkxZIP(); ! }; #endif --- 12,75 ---- #include <Benchmark/Benchmark-Autotools.h> + namespace CBM { + /** \brief Defines an abstract package based on ZIP utilities. + * + * This class can be overloaded in order to get new external packages + * supported by CompBenchmarks. It provides a 70M (through preConfigure()) + * file that can be compressed. + * \sa CBM::BenchmarkxZIP + */ + class PackagexZIP : public PackageAutotools + { + private: ! protected: ! /** Pre-configure package ! * Creates a ~70M files used for compression benchmarks. ! * \param _force must be set to 1 to force operation. ! * \sa CBM::Benchmark::preConfigure() */ ! virtual int preConfigure(int _force = 0); ! public: ! /** Constructor */ ! PackagexZIP(class System *_system); ! /** Virtual destructor */ ! virtual ~PackagexZIP(); ! }; ! /** \brief Defines an abstract benchmark based on ZIP utilities. ! * ! * This class can be overloaded in order to get new external packages ! * supported by CompBenchmarks. It provides a 70M (through preConfigure()) ! * file that can be compressed. ! * \sa PackagexZIP ! */ ! class BenchmarkxZIP : public Benchmark ! { ! protected: ! BenchmarkxZIP(CBM::Package *_package); ! /** Compression level ! \return compression level ("0" .. "9") used. ! */ ! virtual char* compressionLevel(void) = 0; ! /** Program name ! \return std::string like gzip or bzip2. ! */ ! virtual std::string benchmarkProgram(void) = 0; ! /** Runs the benchmark ! * Gives the amount of compressed bytes per seconds (as CompBenchmarks always apply ! * "bigger is better" policy to benchmarks' results, we can just rely on time). */ ! virtual std::string bench(void); ! virtual ~BenchmarkxZIP(); ! }; ! } #endif Index: Benchmark-DLLoader.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-DLLoader.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Benchmark-DLLoader.h 3 Jan 2007 22:02:28 -0000 1.4 --- Benchmark-DLLoader.h 18 Jan 2007 18:44:00 -0000 1.5 *************** *** 17,51 **** #include <vector> ! /** Paths to libraries */ ! extern std::vector<std::string> cbmlib_paths; ! ! extern std::vector<CBMPackage*> cbmlib_packages; ! ! extern int PACKAGE_AUTOPURGE; ! /** Function prototype for accessing a CBMPackage object */ ! typedef CBMPackage* (*cbmlib_internal_getPackage_t)(void); ! /** Low-level internal benchmark's shared library object */ ! typedef struct cbmlib_internal { ! void *library; ! cbmlib_internal_getPackage_t PackageGet; ! }; ! /** \brief Low-level library loading according to the benchmark/package's ! internal name. ! \param package_id something like gzip, bzip2, nbench and so on. ! */ ! cbmlib_internal *cbmlib_load(char *package_id); ! /** \brief Low-level function to Get a CBMBenchmark instance from a ! * shared library. ! * \param bench_id gzip-1c, benchpp-whetstone and so on. ! * \param _system A system instance. ! */ ! CBMBenchmark *cbmlib_bench_load(char *bench_id, CBMSystem *_system); ! /** \brief Low-level function for removing any internal existing reference to shared libraries. */ ! void cbmlib_done(void); #endif --- 17,53 ---- #include <vector> ! namespace CBM { ! /** Paths to libraries */ ! extern std::vector<std::string> cbmlib_paths; ! extern std::vector<Package*> cbmlib_packages; ! extern int PACKAGE_AUTOPURGE; ! /** Function prototype for accessing a Package object */ ! typedef Package* (*cbmlib_internal_getPackage_t)(void); ! /** Low-level internal benchmark's shared library object */ ! typedef struct cbmlib_internal { ! void *library; ! cbmlib_internal_getPackage_t PackageGet; ! }; ! /** \brief Low-level library loading according to the benchmark/package's ! internal name. ! \param package_id something like gzip, bzip2, nbench and so on. ! */ ! cbmlib_internal *cbmlib_load(char *package_id); ! ! /** \brief Low-level function to Get a CBMBenchmark instance from a ! * shared library. ! * \param bench_id gzip-1c, benchpp-whetstone and so on. ! * \param _system A system instance. ! */ ! Benchmark *cbmlib_bench_load(char *bench_id, System *_system); ! ! /** \brief Low-level function for removing any internal existing reference to shared libraries. */ ! void cbmlib_done(void); ! } #endif Index: Package.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Package.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Package.cpp 15 Jan 2007 20:08:37 -0000 1.6 --- Package.cpp 18 Jan 2007 18:44:01 -0000 1.7 *************** *** 15,19 **** #include <string> ! CBMPackage::CBMPackage(CBMSystem *_system) { system=_system; --- 15,21 ---- #include <string> ! using namespace CBM; ! ! Package::Package(CBM::System *_system) { system=_system; *************** *** 23,32 **** } ! BenchmarkVector& CBMPackage::Benchmarks(void) { return(benchmarks); } ! int CBMPackage::benchmarkNumber(void) { Benchmarks(); --- 25,34 ---- } ! BenchmarkVector& Package::Benchmarks(void) { return(benchmarks); } ! int Package::benchmarkNumber(void) { Benchmarks(); *************** *** 34,38 **** } ! CBMBenchmark *CBMPackage::Benchmark(int i) { Benchmarks(); --- 36,40 ---- } ! Benchmark *Package::Benchmark(int i) { Benchmarks(); *************** *** 40,50 **** } ! CBMBenchmark *CBMPackage::Benchmark(std::string bid) { ! std::cerr << "virtual CBMPackage::Benchmark() called" << std::endl; return(0); } ! void CBMPackage::display(void) { std::cout << "package::Name=" << packageName() << std::endl --- 42,52 ---- } ! Benchmark *Package::Benchmark(std::string bid) { ! std::cerr << "virtual Package::Benchmark() called" << std::endl; return(0); } ! void Package::display(void) { std::cout << "package::Name=" << packageName() << std::endl *************** *** 58,66 **** } ! void CBMPackage::displayBenchmarks(void) { ! int i; ! int n; ! CBMBenchmark *B; n=benchmarkNumber(); --- 60,68 ---- } ! void Package::displayBenchmarks(void) { ! int i; ! int n; ! CBM::Benchmark *B; n=benchmarkNumber(); *************** *** 71,85 **** } ! CBMSystem *CBMPackage::System(void) { return(system); } ! std::string CBMPackage::packageName(void) { return(""); } ! int CBMPackage::readStatus(void) { char s; --- 73,87 ---- } ! System *Package::System(void) { return(system); } ! std::string Package::packageName(void) { return(""); } ! int Package::readStatus(void) { char s; *************** *** 103,111 **** } ! int CBMPackage::resetContext(void) { std::string contextFile; ! contextFile=system->temporaryDirectory(CBMSystem::Status); contextFile+="/"; --- 105,113 ---- } ! int Package::resetContext(void) { std::string contextFile; ! contextFile=system->temporaryDirectory(System::Status); contextFile+="/"; *************** *** 116,122 **** } ! std::string CBMPackage::localPackageAbsoluteName(void) { ! std::string localFile = system->temporaryDirectory(CBMSystem::Download); localFile+="/"; --- 118,124 ---- } ! std::string Package::localPackageAbsoluteName(void) { ! std::string localFile = system->temporaryDirectory(System::Download); localFile+="/"; *************** *** 126,134 **** } ! std::string CBMPackage::localPackageAbsoluteDirectory(void) { std::string cmd; ! cmd+=system->temporaryDirectory(CBMSystem::Extract); cmd+="/"; cmd+=extractDirectory(); --- 128,136 ---- } ! std::string Package::localPackageAbsoluteDirectory(void) { std::string cmd; ! cmd+=system->temporaryDirectory(System::Extract); cmd+="/"; cmd+=extractDirectory(); *************** *** 137,161 **** } ! int CBMPackage::hasPatch(void) { return(0); } ! int CBMPackage::patch(int _force) { return(1); } ! int CBMPackage::benchmarkSize(void) { return(0); } ! int CBMPackage::hasTest(void) { return(0); } ! int CBMPackage::test(int _force) { return(1); --- 139,163 ---- } ! int Package::hasPatch(void) { return(0); } ! int Package::patch(int _force) { return(1); } ! int Package::benchmarkSize(void) { return(0); } ! int Package::hasTest(void) { return(0); } ! int Package::test(int _force) { return(1); *************** *** 163,167 **** ! int CBMPackage::uninstall(void) { std::string where = localPackageAbsoluteDirectory(); --- 165,169 ---- ! int Package::uninstall(void) { std::string where = localPackageAbsoluteDirectory(); *************** *** 177,181 **** } ! int CBMPackage::storeStatus(Status _status) { int r; --- 179,183 ---- } ! int Package::storeStatus(Status _status) { int r; *************** *** 196,201 **** } ! std::string CBMPackage::contextID(CBMCompiler *_currentCompiler, ! CBMCompilerOptions *_currentOptions) { std::string what = _currentCompiler->Binary(); --- 198,203 ---- } ! std::string Package::contextID(CBM::Compiler *_currentCompiler, ! CBM::CompilerOptions *_currentOptions) { std::string what = _currentCompiler->Binary(); *************** *** 205,210 **** } ! int CBMPackage::storeContext(CBMCompiler *_currentCompiler, ! CBMCompilerOptions *_currentOptions) { std::string context = contextID(_currentCompiler, --- 207,212 ---- } ! int Package::storeContext(CBM::Compiler *_currentCompiler, ! CBM::CompilerOptions *_currentOptions) { std::string context = contextID(_currentCompiler, *************** *** 222,227 **** } ! int CBMPackage::ContextMatches(CBMCompiler *_currentCompiler, ! CBMCompilerOptions *_currentOptions) { std::string previousContext; --- 224,229 ---- } ! int Package::ContextMatches(CBM::Compiler *_currentCompiler, ! CBM::CompilerOptions *_currentOptions) { std::string previousContext; *************** *** 245,249 **** } ! int CBMPackage::Download(int _force) { std::string localFile = localPackageAbsoluteName(); --- 247,251 ---- } ! int Package::Download(int _force) { std::string localFile = localPackageAbsoluteName(); *************** *** 261,266 **** info+=packageVersion(); ! UI->Information(CBMUI::BenchDownload, ! info); try { --- 263,268 ---- info+=packageVersion(); ! cbmUI->Information(CBM::UI::BenchDownload, ! info); try { *************** *** 277,281 **** if (expected_md5==md5) { ! UI->Information(CBMUI::ChecksumOK, localFile); --- 279,283 ---- if (expected_md5==md5) { ! cbmUI->Information(CBM::UI::ChecksumOK, localFile); *************** *** 283,287 **** return(1); } else { ! UI->Information(CBMUI::ChecksumFailed, localFile); --- 285,289 ---- return(1); } else { ! cbmUI->Information(CBM::UI::ChecksumFailed, localFile); *************** *** 291,295 **** info+=" to "; info+=localFile; ! UI->Fatal(info); return(0); } --- 293,297 ---- info+=" to "; info+=localFile; ! cbmUI->Fatal(info); return(0); } *************** *** 299,303 **** info+=" to "; info+=localFile; ! UI->Fatal(info); system->unlink((char*) localFile.c_str()); --- 301,305 ---- info+=" to "; info+=localFile; ! cbmUI->Fatal(info); system->unlink((char*) localFile.c_str()); *************** *** 306,310 **** } ! int CBMPackage::Extract(int _force) { int r; --- 308,312 ---- } ! int Package::Extract(int _force) { int r; *************** *** 315,319 **** } ! UI->Information(CBMUI::BenchExtract, packageName()); --- 317,321 ---- } ! cbmUI->Information(CBM::UI::BenchExtract, packageName()); *************** *** 327,332 **** info+=localPackageAbsoluteName(); info+=" into "; ! info+=system->temporaryDirectory(CBMSystem::Extract); ! UI->Fatal(info); } --- 329,334 ---- info+=localPackageAbsoluteName(); info+=" into "; ! info+=system->temporaryDirectory(System::Extract); ! cbmUI->Fatal(info); } *************** *** 334,338 **** } ! int CBMPackage::Patch(int _force) { int r; --- 336,340 ---- } ! int Package::Patch(int _force) { int r; *************** *** 346,350 **** } ! UI->Information(CBMUI::BenchPatch, packageName()); --- 348,352 ---- } ! cbmUI->Information(CBM::UI::BenchPatch, packageName()); *************** *** 357,361 **** info="Error patching "; info+=localPackageAbsoluteName(); ! UI->Fatal(info); } --- 359,363 ---- info="Error patching "; info+=localPackageAbsoluteName(); ! cbmUI->Fatal(info); } *************** *** 363,367 **** } ! int CBMPackage::PreConfigure(int _force) { int r; --- 365,369 ---- } ! int Package::PreConfigure(int _force) { int r; *************** *** 376,380 **** ! UI->Information(CBMUI::BenchPreconfigure, packageName()); --- 378,382 ---- ! cbmUI->Information(CBM::UI::BenchPreconfigure, packageName()); *************** *** 389,399 **** info+=packageName(); info+="'s pre-configuration"; ! UI->Fatal(info); } return(r); } ! int CBMPackage::Configure(CBMCompiler *_currentCompiler, ! CBMCompilerOptions *_currentOptions) { int r; --- 391,401 ---- info+=packageName(); info+="'s pre-configuration"; ! cbmUI->Fatal(info); } return(r); } ! int Package::Configure(CBM::Compiler *_currentCompiler, ! CBM::CompilerOptions *_currentOptions) { int r; *************** *** 426,433 **** info+=language(); info+="."; ! UI->Fatal(info); } ! UI->Information(CBMUI::BenchConfigure, info); --- 428,435 ---- info+=language(); info+="."; ! cbmUI->Fatal(info); } ! cbmUI->Information(CBM::UI::BenchConfigure, info); *************** *** 442,446 **** info="Configure failed for "; info+=packageName(); ! UI->Fatal(info); } --- 444,448 ---- info="Configure failed for "; info+=packageName(); ! cbmUI->Fatal(info); } *************** *** 448,452 **** } ! int CBMPackage::Make(int _force) { int r; --- 450,454 ---- } ! int Package::Make(int _force) { int r; *************** *** 459,463 **** } ! UI->Information(CBMUI::BenchMake, packageName()); --- 461,465 ---- } ! cbmUI->Information(CBM::UI::BenchMake, packageName()); *************** *** 473,477 **** info="Make failed for "; info+=packageName(); ! UI->Fatal(info); } --- 475,479 ---- info="Make failed for "; info+=packageName(); ! cbmUI->Fatal(info); } *************** *** 480,484 **** } ! int CBMPackage::Test(int _force) { int r; --- 482,486 ---- } ! int Package::Test(int _force) { int r; *************** *** 489,493 **** if (getStatus()<Configured) { ! UI->Fatal("Package is not configured"); } --- 491,495 ---- if (getStatus()<Configured) { ! cbmUI->Fatal("Package is not configured"); } *************** *** 502,506 **** if (UO_enableTestSuite) { ! UI->Information(CBMUI::BenchTest, packageName()); --- 504,508 ---- if (UO_enableTestSuite) { ! cbmUI->Information(CBM::UI::BenchTest, packageName()); *************** *** 509,513 **** dum=packageName(); dum+=" : passed (disabled by user option)."; ! UI->Information(CBMUI::BenchTest, dum); r=1; --- 511,515 ---- dum=packageName(); dum+=" : passed (disabled by user option)."; ! cbmUI->Information(CBM::UI::BenchTest, dum); r=1; *************** *** 520,524 **** info="Error testing "; info+=localPackageAbsoluteName(); ! UI->Fatal(info); } --- 522,526 ---- info="Error testing "; info+=localPackageAbsoluteName(); ! cbmUI->Fatal(info); } *************** *** 526,530 **** } ! int CBMPackage::Release(void) { int r; --- 528,532 ---- } ! int Package::Release(void) { int r; *************** *** 535,539 **** } ! UI->Information(CBMUI::BenchClean, packageName()); --- 537,541 ---- } ! cbmUI->Information(CBM::UI::BenchClean, packageName()); *************** *** 546,550 **** info="Clean failed for "; info+=packageName(); ! /* UI->Fatal(info); */ } --- 548,552 ---- info="Clean failed for "; info+=packageName(); ! /* cbmUI->Fatal(info); */ } *************** *** 552,561 **** } ! int CBMPackage::Install(int _force) { int r; if (downloadURL()=="") { ! UI->Fatal("Package is not known to be hosted anymore on the Internet. Use --fetch option."); } --- 554,563 ---- } ! int Package::Install(int _force) { int r; if (downloadURL()=="") { ! cbmUI->Fatal("Package is not known to be hosted anymore on the Internet. Use --fetch option."); } *************** *** 580,584 **** } ! int CBMPackage::Fetch(char *_source, int _force) { std::string dest = localPackageAbsoluteName(); --- 582,586 ---- } ! int Package::Fetch(char *_source, int _force) { std::string dest = localPackageAbsoluteName(); *************** *** 600,604 **** if (expected_md5==md5) { ! UI->Information(CBMUI::ChecksumOK, dest); --- 602,606 ---- if (expected_md5==md5) { ! cbmUI->Information(CBM::UI::ChecksumOK, dest); *************** *** 606,610 **** return(1); } else { ! UI->Information(CBMUI::ChecksumFailed, dest); } --- 608,612 ---- return(1); } else { ! cbmUI->Information(CBM::UI::ChecksumFailed, dest); } *************** *** 614,626 **** } ! int CBMPackage::Uninstall(void) { std::string statusFile; int r; ! UI->Information(CBMUI::BenchUninstall, ! packageName()); ! statusFile=system->temporaryDirectory(CBMSystem::Status); statusFile+="/"; statusFile+... [truncated message content] |
