[Compbench-devel] CompBenchmarks++/libcompbenchmarks/Benchmark Benchmark.cpp, 1.10, 1.11 Benchmark-
Brought to you by:
xfred
Menu
▾
▴
[Compbench-devel] CompBenchmarks++/libcompbenchmarks/Benchmark Benchmark.cpp, 1.10, 1.11 Benchmark-xZIP.cpp, 1.4, 1.5 Package.cpp, 1.13, 1.14
|
From: Frederic T. <xf...@us...> - 2007-06-06 15:59:51
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10801 Modified Files: Benchmark.cpp Benchmark-xZIP.cpp Package.cpp Log Message: XML based message reporting. Index: Package.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Package.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Package.cpp 16 May 2007 12:06:17 -0000 1.13 --- Package.cpp 6 Jun 2007 15:59:47 -0000 1.14 *************** *** 213,218 **** if (cbmSystem->fileExists(localFile)) { ! cbmUI->Information(CBM::UI::Checksum, ! localFile); expected_md5=expectedMD5(); --- 213,217 ---- if (cbmSystem->fileExists(localFile)) { ! cbmUI->msgChecksum(localFile); expected_md5=expectedMD5(); *************** *** 220,249 **** if (expected_md5==md5) { ! cbmUI->Information(CBM::UI::Checksum, ! CBM::UI::OK); ! storeStatus(Downloaded); return(1); } else { ! cbmUI->Information(CBM::UI::Checksum, ! CBM::UI::Failed); system->unlink((char*) localFile.c_str()); ! info="Unsuccesfull download "; info+=downloadURL(); info+=" to "; info+=localFile; ! cbmUI->Fatal(info); return(0); } } else { - cbmUI->Information(CBM::UI::Checksum, - CBM::UI::Failed); - info="Can't download "; info+=downloadURL(); info+=" to "; info+=localFile; ! cbmUI->Fatal(info); ! system->unlink((char*) localFile.c_str()); } --- 219,241 ---- if (expected_md5==md5) { ! cbmUI->outputOK(); storeStatus(Downloaded); return(1); } else { ! cbmUI->outputKO(); system->unlink((char*) localFile.c_str()); ! info="Invalid checksum. Unsuccesfull download "; info+=downloadURL(); info+=" to "; info+=localFile; ! cbmUI->msgFatal(info); return(0); } } else { info="Can't download "; info+=downloadURL(); info+=" to "; info+=localFile; ! cbmUI->outputKO(info); system->unlink((char*) localFile.c_str()); } *************** *** 260,265 **** } ! cbmUI->Information(CBM::UI::PackageExtract, ! Name()); r=extract(_force); --- 252,256 ---- } ! cbmUI->msgExtract(Name()); r=extract(_force); *************** *** 267,276 **** if (r) { storeStatus(Extracted); ! cbmUI->Information(CBM::UI::PackageExtract, ! CBM::UI::OK); } else { ! cbmUI->Information(CBM::UI::PackageExtract, ! CBM::UI::Failed); std::string info; info="Error extracting "; --- 258,265 ---- if (r) { storeStatus(Extracted); ! cbmUI->outputOK(); } else { ! cbmUI->outputKO(); std::string info; info="Error extracting "; *************** *** 278,282 **** info+=" into "; info+=system->Directory(System::Extract); ! cbmUI->Fatal(info); } --- 267,271 ---- info+=" into "; info+=system->Directory(System::Extract); ! cbmUI->msgFatal(info); } *************** *** 296,316 **** } ! cbmUI->Information(CBM::UI::PackagePatch, ! Name()); ! r=patch(_force); if (r) { storeStatus(Patched); ! cbmUI->Information(CBM::UI::PackagePatch, ! CBM::UI::OK); ! } else { ! cbmUI->Information(CBM::UI::PackagePatch, ! CBM::UI::Failed); std::string info; info="Error patching "; info+=localAbsoluteName(); ! cbmUI->Fatal(info); } --- 285,300 ---- } ! cbmUI->msgPatch(Name()); r=patch(_force); if (r) { storeStatus(Patched); ! cbmUI->outputOK(); } else { ! cbmUI->outputKO(); std::string info; info="Error patching "; info+=localAbsoluteName(); ! cbmUI->msgFatal(info); } *************** *** 331,346 **** ! cbmUI->Information(CBM::UI::PackagePreconfigure, ! Name()); ! r=preConfigure(_force); if (r) { storeStatus(Preconfigured); ! cbmUI->Information(CBM::UI::PackagePreconfigure, ! CBM::UI::OK); } else { ! cbmUI->Information(CBM::UI::PackagePreconfigure, ! CBM::UI::Failed); std::string info; --- 315,326 ---- ! cbmUI->msgPreconfigure(Name()); r=preConfigure(_force); if (r) { storeStatus(Preconfigured); ! cbmUI->outputOK(); } else { ! cbmUI->outputKO(); std::string info; *************** *** 348,352 **** info+=Name(); info+="'s pre-configuration"; ! cbmUI->Fatal(info); } return(r); --- 328,332 ---- info+=Name(); info+="'s pre-configuration"; ! cbmUI->msgFatal(info); } return(r); *************** *** 385,400 **** info+=language(); info+="."; ! cbmUI->Fatal(info); } ! cbmUI->Information(CBM::UI::PackageConfigure, ! info); ! r=configure(_currentCompiler, _currentOptions); if (r) { ! cbmUI->Information(CBM::UI::PackageConfigure, ! CBM::UI::OK); storeStatus(Configured); --- 365,378 ---- info+=language(); info+="."; ! cbmUI->msgFatal(info); ! return(0); } ! cbmUI->msgConfigure(info); r=configure(_currentCompiler, _currentOptions); if (r) { ! cbmUI->outputOK(); storeStatus(Configured); *************** *** 402,410 **** currentOptions=_currentOptions; } else { ! cbmUI->Information(CBM::UI::PackageConfigure, ! CBM::UI::Failed); info="Configure failed for "; info+=Name(); ! cbmUI->Fatal(info); } --- 380,387 ---- currentOptions=_currentOptions; } else { ! cbmUI->outputKO(); info="Configure failed for "; info+=Name(); ! cbmUI->msgFatal(info); } *************** *** 424,429 **** } ! cbmUI->Information(CBM::UI::PackageMake, ! Name()); system->startTimer(); --- 401,405 ---- } ! cbmUI->msgMake(Name()); system->startTimer(); *************** *** 433,449 **** sprintf(tmp, "%f", end); lastBuildTime=tmp; ! std::cout << "Build time : " << lastBuildTime << std::endl; storeStatus(Made); storeContext(currentCompiler, currentOptions); System()->storeConfiguration(); ! cbmUI->Information(CBM::UI::PackageMake, ! CBM::UI::OK); } else { ! cbmUI->Information(CBM::UI::PackageMake, ! CBM::UI::Failed); info="Make failed for "; info+=Name(); ! cbmUI->Fatal(info); } --- 409,425 ---- sprintf(tmp, "%f", end); lastBuildTime=tmp; ! std::string i = "Build time : "; ! i+=lastBuildTime; ! cbmUI->outputInfo(i); storeStatus(Made); storeContext(currentCompiler, currentOptions); System()->storeConfiguration(); ! cbmUI->outputOK(); } else { ! cbmUI->outputKO(); info="Make failed for "; info+=Name(); ! cbmUI->msgFatal(info); } *************** *** 466,470 **** if (getStatus()<Configured) { ! cbmUI->Fatal("Package is not configured"); } --- 442,446 ---- if (getStatus()<Configured) { ! cbmUI->msgFatal("Package is not configured"); } *************** *** 479,492 **** if (UO_enableTestSuite) { ! cbmUI->Information(CBM::UI::PackageTest, ! Name()); ! ! r=test(_force); } else { dum=Name(); dum+=" : passed (disabled by user option)."; ! cbmUI->Information(CBM::UI::PackageTest, ! dum); r=1; } --- 455,464 ---- if (UO_enableTestSuite) { ! cbmUI->msgTest(Name()); r=test(_force); } else { dum=Name(); dum+=" : passed (disabled by user option)."; ! cbmUI->outputInfo(dum); r=1; } *************** *** 494,506 **** if (r) { storeStatus(Tested); ! cbmUI->Information(CBM::UI::PackageTest, ! CBM::UI::OK); } else { ! cbmUI->Information(CBM::UI::PackageTest, ! CBM::UI::Failed); std::string info; info="Error testing "; info+=localAbsoluteName(); ! cbmUI->Fatal(info); } --- 466,476 ---- if (r) { storeStatus(Tested); ! cbmUI->outputOK(); } else { ! cbmUI->outputKO(); std::string info; info="Error testing "; info+=localAbsoluteName(); ! cbmUI->msgFatal(info); } *************** *** 517,522 **** } ! cbmUI->Information(CBM::UI::PackageClean, ! Name()); --- 487,491 ---- } ! cbmUI->msgRelease(Name()); *************** *** 525,536 **** resetContext(); storeStatus(Preconfigured); ! cbmUI->Information(CBM::UI::PackageClean, ! CBM::UI::OK); } else { ! cbmUI->Information(CBM::UI::PackageClean, ! CBM::UI::Failed); info="Clean failed for "; info+=Name(); ! /* cbmUI->Fatal(info); */ } --- 494,503 ---- resetContext(); storeStatus(Preconfigured); ! cbmUI->outputOK(); } else { ! cbmUI->outputKO(); info="Clean failed for "; info+=Name(); ! cbmUI->msgFatal(info); } *************** *** 542,547 **** int r; if (downloadURL()=="") { ! cbmUI->Fatal("Package is not known to be hosted anymore on the Internet. Use --fetch option."); } --- 509,516 ---- int r; + cbmUI->msgInstall(Name()); if (downloadURL()=="") { ! cbmUI->msgFatal("Package is not known to be hosted anymore on the Internet. Use --fetch option."); ! return(0); } *************** *** 549,554 **** r=Download(_force); ! if (!r) return(0); r=Extract(_force); --- 518,525 ---- r=Download(_force); ! if (!r) { ! cbmUI->outputKO(); return(0); + } r=Extract(_force); *************** *** 558,566 **** if (hasPatch()) { r=Patch(); ! if (!r) return(0); } r=PreConfigure(_force); return(r); } --- 529,544 ---- if (hasPatch()) { r=Patch(); ! if (!r) { ! cbmUI->outputKO(); return(0); + } } r=PreConfigure(_force); + + if (r) + cbmUI->outputOK(); + else + cbmUI->outputKO(); return(r); } *************** *** 577,580 **** --- 555,560 ---- } + cbmUI->msgFetch(Name()); + if (dest!=source) { cbmSystem->copy(source, dest); *************** *** 584,602 **** expected_md5=expectedMD5(); - cbmUI->Information(CBM::UI::Checksum, - dest); md5=system->md5File(dest); if (expected_md5==md5) { ! cbmUI->Information(CBM::UI::Checksum, ! CBM::UI::OK); ! storeStatus(Downloaded); return(1); } else { ! cbmUI->Information(CBM::UI::Checksum, ! CBM::UI::Failed); } } --- 564,580 ---- expected_md5=expectedMD5(); md5=system->md5File(dest); if (expected_md5==md5) { ! cbmUI->outputOK("Checksum verified"); storeStatus(Downloaded); return(1); } else { ! cbmUI->outputKO("Bad checksum"); } + } else { + cbmUI->outputKO(); + cbmUI->msgFatal("Invalid destination file"); } *************** *** 608,613 **** int r; ! cbmUI->Information(CBM::UI::PackageUninstall, ! Name()); if (getStatus()!=Unknown) { --- 586,590 ---- int r; ! cbmUI->msgUninstall(Name()); if (getStatus()!=Unknown) { *************** *** 620,632 **** if (r) ! cbmUI->Information(CBM::UI::PackageUninstall, ! CBM::UI::OK); else ! cbmUI->Information(CBM::UI::PackageUninstall, ! CBM::UI::Failed); return(r); } else { ! cbmUI->Information(CBM::UI::PackageUninstall, ! CBM::UI::Failed); return(0); } --- 597,606 ---- if (r) ! cbmUI->outputOK(); else ! cbmUI->outputKO(); return(r); } else { ! cbmUI->outputKO(); return(0); } Index: Benchmark-xZIP.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Benchmark-xZIP.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Benchmark-xZIP.cpp 16 May 2007 12:07:09 -0000 1.4 --- Benchmark-xZIP.cpp 6 Jun 2007 15:59:47 -0000 1.5 *************** *** 63,69 **** while(!T.Terminated()) { sleep(1); ! cbmUI->Information(CBM::UI::PackagePreconfigure, ! CBM::UI::Running, ! T.Progress()); } --- 63,67 ---- while(!T.Terminated()) { sleep(1); ! cbmUI->Progress(T.Progress()); } Index: Benchmark.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Benchmark.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Benchmark.cpp 23 May 2007 18:23:16 -0000 1.10 --- Benchmark.cpp 6 Jun 2007 15:59:47 -0000 1.11 *************** *** 59,77 **** char tmp[128]; if (((Package()->getStatus()<Package::Tested) && (Package()->hasTest())) && (UO_enableTestSuite)) { info=Name(); info+=" not tested !"; ! cbmUI->Information(CBM::UI::PackageTest, ! info, ! CBM::UI::Failed); ! return("0"); } - cbmUI->Information(CBM::UI::BenchBench, - Name()); - - System()->startTimer(); r=bench(); --- 59,71 ---- char tmp[128]; + cbmUI->msgBench(Name()); if (((Package()->getStatus()<Package::Tested) && (Package()->hasTest())) && (UO_enableTestSuite)) { info=Name(); info+=" not tested !"; ! cbmUI->outputKO(info); return("0"); } System()->startTimer(); r=bench(); *************** *** 83,98 **** lastExecutionTime=tmp; Package()->storeStatus(Package::Benchmarked); ! cbmUI->Information(CBM::UI::BenchResult, ! CBM::UI::OK); ! cbmUI->InformationBenchmarkResult(Name(), ! tmp, ! r); } else { ! cbmUI->Information(CBM::UI::BenchResult, ! CBM::UI::Failed); info="Benchmarking failed for "; info+=Package()->Name(); ! cbmUI->Fatal(info); } --- 77,93 ---- lastExecutionTime=tmp; Package()->storeStatus(Package::Benchmarked); ! std::string i_tme = "Execution time : "; ! i_tme+=tmp; ! std::string i_r = "Result : "; ! i_r+=r; ! cbmUI->outputInfo(i_tme); ! cbmUI->outputInfo(i_r); ! cbmUI->outputOK(); } else { ! cbmUI->outputKO(); info="Benchmarking failed for "; info+=Package()->Name(); ! cbmUI->msgFatal(info); } |
