[Compbench-devel] CompBenchmarks++/SupportedBenchmarks Benchmark-BZIP2.cpp, 1.2, 1.3 Benchmark-BZIP2.h, 1.1, 1.2 Benchmark-GZIP.cpp, 1.2, 1.3 Benchmark-GZIP.h, 1.1, 1.2

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

Update of /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17994

Modified Files:
	Benchmark-BZIP2.cpp Benchmark-BZIP2.h Benchmark-GZIP.cpp 
	Benchmark-GZIP.h 
Log Message:
CBMPackage and new related API used.

Index: Benchmark-GZIP.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-GZIP.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Benchmark-GZIP.h	28 Dec 2006 17:41:03 -0000	1.1
--- Benchmark-GZIP.h	3 Jan 2007 18:49:56 -0000	1.2
***************
*** 14,18 ****
  /** \brief Defines the gzip package.
   */
! class CBMBenchmarkGZIP : public CBMBenchmarkxZIP
  {
   private:
--- 14,18 ----
  /** \brief Defines the gzip package.
   */
! class CBMPackageGZIP : public CBMPackagexZIP
  {
   private:
***************
*** 36,40 ****
  
   public:
!   CBMBenchmarkGZIP(class CBMSystem *_system);
  
    virtual std::string benchmarkProgram(void);
--- 36,41 ----
  
   public:
!   CBMPackageGZIP(class CBMSystem *_system);
!   DLPackageWrapper_declare();
  
    virtual std::string benchmarkProgram(void);
***************
*** 44,48 ****
  
    virtual int benchmarkSize(void);
!   virtual ~CBMBenchmarkGZIP();
  		
  };
--- 45,49 ----
  
    virtual int benchmarkSize(void);
!   virtual ~CBMPackageGZIP();
  		
  };
***************
*** 50,54 ****
  /** \brief Defines the gzip benchmark using fastest compression level.
   */
! class CBMBenchmarkGZIP1 : public CBMBenchmarkGZIP
  {
   protected:
--- 51,55 ----
  /** \brief Defines the gzip benchmark using fastest compression level.
   */
! class CBMBenchmarkGZIP1 : public CBMBenchmarkxZIP
  {
   protected:
***************
*** 57,61 ****
  
   public:
!   CBMBenchmarkGZIP1(class CBMSystem *_system);
    virtual std::string benchmarkName(void);
    virtual ~CBMBenchmarkGZIP1();
--- 58,62 ----
  
   public:
!   CBMBenchmarkGZIP1(CBMPackage *_package);
    virtual std::string benchmarkName(void);
    virtual ~CBMBenchmarkGZIP1();
***************
*** 64,68 ****
  /** \brief Defines the gzip benchmark using maximum compression level.
   */
! class CBMBenchmarkGZIP9 : public CBMBenchmarkGZIP
  {
   protected:
--- 65,69 ----
  /** \brief Defines the gzip benchmark using maximum compression level.
   */
! class CBMBenchmarkGZIP9 : public CBMBenchmarkxZIP
  {
   protected:
***************
*** 71,75 ****
   public:
  
!   CBMBenchmarkGZIP9(class CBMSystem *_system);
  
    virtual std::string benchmarkName(void);
--- 72,76 ----
   public:
  
!   CBMBenchmarkGZIP9(CBMPackage *_package);
  
    virtual std::string benchmarkName(void);
***************
*** 77,80 ****
  };
  
! lib_declare();
  #endif
--- 78,81 ----
  };
  
! DLdeclare();
  #endif

Index: Benchmark-GZIP.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-GZIP.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Benchmark-GZIP.cpp	3 Jan 2007 17:29:50 -0000	1.2
--- Benchmark-GZIP.cpp	3 Jan 2007 18:49:56 -0000	1.3
***************
*** 8,62 ****
  #include <SupportedBenchmarks/Benchmark-GZIP.libwrapper.h>
  
! CBMBenchmarkGZIP::CBMBenchmarkGZIP(CBMSystem *_system)
!   : CBMBenchmarkxZIP(_system)
  {
  }
  
! std::string CBMBenchmarkGZIP::downloadURL(void)
  {
    return("ftp://ftp.netscape.com/pub/unsupported/gnu/gzip-1.2.4.tar.Z");
  }
  
! std::string CBMBenchmarkGZIP::expectedMD5(void)
  {
    return("bfc104a6eaf1704be524c879bc9d29bc");
  }
  
! std::string CBMBenchmarkGZIP::packageName(void)
  {
    return("gzip");
  }
  
! std::string CBMBenchmarkGZIP::packageVersion(void)
  {
    return("1.2.4");
  }
  
! int CBMBenchmarkGZIP::packageSize(void)
  {
    return(327865);
  }
  
! std::string CBMBenchmarkGZIP::packageComments(void)
  {
    return("Official gzip-1.2.4 source package.");
  }
  
! std::string CBMBenchmarkGZIP::localPackageName(void)
  {
    return("gzip-1.2.4.tar.Z");
  }
  
! std::string CBMBenchmarkGZIP::language(void)
  {
    return("C");
  }
  
! int CBMBenchmarkGZIP::hasTest(void)
  {
    return(1);
  }
  
! int CBMBenchmarkGZIP::test(void)
  {
    std::string cmd;
--- 8,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;
***************
*** 72,111 ****
  }
  
! char* CBMBenchmarkGZIP::extractDirectory(void)
  {
    return("gzip-1.2.4");
  }
  
! std::string CBMBenchmarkGZIP::benchmarkProgram(void)
  {
    return("gzip");
  }
  
! std::string CBMBenchmarkGZIP::license(void)
  {
    return("GPL v2");
  }
  
! std::string CBMBenchmarkGZIP::homePage(void)
  {
    return("http://www.gzip.org");
  }
  
! std::string CBMBenchmarkGZIP::author(void)
  {
    return("Jean-loup Gailly & Mark Adler");
  }
  
! int CBMBenchmarkGZIP::benchmarkSize(void)
  {
    return(76546048);
  }
  
! CBMBenchmarkGZIP::~CBMBenchmarkGZIP()
  {
  }
    
! CBMBenchmarkGZIP1::CBMBenchmarkGZIP1(CBMSystem *_system)
!   : CBMBenchmarkGZIP(_system)
  {
  }
--- 72,111 ----
  }
  
! char* CBMPackageGZIP::extractDirectory(void)
  {
    return("gzip-1.2.4");
  }
  
! std::string CBMPackageGZIP::benchmarkProgram(void)
  {
    return("gzip");
  }
  
! 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()
  {
  }
    
! CBMBenchmarkGZIP1::CBMBenchmarkGZIP1(CBMPackage *_package)
!   : CBMBenchmarkxZIP(_package)
  {
  }
***************
*** 130,135 ****
  }
  
! CBMBenchmarkGZIP9::CBMBenchmarkGZIP9(CBMSystem *_system)
!   : CBMBenchmarkGZIP(_system)
  {
  }
--- 130,135 ----
  }
  
! CBMBenchmarkGZIP9::CBMBenchmarkGZIP9(CBMPackage *_package)
!   : CBMBenchmarkxZIP(_package)
  {
  }

Index: Benchmark-BZIP2.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BZIP2.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Benchmark-BZIP2.h	28 Dec 2006 17:41:02 -0000	1.1
--- Benchmark-BZIP2.h	3 Jan 2007 18:49:56 -0000	1.2
***************
*** 6,10 ****
  /** \brief Defines the bzip2 package.
   */
! class CBMBenchmarkBZIP2 : public CBMBenchmarkxZIP
  {
   private:
--- 6,10 ----
  /** \brief Defines the bzip2 package.
   */
! class CBMPackageBZIP2 : public CBMPackagexZIP
  {
   private:
***************
*** 35,39 ****
    virtual int test(void);
   public:
!   CBMBenchmarkBZIP2(class CBMSystem *_system);
  
    virtual std::string benchmarkProgram(void);
--- 35,40 ----
    virtual int test(void);
   public:
!   CBMPackageBZIP2(class CBMSystem *_system);
!   DLPackageWrapper_declare();
  
    virtual std::string benchmarkProgram(void);
***************
*** 43,47 ****
  
    virtual int benchmarkSize(void);
!   virtual ~CBMBenchmarkBZIP2();
  		
  };
--- 44,48 ----
  
    virtual int benchmarkSize(void);
!   virtual ~CBMPackageBZIP2();
  		
  };
***************
*** 49,53 ****
  /** \brief Defines the bzip2 benchmark using fastest compression level.
   */
! class CBMBenchmarkBZIP21 : public CBMBenchmarkBZIP2
  {
   protected:
--- 50,54 ----
  /** \brief Defines the bzip2 benchmark using fastest compression level.
   */
! class CBMBenchmarkBZIP21 : public CBMBenchmarkxZIP
  {
   protected:
***************
*** 56,60 ****
  
   public:
!   CBMBenchmarkBZIP21(class CBMSystem *_system);
    virtual std::string benchmarkName(void);
    virtual ~CBMBenchmarkBZIP21();
--- 57,61 ----
  
   public:
!   CBMBenchmarkBZIP21(CBMPackage *_package);
    virtual std::string benchmarkName(void);
    virtual ~CBMBenchmarkBZIP21();
***************
*** 63,67 ****
  /** \brief Defines the bzip2 benchmark using maximum compression level.
   */
! class CBMBenchmarkBZIP29 : public CBMBenchmarkBZIP2
  {
   protected:
--- 64,68 ----
  /** \brief Defines the bzip2 benchmark using maximum compression level.
   */
! class CBMBenchmarkBZIP29 : public CBMBenchmarkxZIP
  {
   protected:
***************
*** 70,74 ****
   public:
  
!   CBMBenchmarkBZIP29(class CBMSystem *_system);
  
    virtual std::string benchmarkName(void);
--- 71,75 ----
   public:
  
!   CBMBenchmarkBZIP29(CBMPackage *_package);
  
    virtual std::string benchmarkName(void);
***************
*** 76,80 ****
  };
  
! lib_declare();
  
  #endif
--- 77,81 ----
  };
  
! DLdeclare();
  
  #endif

Index: Benchmark-BZIP2.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BZIP2.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Benchmark-BZIP2.cpp	3 Jan 2007 17:29:50 -0000	1.2
--- Benchmark-BZIP2.cpp	3 Jan 2007 18:49:56 -0000	1.3
***************
*** 9,58 ****
  #include <SupportedBenchmarks/Benchmark-BZIP2.libwrapper.h>
  
! CBMBenchmarkBZIP2::CBMBenchmarkBZIP2(CBMSystem *_system)
!   : CBMBenchmarkxZIP(_system)
  {
  }
  
! std::string CBMBenchmarkBZIP2::downloadURL(void)
  {
    return("http://www.bzip.org/1.0.3/bzip2-1.0.3.tar.gz");
  }
  
! std::string CBMBenchmarkBZIP2::expectedMD5(void)
  {
    return("8a716bebecb6e647d2e8a29ea5d8447f");
  }
  
! std::string CBMBenchmarkBZIP2::packageName(void)
  {
    return("bzip2");
  }
  
! std::string CBMBenchmarkBZIP2::packageVersion(void)
  {
    return("1.0.3");
  }
  
! int CBMBenchmarkBZIP2::packageSize(void)
  {
    return(669075);
  }
  
! std::string CBMBenchmarkBZIP2::packageComments(void)
  {
    return("Official bzip2-1.0.3 source package.");
  }
  
! std::string CBMBenchmarkBZIP2::localPackageName(void)
  {
    return("bzip2-1.0.3.tar.Z");
  }
  
! std::string CBMBenchmarkBZIP2::language(void)
  {
    return("C");
  }
  
! int CBMBenchmarkBZIP2::configure(CBMCompiler        *_currentCompiler,
  				 CBMCompilerOptions *_currentOptions)
  {
--- 9,58 ----
  #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)
  {
***************
*** 60,64 ****
  }
  
! int CBMBenchmarkBZIP2::make(void)
  {
    std::string cmd;
--- 60,64 ----
  }
  
! int CBMPackageBZIP2::make(void)
  {
    std::string cmd;
***************
*** 98,107 ****
  }
  
! int CBMBenchmarkBZIP2::hasTest(void)
  {
    return(1);
  }
  
! int CBMBenchmarkBZIP2::test(void)
  {
    std::string cmd;
--- 98,107 ----
  }
  
! int CBMPackageBZIP2::hasTest(void)
  {
    return(1);
  }
  
! int CBMPackageBZIP2::test(void)
  {
    std::string cmd;
***************
*** 117,156 ****
  }
  
! char* CBMBenchmarkBZIP2::extractDirectory(void)
  {
    return("bzip2-1.0.3");
  }
  
! std::string CBMBenchmarkBZIP2::benchmarkProgram(void)
  {
    return("bzip2");
  }
  
! std::string CBMBenchmarkBZIP2::license(void)
  {
    return("BSD-style");
  }
  
! std::string CBMBenchmarkBZIP2::homePage(void)
  {
    return("http://www.bzip.org");
  }
  
! std::string CBMBenchmarkBZIP2::author(void)
  {
    return("Julian Seward");
  }
  
! int CBMBenchmarkBZIP2::benchmarkSize(void)
  {
    return(76546048);
  }
  
! CBMBenchmarkBZIP2::~CBMBenchmarkBZIP2()
  {
  }
    
! CBMBenchmarkBZIP21::CBMBenchmarkBZIP21(CBMSystem *_system)
!   : CBMBenchmarkBZIP2(_system)
  {
  }
--- 117,156 ----
  }
  
! char* CBMPackageBZIP2::extractDirectory(void)
  {
    return("bzip2-1.0.3");
  }
  
! std::string CBMPackageBZIP2::benchmarkProgram(void)
  {
    return("bzip2");
  }
  
! 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()
  {
  }
    
! CBMBenchmarkBZIP21::CBMBenchmarkBZIP21(CBMPackage *_package)
!   : CBMBenchmarkxZIP(_package)
  {
  }
***************
*** 175,180 ****
  }
  
! CBMBenchmarkBZIP29::CBMBenchmarkBZIP29(CBMSystem *_system)
!   : CBMBenchmarkBZIP2(_system)
  {
  }
--- 175,180 ----
  }
  
! CBMBenchmarkBZIP29::CBMBenchmarkBZIP29(CBMPackage *_package)
!   : CBMBenchmarkxZIP(_package)
  {
  }