[Compbench-devel] CompBenchmarks++/Benchmark Benchmark-Autotools.cpp, 1.6, 1.7 Benchmark-Autotools.h, 1.6, 1.7 Benchmark.cpp, 1.20, 1.21 Benchmark-DLLoader.cpp, 1.7, 1.8 Benchmark-xZIP.cpp, 1.4, 1.5 Package.cpp, 1.7, 1.8 Package.h, 1.7, 1.8

[Frederic T. <xf...@us...>]

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