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

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

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

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

Index: Benchmark-BENCHPP.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPP.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Benchmark-BENCHPP.cpp	28 Dec 2006 17:41:02 -0000	1.1
--- Benchmark-BENCHPP.cpp	3 Jan 2007 19:15:51 -0000	1.2
***************
*** 8,32 ****
  #include <SupportedBenchmarks/Benchmark-BENCHPP.libwrapper.h>
  
! CBMBenchmarkBENCHPP::CBMBenchmarkBENCHPP(CBMSystem *_system)
!   : CBMBenchmark(_system)
  {
  }
  
! std::string CBMBenchmarkBENCHPP::downloadURL(void)
  {
    return("");
  }
  
! std::string CBMBenchmarkBENCHPP::expectedMD5(void)
  {
    return("61f961031fd3ca116787fffd442ef872");
  }
  
! std::string CBMBenchmarkBENCHPP::packageName(void)
  {
    return("benchpp");
  }
  
! std::string CBMBenchmarkBENCHPP::benchmarkComments(void)
  {
    std::string comment;
--- 8,32 ----
  #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::benchmarkComments(void)
  {
    std::string comment;
***************
*** 38,52 ****
  }
  
! std::string CBMBenchmarkBENCHPP::packageVersion(void)
  {
    return("1.1");
  }
  
! int CBMBenchmarkBENCHPP::packageSize(void)
  {
    return(177532);
  }
  
! std::string CBMBenchmarkBENCHPP::packageComments(void)
  {
    return("The suite is based on the Ada PIWG suite, and therefore is " \
--- 38,52 ----
  }
  
! 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 " \
***************
*** 66,90 ****
  }
  
! std::string CBMBenchmarkBENCHPP::localPackageName(void)
  {
    return("bench_plus_plus_1.1.tar.Z");
  }
  
! std::string CBMBenchmarkBENCHPP::language(void)
  {
    return("C++");
  }
  
! char* CBMBenchmarkBENCHPP::extractDirectory(void)
  {
    return("bench++");
  }
  
! int CBMBenchmarkBENCHPP::hasPatch(void)
  {
    return(1);
  }
  
! int CBMBenchmarkBENCHPP::patch(int _force)
  {
    std::string cmd;
--- 66,90 ----
  }
  
! 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;
***************
*** 112,116 ****
  }
  
! int CBMBenchmarkBENCHPP::extract(int _force)
  {
    std::string localFile = localPackageAbsoluteName();
--- 112,116 ----
  }
  
! int CBMPackageBENCHPP::extract(int _force)
  {
    std::string localFile = localPackageAbsoluteName();
***************
*** 131,140 ****
  }
  
! int CBMBenchmarkBENCHPP::preConfigure(int _force)
  {
    return(1);
  }
  
! int CBMBenchmarkBENCHPP::configure(CBMCompiler        *_currentCompiler,
  				   CBMCompilerOptions *_currentOptions)
  {
--- 131,140 ----
  }
  
! int CBMPackageBENCHPP::preConfigure(int _force)
  {
    return(1);
  }
  
! int CBMPackageBENCHPP::configure(CBMCompiler        *_currentCompiler,
  				   CBMCompilerOptions *_currentOptions)
  {
***************
*** 160,164 ****
  }
  
! int CBMBenchmarkBENCHPP::make(void)
  {
    std::string cmd;
--- 160,164 ----
  }
  
! int CBMPackageBENCHPP::make(void)
  {
    std::string cmd;
***************
*** 198,225 ****
  }
  
! std::string CBMBenchmarkBENCHPP::bench(void)
! {
!   std::string cmd;
!   std::string result;
! 
!   cmd="cd ";
!   cmd+=localPackageAbsoluteDirectory();
!   cmd+=" && echo $(./";
!   cmd+=benchppBenchmark();
!   cmd+=" | ";
!   cmd+=CBM_PROG_TAIL;
!   cmd+=" -1 | ";
!   cmd+=CBM_PROG_CUT;
!   cmd+=" -f2 -d':')";
!   
!   if (system->exec(cmd, result)==0) {
!     return(result);
!   } else {
!     return("0");
!   }
! 
! }
! 
! int CBMBenchmarkBENCHPP::release(void)
  {
    std::string cmd;
--- 198,202 ----
  }
  
! int CBMPackageBENCHPP::release(void)
  {
    std::string cmd;
***************
*** 235,264 ****
  }
  
! std::string CBMBenchmarkBENCHPP::license(void)
  {
    return("Public domain");
  }
  
! std::string CBMBenchmarkBENCHPP::homePage(void)
  {
    return("http://web.archive.org/web/20050307095704/www.research.att.com/~orost/bench_plus_plus.html");
  }
  
! std::string CBMBenchmarkBENCHPP::author(void)
  {
    return("Joseph M. Orost");
  }
  
! int CBMBenchmarkBENCHPP::benchmarkSize(void)
  {
    return(packageSize());
  }
  
  CBMBenchmarkBENCHPP::~CBMBenchmarkBENCHPP()
  {
  }
  
! CBMBenchmarkBENCHPP_DHRYSTONE::CBMBenchmarkBENCHPP_DHRYSTONE(CBMSystem *_system)
!   : CBMBenchmarkBENCHPP(_system)
  {
  }
--- 212,273 ----
  }
  
! 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::bench(void)
+ {
+   std::string cmd;
+   std::string result;
+ 
+   cmd="cd ";
+   cmd+=package->localPackageAbsoluteDirectory();
+   cmd+=" && echo $(./";
+   cmd+=benchppBenchmark();
+   cmd+=" | ";
+   cmd+=CBM_PROG_TAIL;
+   cmd+=" -1 | ";
+   cmd+=CBM_PROG_CUT;
+   cmd+=" -f2 -d':')";
+   
+   if (System()->exec(cmd, result)==0) {
+     return(result);
+   } else {
+     return("0");
+   }
+ 
+ }
+ 
  CBMBenchmarkBENCHPP::~CBMBenchmarkBENCHPP()
  {
  }
  
! CBMBenchmarkBENCHPP_DHRYSTONE::CBMBenchmarkBENCHPP_DHRYSTONE(CBMPackage *_package)
!   : CBMBenchmarkBENCHPP(_package)
  {
  }
***************
*** 283,288 ****
  }
  
! CBMBenchmarkBENCHPP_WHETSTONE::CBMBenchmarkBENCHPP_WHETSTONE(CBMSystem *_system)
!   : CBMBenchmarkBENCHPP(_system)
  {
  }
--- 292,297 ----
  }
  
! CBMBenchmarkBENCHPP_WHETSTONE::CBMBenchmarkBENCHPP_WHETSTONE(CBMPackage *_package)
!   : CBMBenchmarkBENCHPP(_package)
  {
  }
***************
*** 308,313 ****
  
  
! CBMBenchmarkBENCHPP_STEPANOV::CBMBenchmarkBENCHPP_STEPANOV(CBMSystem *_system)
!   : CBMBenchmarkBENCHPP(_system)
  {
  }
--- 317,322 ----
  
  
! CBMBenchmarkBENCHPP_STEPANOV::CBMBenchmarkBENCHPP_STEPANOV(CBMPackage *_package)
!   : CBMBenchmarkBENCHPP(_package)
  {
  }
***************
*** 319,323 ****
  
    cmd="cd ";
!   cmd+=localPackageAbsoluteDirectory();
    cmd+=" && echo $(./";
    cmd+=benchppBenchmark();
--- 328,332 ----
  
    cmd="cd ";
!   cmd+=package->localPackageAbsoluteDirectory();
    cmd+=" && echo $(./";
    cmd+=benchppBenchmark();
***************
*** 328,332 ****
    cmd+=" -f3 -d':')";
    
!   if (system->exec(cmd, result)==0) {
      return(result);
    } else {
--- 337,341 ----
    cmd+=" -f3 -d':')";
    
!   if (System()->exec(cmd, result)==0) {
      return(result);
    } else {
***************
*** 339,344 ****
  }
  
! CBMBenchmarkBENCHPP_STEPANOV_AL12::CBMBenchmarkBENCHPP_STEPANOV_AL12(CBMSystem *_system)
!   : CBMBenchmarkBENCHPP_STEPANOV(_system)
  {
  }
--- 348,353 ----
  }
  
! CBMBenchmarkBENCHPP_STEPANOV_AL12::CBMBenchmarkBENCHPP_STEPANOV_AL12(CBMPackage *_package)
!   : CBMBenchmarkBENCHPP_STEPANOV(_package)
  {
  }

Index: Benchmark-BENCHPP.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPP.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Benchmark-BENCHPP.h	28 Dec 2006 17:41:02 -0000	1.1
--- Benchmark-BENCHPP.h	3 Jan 2007 19:15:51 -0000	1.2
***************
*** 11,18 ****
  
  #include <Benchmark/Benchmark.h>
  
  /** \brief Defines the benchpp package.
   */
! class CBMBenchmarkBENCHPP : public CBMBenchmark
  {
   public:
--- 11,19 ----
  
  #include <Benchmark/Benchmark.h>
+ #include <Benchmark/Package.h>
  
  /** \brief Defines the benchpp package.
   */
! class CBMPackageBENCHPP : public CBMPackage
  {
   public:
***************
*** 32,40 ****
  
   protected:
- 
-   CBMBenchmarkBENCHPP(class CBMSystem *_system);
- 
    virtual std::string language(void);
-   virtual std::string benchppBenchmark(void) = 0;
  
    virtual std::string benchmarkBENCHPPComments(void) = 0;
--- 33,37 ----
***************
*** 50,57 ****
  
    virtual int make(void);
-   virtual std::string bench(void);
    virtual int release(void);
  
   public:
    virtual std::string license(void);
    virtual std::string homePage(void);
--- 47,56 ----
  
    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);
***************
*** 59,66 ****
  
    virtual int benchmarkSize(void);
!   virtual ~CBMBenchmarkBENCHPP();
  		
  };
  
  /** \brief Defines the dhrystone benchmark within benchpp package.
   */
--- 58,76 ----
  
    virtual int benchmarkSize(void);
!   virtual ~CBMPackageBENCHPP();
  		
  };
  
+ /** \brief Abstract benchmark definition for CBMPackageBENCHPP
+  */
+ class CBMBenchmarkBENCHPP : public CBMBenchmark
+ {
+  protected:
+   CBMBenchmarkBENCHPP(CBMPackage *_package);
+   virtual std::string benchppBenchmark(void) = 0;
+   virtual std::string bench(void);
+   virtual ~CBMBenchmarkBENCHPP();
+ };
+ 
  /** \brief Defines the dhrystone benchmark within benchpp package.
   */
***************
*** 75,79 ****
  
   public:
!   CBMBenchmarkBENCHPP_DHRYSTONE(class CBMSystem *_system);
    virtual ~CBMBenchmarkBENCHPP_DHRYSTONE();
  };
--- 85,89 ----
  
   public:
!   CBMBenchmarkBENCHPP_DHRYSTONE(CBMPackage *_package);
    virtual ~CBMBenchmarkBENCHPP_DHRYSTONE();
  };
***************
*** 91,95 ****
  
   public:
!   CBMBenchmarkBENCHPP_WHETSTONE(class CBMSystem *_system);
    virtual ~CBMBenchmarkBENCHPP_WHETSTONE();
  };
--- 101,105 ----
  
   public:
!   CBMBenchmarkBENCHPP_WHETSTONE(CBMPackage *_package);
    virtual ~CBMBenchmarkBENCHPP_WHETSTONE();
  };
***************
*** 102,106 ****
    virtual std::string bench(void);
   public:
!   CBMBenchmarkBENCHPP_STEPANOV(class CBMSystem *_system);
    virtual ~CBMBenchmarkBENCHPP_STEPANOV();
  };
--- 112,116 ----
    virtual std::string bench(void);
   public:
!   CBMBenchmarkBENCHPP_STEPANOV(CBMPackage *_package);
    virtual ~CBMBenchmarkBENCHPP_STEPANOV();
  };
***************
*** 116,124 ****
    virtual std::string benchppBenchmark(void);
   public:
!   CBMBenchmarkBENCHPP_STEPANOV_AL12(class CBMSystem *_system);
    virtual ~CBMBenchmarkBENCHPP_STEPANOV_AL12();
  };
  
! lib_declare();
  
  #endif
--- 126,134 ----
    virtual std::string benchppBenchmark(void);
   public:
!   CBMBenchmarkBENCHPP_STEPANOV_AL12(CBMPackage *_package);
    virtual ~CBMBenchmarkBENCHPP_STEPANOV_AL12();
  };
  
! DLdeclare();
  
  #endif