compbench-devel

[Compbench-devel] CompBenchmarks++/Benchmark Benchmark-BENCHPPLINUX.cpp, 1.2, 1.3 benchmarks.list, 1.3, 1.4

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

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

Modified Files:
	Benchmark-BENCHPPLINUX.cpp benchmarks.list 
Log Message:
benchpplinux benchmarks' prefix set to benchpp-linux.

Index: benchmarks.list
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/benchmarks.list,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** benchmarks.list	11 Dec 2006 20:12:28 -0000	1.3
--- benchmarks.list	11 Dec 2006 20:21:55 -0000	1.4
***************
*** 24,37 ****
  benchpp-whetstone:BENCHPP:BENCHPP_WHETSTONE
  benchpp-stepanov-al12:BENCHPP:BENCHPP_STEPANOV_AL12
! benchpplinux-dhrystone:BENCHPPLINUX:BENCHPPLINUX_DHRYSTONE
! benchpplinux-whetstone:BENCHPPLINUX:BENCHPPLINUX_WHETSTONE
! benchpplinux-bool-assign:BENCHPPLINUX:BENCHPPLINUX_BOOL_ASSIGN
! benchpplinux-bool-if:BENCHPPLINUX:BENCHPPLINUX_BOOL_IF
! benchpplinux-2wifelse:BENCHPPLINUX:BENCHPPLINUX_2WAY_IFELSE
! benchpplinux-2wswitch:BENCHPPLINUX:BENCHPPLINUX_2WAY_SWITCH
! benchpplinux-10wifelse:BENCHPPLINUX:BENCHPPLINUX_10WAY_IFELSE
! benchpplinux-10wswitch:BENCHPPLINUX:BENCHPPLINUX_10WAY_SWITCH
! benchpplinux-10wsparseswitch:BENCHPPLINUX:BENCHPPLINUX_10WAY_SPARSE_SWITCH
! benchpplinux-10wvfc:BENCHPPLINUX:BENCHPPLINUX_10WAY_VFC
  linpackc-sp-unroll:LINPACKC:LINPACKC_SP_UNROLL
  linpackc-sp-roll:LINPACKC:LINPACKC_SP_ROLL
--- 24,37 ----
  benchpp-whetstone:BENCHPP:BENCHPP_WHETSTONE
  benchpp-stepanov-al12:BENCHPP:BENCHPP_STEPANOV_AL12
! benchpp-linux-dhrystone:BENCHPPLINUX:BENCHPPLINUX_DHRYSTONE
! benchpp-linux-whetstone:BENCHPPLINUX:BENCHPPLINUX_WHETSTONE
! benchpp-linux-bool-assign:BENCHPPLINUX:BENCHPPLINUX_BOOL_ASSIGN
! benchpp-linux-bool-if:BENCHPPLINUX:BENCHPPLINUX_BOOL_IF
! benchpp-linux-2wifelse:BENCHPPLINUX:BENCHPPLINUX_2WAY_IFELSE
! benchpp-linux-2wswitch:BENCHPPLINUX:BENCHPPLINUX_2WAY_SWITCH
! benchpp-linux-10wifelse:BENCHPPLINUX:BENCHPPLINUX_10WAY_IFELSE
! benchpp-linux-10wswitch:BENCHPPLINUX:BENCHPPLINUX_10WAY_SWITCH
! benchpp-linux-10wsparseswitch:BENCHPPLINUX:BENCHPPLINUX_10WAY_SPARSE_SWITCH
! benchpp-linux-10wvfc:BENCHPPLINUX:BENCHPPLINUX_10WAY_VFC
  linpackc-sp-unroll:LINPACKC:LINPACKC_SP_UNROLL
  linpackc-sp-roll:LINPACKC:LINPACKC_SP_ROLL

Index: Benchmark-BENCHPPLINUX.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-BENCHPPLINUX.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Benchmark-BENCHPPLINUX.cpp	11 Dec 2006 20:12:28 -0000	1.2
--- Benchmark-BENCHPPLINUX.cpp	11 Dec 2006 20:21:55 -0000	1.3
***************
*** 209,213 ****
  std::string CBMBenchmarkBENCHPPLINUX_DHRYSTONE::benchmarkName(void)
  {
!   return("benchpplinux-dhrystone");
  }
  
--- 209,213 ----
  std::string CBMBenchmarkBENCHPPLINUX_DHRYSTONE::benchmarkName(void)
  {
!   return("benchpp-linux-dhrystone");
  }
  
***************
*** 233,237 ****
  std::string CBMBenchmarkBENCHPPLINUX_WHETSTONE::benchmarkName(void)
  {
!   return("benchpplinux-whetstone");
  }
  
--- 233,237 ----
  std::string CBMBenchmarkBENCHPPLINUX_WHETSTONE::benchmarkName(void)
  {
!   return("benchpp-linux-whetstone");
  }
  
***************
*** 304,308 ****
  std::string CBMBenchmarkBENCHPPLINUX_BOOL_ASSIGN::benchmarkName(void)
  {
!   return("benchpplinux-bool-assign");
  }
  
--- 304,308 ----
  std::string CBMBenchmarkBENCHPPLINUX_BOOL_ASSIGN::benchmarkName(void)
  {
!   return("benchpp-linux-bool-assign");
  }
  
***************
*** 329,333 ****
  std::string CBMBenchmarkBENCHPPLINUX_BOOL_IF::benchmarkName(void)
  {
!   return("benchpplinux-bool-if");
  }
  
--- 329,333 ----
  std::string CBMBenchmarkBENCHPPLINUX_BOOL_IF::benchmarkName(void)
  {
!   return("benchpp-linux-bool-if");
  }
  
***************
*** 354,358 ****
  std::string CBMBenchmarkBENCHPPLINUX_2WAY_IFELSE::benchmarkName(void)
  {
!   return("benchpplinux-2wifelse");
  }
  
--- 354,358 ----
  std::string CBMBenchmarkBENCHPPLINUX_2WAY_IFELSE::benchmarkName(void)
  {
!   return("benchpp-linux-2wifelse");
  }
  
***************
*** 378,382 ****
  std::string CBMBenchmarkBENCHPPLINUX_2WAY_SWITCH::benchmarkName(void)
  {
!   return("benchpplinux-2wswitch");
  }
  
--- 378,382 ----
  std::string CBMBenchmarkBENCHPPLINUX_2WAY_SWITCH::benchmarkName(void)
  {
!   return("benchpp-linux-2wswitch");
  }
  
***************
*** 402,406 ****
  std::string CBMBenchmarkBENCHPPLINUX_10WAY_IFELSE::benchmarkName(void)
  {
!   return("benchpplinux-10wifelse");
  }
  
--- 402,406 ----
  std::string CBMBenchmarkBENCHPPLINUX_10WAY_IFELSE::benchmarkName(void)
  {
!   return("benchpp-linux-10wifelse");
  }
  
***************
*** 426,430 ****
  std::string CBMBenchmarkBENCHPPLINUX_10WAY_SWITCH::benchmarkName(void)
  {
!   return("benchpplinux-10wswitch");
  }
  
--- 426,430 ----
  std::string CBMBenchmarkBENCHPPLINUX_10WAY_SWITCH::benchmarkName(void)
  {
!   return("benchpp-linux-10wswitch");
  }
  
***************
*** 451,455 ****
  std::string CBMBenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH::benchmarkName(void)
  {
!   return("benchpplinux-10wspareswitch");
  }
  
--- 451,455 ----
  std::string CBMBenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH::benchmarkName(void)
  {
!   return("benchpp-linux-10wspareswitch");
  }
  
***************
*** 475,479 ****
  std::string CBMBenchmarkBENCHPPLINUX_10WAY_VFC::benchmarkName(void)
  {
!   return("benchpplinux-10wvfc");
  }
  
--- 475,479 ----
  std::string CBMBenchmarkBENCHPPLINUX_10WAY_VFC::benchmarkName(void)
  {
!   return("benchpp-linux-10wvfc");
  }
  

[Compbench-devel] CompBenchmarks++/Benchmark Benchmark-Selector.cpp, 1.7, 1.8

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

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

Modified Files:
	Benchmark-Selector.cpp 
Log Message:
Back to 1.6 (removed variable was useful).

Index: Benchmark-Selector.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-Selector.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Benchmark-Selector.cpp	11 Dec 2006 20:13:07 -0000	1.7
--- Benchmark-Selector.cpp	11 Dec 2006 20:21:21 -0000	1.8
***************
*** 28,31 ****
--- 28,32 ----
  void CBMBenchmarkSelector::displayList(void)
  {
+   CBMBenchmark *B;
    #include "Benchmark/Benchmark-Selector.liblist.h"
  }

[Compbench-devel] CompBenchmarks++/Benchmark Benchmark-Selector.cpp, 1.6, 1.7

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

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

Modified Files:
	Benchmark-Selector.cpp 
Log Message:
Warning removed (unused variable).

Index: Benchmark-Selector.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-Selector.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Benchmark-Selector.cpp	1 Nov 2006 12:59:56 -0000	1.6
--- Benchmark-Selector.cpp	11 Dec 2006 20:13:07 -0000	1.7
***************
*** 28,32 ****
  void CBMBenchmarkSelector::displayList(void)
  {
-   CBMBenchmark *B;
    #include "Benchmark/Benchmark-Selector.liblist.h"
  }
--- 28,31 ----

[Compbench-devel] CompBenchmarks++/Benchmark Benchmark-BENCHPPLINUX.cpp, 1.1, 1.2 Benchmark-BENCHPPLINUX.h, 1.1, 1.2 benchmarks.list, 1.2, 1.3

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

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

Modified Files:
	Benchmark-BENCHPPLINUX.cpp Benchmark-BENCHPPLINUX.h 
	benchmarks.list 
Log Message:
New supported benchmarks in benchpplinux.

Index: benchmarks.list
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/benchmarks.list,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** benchmarks.list	4 Dec 2006 19:17:13 -0000	1.2
--- benchmarks.list	11 Dec 2006 20:12:28 -0000	1.3
***************
*** 26,31 ****
  benchpplinux-dhrystone:BENCHPPLINUX:BENCHPPLINUX_DHRYSTONE
  benchpplinux-whetstone:BENCHPPLINUX:BENCHPPLINUX_WHETSTONE
  linpackc-sp-unroll:LINPACKC:LINPACKC_SP_UNROLL
  linpackc-sp-roll:LINPACKC:LINPACKC_SP_ROLL
  linpackc-dp-unroll:LINPACKC:LINPACKC_DP_UNROLL
! linpackc-dp-roll:LINPACKC:LINPACKC_DP_ROLL
--- 26,39 ----
  benchpplinux-dhrystone:BENCHPPLINUX:BENCHPPLINUX_DHRYSTONE
  benchpplinux-whetstone:BENCHPPLINUX:BENCHPPLINUX_WHETSTONE
+ benchpplinux-bool-assign:BENCHPPLINUX:BENCHPPLINUX_BOOL_ASSIGN
+ benchpplinux-bool-if:BENCHPPLINUX:BENCHPPLINUX_BOOL_IF
+ benchpplinux-2wifelse:BENCHPPLINUX:BENCHPPLINUX_2WAY_IFELSE
+ benchpplinux-2wswitch:BENCHPPLINUX:BENCHPPLINUX_2WAY_SWITCH
+ benchpplinux-10wifelse:BENCHPPLINUX:BENCHPPLINUX_10WAY_IFELSE
+ benchpplinux-10wswitch:BENCHPPLINUX:BENCHPPLINUX_10WAY_SWITCH
+ benchpplinux-10wsparseswitch:BENCHPPLINUX:BENCHPPLINUX_10WAY_SPARSE_SWITCH
+ benchpplinux-10wvfc:BENCHPPLINUX:BENCHPPLINUX_10WAY_VFC
  linpackc-sp-unroll:LINPACKC:LINPACKC_SP_UNROLL
  linpackc-sp-roll:LINPACKC:LINPACKC_SP_ROLL
  linpackc-dp-unroll:LINPACKC:LINPACKC_DP_UNROLL
! linpackc-dp-roll:LINPACKC:LINPACKC_DP_ROLL
\ No newline at end of file

Index: Benchmark-BENCHPPLINUX.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-BENCHPPLINUX.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Benchmark-BENCHPPLINUX.h	4 Dec 2006 19:17:13 -0000	1.1
--- Benchmark-BENCHPPLINUX.h	11 Dec 2006 20:12:28 -0000	1.2
***************
*** 54,58 ****
  };
  
! /** \brief Defines the dhrystone benchmark within benchpp package.
   */
  class CBMBenchmarkBENCHPPLINUX_DHRYSTONE : public CBMBenchmarkBENCHPPLINUX
--- 54,58 ----
  };
  
! /** \brief Defines the dhrystone benchmark within benchpp-linux package.
   */
  class CBMBenchmarkBENCHPPLINUX_DHRYSTONE : public CBMBenchmarkBENCHPPLINUX
***************
*** 70,74 ****
  };
  
! /** \brief Defines the whetstone benchmark within benchpp package.
   */
  class CBMBenchmarkBENCHPPLINUX_WHETSTONE : public CBMBenchmarkBENCHPPLINUX
--- 70,74 ----
  };
  
! /** \brief Defines the whetstone benchmark within benchpp-linux package.
   */
  class CBMBenchmarkBENCHPPLINUX_WHETSTONE : public CBMBenchmarkBENCHPPLINUX
***************
*** 86,89 ****
--- 86,239 ----
  };
  
+ /** \brief Defines a generic class to get benchmark in benchpp-linux according
+  *  to an iteration number and the internal compbenchmarks' timer. */
+ class CBMBenchmarkBENCHPPLINUX_IterationsPerSec : public CBMBenchmarkBENCHPPLINUX
+ {
+  protected:
+   CBMBenchmarkBENCHPPLINUX_IterationsPerSec(class CBMSystem *_system);
+ 
+   virtual std::string bench(void);
+   virtual ~CBMBenchmarkBENCHPPLINUX_IterationsPerSec();
+ };
+ 
+ 
+ /** \brief Defines the boolean assignment benchmark within benchpp-linux package.
+  */
+ class CBMBenchmarkBENCHPPLINUX_BOOL_ASSIGN : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
+ {
+  protected:
+   virtual std::string benchmarkName(void);
+   virtual std::string benchmarkBENCHPPLINUXComments(void);
+ 
+ 
+   virtual std::string benchppBenchmark(void);
+ 
+  public:
+   CBMBenchmarkBENCHPPLINUX_BOOL_ASSIGN(class CBMSystem *_system);
+   virtual ~CBMBenchmarkBENCHPPLINUX_BOOL_ASSIGN();
+ };
+ 
+ 
+ /** \brief Defines the 'boolean if' benchmark within benchpp-linux package.
+  */
+ class CBMBenchmarkBENCHPPLINUX_BOOL_IF : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
+ {
+  protected:
+   virtual std::string benchmarkName(void);
+   virtual std::string benchmarkBENCHPPLINUXComments(void);
+ 
+ 
+   virtual std::string benchppBenchmark(void);
+ 
+  public:
+   CBMBenchmarkBENCHPPLINUX_BOOL_IF(class CBMSystem *_system);
+   virtual ~CBMBenchmarkBENCHPPLINUX_BOOL_IF();
+ };
+ 
+ /** \brief Defines the 'two-way if/else' benchmark within benchpp-linux
+  *   package.
+  */
+ class CBMBenchmarkBENCHPPLINUX_2WAY_IFELSE : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
+ {
+  protected:
+   virtual std::string benchmarkName(void);
+   virtual std::string benchmarkBENCHPPLINUXComments(void);
+ 
+ 
+   virtual std::string benchppBenchmark(void);
+ 
+  public:
+   CBMBenchmarkBENCHPPLINUX_2WAY_IFELSE(class CBMSystem *_system);
+   virtual ~CBMBenchmarkBENCHPPLINUX_2WAY_IFELSE();
+ };
+ 
+ 
+ /** \brief Defines the 'two-way switch' benchmark within benchpp-linux
+  *   package.
+  */
+ class CBMBenchmarkBENCHPPLINUX_2WAY_SWITCH : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
+ {
+  protected:
+   virtual std::string benchmarkName(void);
+   virtual std::string benchmarkBENCHPPLINUXComments(void);
+ 
+ 
+   virtual std::string benchppBenchmark(void);
+ 
+  public:
+   CBMBenchmarkBENCHPPLINUX_2WAY_SWITCH(class CBMSystem *_system);
+   virtual ~CBMBenchmarkBENCHPPLINUX_2WAY_SWITCH();
+ };
+ 
+ 
+ /** \brief Defines the '10-way if/else' benchmark within benchpp-linux
+  *   package.
+  */
+ class CBMBenchmarkBENCHPPLINUX_10WAY_IFELSE : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
+ {
+  protected:
+   virtual std::string benchmarkName(void);
+   virtual std::string benchmarkBENCHPPLINUXComments(void);
+ 
+ 
+   virtual std::string benchppBenchmark(void);
+ 
+  public:
+   CBMBenchmarkBENCHPPLINUX_10WAY_IFELSE(class CBMSystem *_system);
+   virtual ~CBMBenchmarkBENCHPPLINUX_10WAY_IFELSE();
+ };
+ 
+ 
+ /** \brief Defines the '10-way switch' benchmark within benchpp-linux
+  *   package.
+  */
+ class CBMBenchmarkBENCHPPLINUX_10WAY_SWITCH : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
+ {
+  protected:
+   virtual std::string benchmarkName(void);
+   virtual std::string benchmarkBENCHPPLINUXComments(void);
+ 
+ 
+   virtual std::string benchppBenchmark(void);
+ 
+  public:
+   CBMBenchmarkBENCHPPLINUX_10WAY_SWITCH(class CBMSystem *_system);
+   virtual ~CBMBenchmarkBENCHPPLINUX_10WAY_SWITCH();
+ };
+ 
+ /** \brief Defines the '10-way sparse switch' benchmark within benchpp-linux
+  *   package.
+  */
+ class CBMBenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
+ {
+  protected:
+   virtual std::string benchmarkName(void);
+   virtual std::string benchmarkBENCHPPLINUXComments(void);
+ 
+ 
+   virtual std::string benchppBenchmark(void);
+ 
+  public:
+   CBMBenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH(class CBMSystem *_system);
+   virtual ~CBMBenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH();
+ };
+ 
+ /** \brief Defines the '10-way virtual function call' benchmark within
+  *   benchpp-linux package.
+  */
+ class CBMBenchmarkBENCHPPLINUX_10WAY_VFC : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
+ {
+  protected:
+   virtual std::string benchmarkName(void);
+   virtual std::string benchmarkBENCHPPLINUXComments(void);
+ 
+ 
+   virtual std::string benchppBenchmark(void);
+ 
+  public:
+   CBMBenchmarkBENCHPPLINUX_10WAY_VFC(class CBMSystem *_system);
+   virtual ~CBMBenchmarkBENCHPPLINUX_10WAY_VFC();
+ };
+ 
  lib_declare();
  

Index: Benchmark-BENCHPPLINUX.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-BENCHPPLINUX.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Benchmark-BENCHPPLINUX.cpp	4 Dec 2006 19:17:13 -0000	1.1
--- Benchmark-BENCHPPLINUX.cpp	11 Dec 2006 20:12:28 -0000	1.2
***************
*** 6,9 ****
--- 6,11 ----
  #include <fstream>
  
+ #include <stdlib.h>
+ 
  #include "Benchmark/Benchmark-BENCHPPLINUX.libwrapper.h"
  
***************
*** 126,130 ****
    cmd+=" && ";
    cmd+=CBM_PROG_MAKE;
!   cmd+=" a000091 a000092"; // !!! #5a;
  
    cmd+=" CC=\"";
--- 128,132 ----
    cmd+=" && ";
    cmd+=CBM_PROG_MAKE;
!   cmd+=" a000091 a000092 f000001 f000002 f000003 f000004 f000005 f000006 f000007 f000008 l000001 l000002"; // !!! #5a;
  
    cmd+=" CC=\"";
***************
*** 183,187 ****
  std::string CBMBenchmarkBENCHPPLINUX::homePage(void)
  {
!   return("http://web.archive.org/web/20050307095704/www.research.att.com/~orost/bench_plus_plus.html");
  }
  
--- 185,189 ----
  std::string CBMBenchmarkBENCHPPLINUX::homePage(void)
  {
!   return("http://benchpplinux.sf.net");
  }
  
***************
*** 207,211 ****
  std::string CBMBenchmarkBENCHPPLINUX_DHRYSTONE::benchmarkName(void)
  {
!   return("benchpp-dhrystone");
  }
  
--- 209,213 ----
  std::string CBMBenchmarkBENCHPPLINUX_DHRYSTONE::benchmarkName(void)
  {
!   return("benchpplinux-dhrystone");
  }
  
***************
*** 231,235 ****
  std::string CBMBenchmarkBENCHPPLINUX_WHETSTONE::benchmarkName(void)
  {
!   return("benchpp-whetstone");
  }
  
--- 233,237 ----
  std::string CBMBenchmarkBENCHPPLINUX_WHETSTONE::benchmarkName(void)
  {
!   return("benchpplinux-whetstone");
  }
  
***************
*** 247,248 ****
--- 249,492 ----
  {
  }
+ 
+ 
+ 
+ CBMBenchmarkBENCHPPLINUX_IterationsPerSec::CBMBenchmarkBENCHPPLINUX_IterationsPerSec(CBMSystem *_system)
+   : CBMBenchmarkBENCHPPLINUX(_system)
+ {
+ }
+ 
+ std::string CBMBenchmarkBENCHPPLINUX_IterationsPerSec::bench(void)
+ {
+   std::string cmd;
+   std::string result;
+   time_t      begint;
+   time_t      endt;
+   double      it;
+   char        dum[16] = { 0 };
+ 
+   cmd="cd ";
+   cmd+=localPackageAbsoluteDirectory();
+   cmd+=" && echo $(./";
+   cmd+=benchppBenchmark();
+   cmd+=" | ";
+   cmd+=CBM_PROG_GREP;
+   cmd+=" 'Iteration Count' ";
+   cmd+=" | ";
+   cmd+=CBM_PROG_CUT;
+   cmd+=" -f3 -d':')";
+ 
+   begint=system->Time();  
+   if (system->exec(cmd, result)==0) {
+     system->Chomp(result);
+     it=atof(result.c_str());
+     endt=system->Time();
+     if (endt>begint) {
+       sprintf(dum, "%0.0f", it/(endt-begint));
+       result=dum;
+       return(result);
+     } else {
+       return("0");
+     }
+   }
+   return("0");
+ }
+ 
+ CBMBenchmarkBENCHPPLINUX_IterationsPerSec::~CBMBenchmarkBENCHPPLINUX_IterationsPerSec()
+ {
+ }
+ 
+ CBMBenchmarkBENCHPPLINUX_BOOL_ASSIGN::CBMBenchmarkBENCHPPLINUX_BOOL_ASSIGN(CBMSystem *_system)
+   : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system)
+ {
+ }
+ 
+ std::string CBMBenchmarkBENCHPPLINUX_BOOL_ASSIGN::benchmarkName(void)
+ {
+   return("benchpplinux-bool-assign");
+ }
+ 
+ std::string CBMBenchmarkBENCHPPLINUX_BOOL_ASSIGN::benchppBenchmark(void)
+ {
+   return("f000001");
+ }
+ 
+ std::string CBMBenchmarkBENCHPPLINUX_BOOL_ASSIGN::benchmarkBENCHPPLINUXComments(void)
+ {
+   return("C++ implementation a boolean assignment (time to set a boolean flag" \
+ 	 "using a logical equation)");
+ }
+ 
+ CBMBenchmarkBENCHPPLINUX_BOOL_ASSIGN::~CBMBenchmarkBENCHPPLINUX_BOOL_ASSIGN()
+ {
+ }
+ 
+ CBMBenchmarkBENCHPPLINUX_BOOL_IF::CBMBenchmarkBENCHPPLINUX_BOOL_IF(CBMSystem *_system)
+   : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system)
+ {
+ }
+ 
+ std::string CBMBenchmarkBENCHPPLINUX_BOOL_IF::benchmarkName(void)
+ {
+   return("benchpplinux-bool-if");
+ }
+ 
+ std::string CBMBenchmarkBENCHPPLINUX_BOOL_IF::benchppBenchmark(void)
+ {
+   return("f000002");
+ }
+ 
+ std::string CBMBenchmarkBENCHPPLINUX_BOOL_IF::benchmarkBENCHPPLINUXComments(void)
+ {
+   return("C++ implementation a boolean if block (time to set a boolean flag" \
+ 	 "using a comparaison bettween a global and a local integer)");
+ }
+ 
+ CBMBenchmarkBENCHPPLINUX_BOOL_IF::~CBMBenchmarkBENCHPPLINUX_BOOL_IF()
+ {
+ }
+ 
+ CBMBenchmarkBENCHPPLINUX_2WAY_IFELSE::CBMBenchmarkBENCHPPLINUX_2WAY_IFELSE(CBMSystem *_system)
+   : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system)
+ {
+ }
+ 
+ std::string CBMBenchmarkBENCHPPLINUX_2WAY_IFELSE::benchmarkName(void)
+ {
+   return("benchpplinux-2wifelse");
+ }
+ 
+ std::string CBMBenchmarkBENCHPPLINUX_2WAY_IFELSE::benchppBenchmark(void)
+ {
+   return("f000003");
+ }
+ 
+ std::string CBMBenchmarkBENCHPPLINUX_2WAY_IFELSE::benchmarkBENCHPPLINUXComments(void)
+ {
+   return("C++ implementation of a 2-way if/else if statement");
+ }
+ 
+ CBMBenchmarkBENCHPPLINUX_2WAY_IFELSE::~CBMBenchmarkBENCHPPLINUX_2WAY_IFELSE()
+ {
+ }
+ 
+ CBMBenchmarkBENCHPPLINUX_2WAY_SWITCH::CBMBenchmarkBENCHPPLINUX_2WAY_SWITCH(CBMSystem *_system)
+   : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system)
+ {
+ }
+ 
+ std::string CBMBenchmarkBENCHPPLINUX_2WAY_SWITCH::benchmarkName(void)
+ {
+   return("benchpplinux-2wswitch");
+ }
+ 
+ std::string CBMBenchmarkBENCHPPLINUX_2WAY_SWITCH::benchppBenchmark(void)
+ {
+   return("f000004");
+ }
+ 
+ std::string CBMBenchmarkBENCHPPLINUX_2WAY_SWITCH::benchmarkBENCHPPLINUXComments(void)
+ {
+   return("C++ implementation of a 2-way if/else if statement");
+ }
+ 
+ CBMBenchmarkBENCHPPLINUX_2WAY_SWITCH::~CBMBenchmarkBENCHPPLINUX_2WAY_SWITCH()
+ {
+ }
+ 
+ CBMBenchmarkBENCHPPLINUX_10WAY_IFELSE::CBMBenchmarkBENCHPPLINUX_10WAY_IFELSE(CBMSystem *_system)
+   : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system)
+ {
+ }
+ 
+ std::string CBMBenchmarkBENCHPPLINUX_10WAY_IFELSE::benchmarkName(void)
+ {
+   return("benchpplinux-10wifelse");
+ }
+ 
+ std::string CBMBenchmarkBENCHPPLINUX_10WAY_IFELSE::benchppBenchmark(void)
+ {
+   return("f000005");
+ }
+ 
+ std::string CBMBenchmarkBENCHPPLINUX_10WAY_IFELSE::benchmarkBENCHPPLINUXComments(void)
+ {
+   return("C++ implementation of a 10-way if/else if statement");
+ }
+ 
+ CBMBenchmarkBENCHPPLINUX_10WAY_IFELSE::~CBMBenchmarkBENCHPPLINUX_10WAY_IFELSE()
+ {
+ }
+ 
+ CBMBenchmarkBENCHPPLINUX_10WAY_SWITCH::CBMBenchmarkBENCHPPLINUX_10WAY_SWITCH(CBMSystem *_system)
+   : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system)
+ {
+ }
+ 
+ std::string CBMBenchmarkBENCHPPLINUX_10WAY_SWITCH::benchmarkName(void)
+ {
+   return("benchpplinux-10wswitch");
+ }
+ 
+ std::string CBMBenchmarkBENCHPPLINUX_10WAY_SWITCH::benchppBenchmark(void)
+ {
+   return("f000006");
+ }
+ 
+ std::string CBMBenchmarkBENCHPPLINUX_10WAY_SWITCH::benchmarkBENCHPPLINUXComments(void)
+ {
+   return("C++ implementation of a 10-way if/else if statement");
+ }
+ 
+ CBMBenchmarkBENCHPPLINUX_10WAY_SWITCH::~CBMBenchmarkBENCHPPLINUX_10WAY_SWITCH()
+ {
+ }
+ 
+ 
+ CBMBenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH::CBMBenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH(CBMSystem *_system)
+   : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system)
+ {
+ }
+ 
+ std::string CBMBenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH::benchmarkName(void)
+ {
+   return("benchpplinux-10wspareswitch");
+ }
+ 
+ std::string CBMBenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH::benchppBenchmark(void)
+ {
+   return("f000007");
+ }
+ 
+ std::string CBMBenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH::benchmarkBENCHPPLINUXComments(void)
+ {
+   return("C++ implementation of a 10-way sparse switch statement");
+ }
+ 
+ CBMBenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH::~CBMBenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH()
+ {
+ }
+ 
+ CBMBenchmarkBENCHPPLINUX_10WAY_VFC::CBMBenchmarkBENCHPPLINUX_10WAY_VFC(CBMSystem *_system)
+   : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system)
+ {
+ }
+ 
+ std::string CBMBenchmarkBENCHPPLINUX_10WAY_VFC::benchmarkName(void)
+ {
+   return("benchpplinux-10wvfc");
+ }
+ 
+ std::string CBMBenchmarkBENCHPPLINUX_10WAY_VFC::benchppBenchmark(void)
+ {
+   return("f000008");
+ }
+ 
+ std::string CBMBenchmarkBENCHPPLINUX_10WAY_VFC::benchmarkBENCHPPLINUXComments(void)
+ {
+   return("C++ implementation of a 10-way virtual function class");
+ }
+ 
+ CBMBenchmarkBENCHPPLINUX_10WAY_VFC::~CBMBenchmarkBENCHPPLINUX_10WAY_VFC()
+ {
+ }

[Compbench-devel] CompBenchmarks++/share/patches Makefile.am, 1.5, 1.6

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

Update of /cvsroot/compbench/CompBenchmarks++/share/patches
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18262

Modified Files:
	Makefile.am 
Log Message:
datarootdir removed. datadir seems suffiscient.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/share/patches/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.am	23 Nov 2006 16:37:46 -0000	1.5
--- Makefile.am	11 Dec 2006 18:11:12 -0000	1.6
***************
*** 1,5 ****
  data_DATA = scimark2.patch.gz benchpp.patch.gz linpackc.patch.gz
  
! datarootdir = @datarootdir@/compbenchmarks/@VERSION@/patches
  datadir     = @datadir@/compbenchmarks/@VERSION@/patches
  
--- 1,5 ----
  data_DATA = scimark2.patch.gz benchpp.patch.gz linpackc.patch.gz
  
! # datarootdir = @datarootdir@/compbenchmarks/@VERSION@/patches
  datadir     = @datadir@/compbenchmarks/@VERSION@/patches
  

[Compbench-devel] CompBenchmarks++/System System-Unix.cpp,1.5,1.6

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

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

Modified Files:
	System-Unix.cpp 
Log Message:
Last command and last command output can be get.

Index: System-Unix.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/System/System-Unix.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** System-Unix.cpp	1 Nov 2006 10:32:17 -0000	1.5
--- System-Unix.cpp	11 Dec 2006 18:09:59 -0000	1.6
***************
*** 1,3 ****
--- 1,5 ----
  #include <System/System-Unix.h>
+ #include <UI/UI.h>
+ 
  #include <sys/stat.h>
  #include <sys/types.h>
***************
*** 41,48 ****
    char line[256];
  
!   result="";	
    if ( !(fpipe = (FILE*)popen(command.c_str(),"r")) ) {
!     perror("Problems with pipe");
!     exit(1);
    }
  
--- 43,50 ----
    char line[256];
  
!   result="";
!   lastCommand=command;
    if ( !(fpipe = (FILE*)popen(command.c_str(),"r")) ) {
!     UI->Fatal("Can't create pipe.");
    }
  
***************
*** 50,53 ****
--- 52,56 ----
      result+=line;
    }
+   lastCommandOutput=result;
    return(pclose(fpipe));
  }

[Compbench-devel] CompBenchmarks++/System System.cpp, 1.9, 1.10 System.h, 1.11, 1.12

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

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

Modified Files:
	System.cpp System.h 
Log Message:
Last command and last command output can be get.

Index: System.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/System/System.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** System.cpp	7 Dec 2006 21:05:06 -0000	1.9
--- System.cpp	11 Dec 2006 18:09:47 -0000	1.10
***************
*** 412,415 ****
--- 412,425 ----
  }
  
+ std::string& CBMSystem::getLastCommand(void)
+ {
+   return(lastCommand);
+ }
+ 
+ std::string& CBMSystem::getLastCommandOutput(void)
+ {
+   return(lastCommandOutput);
+ }
+ 
  CBMSystem::~CBMSystem()
  {

Index: System.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/System/System.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** System.h	7 Dec 2006 21:05:06 -0000	1.11
--- System.h	11 Dec 2006 18:09:47 -0000	1.12
***************
*** 37,40 ****
--- 37,46 ----
  
   protected:
+   /** Stores the last (shell) command executed by compbenchmarks library. */
+   std::string lastCommand;
+   /** Stores the output of the last (shell) command executed by
+    *  compbenchmarks library. */
+   std::string lastCommandOutput;
+ 
    /** Constructor. */
    CBMSystem();
***************
*** 223,226 ****
--- 229,244 ----
    */
    virtual int done(void);
+ 
+   /** Returns the last command executed by compbenchmarks library.
+       \sa lastCommand
+       \sa getLastCommandOutput()
+       \result a std::string containing the command */
+   virtual std::string& getLastCommand(void);
+ 
+   /** Returns the last command's output executed by compbenchmarks library.
+       \sa lastCommandOutput
+       \sa getLastCommand()
+       \result a std::string containing the command's output */
+   virtual std::string& getLastCommandOutput(void);
  };
  

[Compbench-devel] CompBenchmarks++/System Makefile.am,1.8,1.9

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

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

Modified Files:
	Makefile.am 
Log Message:
CXXFLAGS replaced by AM_CXXFLAGS

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/System/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile.am	27 Nov 2006 17:20:06 -0000	1.8
--- Makefile.am	7 Dec 2006 22:03:43 -0000	1.9
***************
*** 23,27 ****
  libSystemincludedir	=	$(includedir)/compbenchmarks/System
  
! CXXFLAGS		+=	-DERRNO_DONE=1 -DDATAROOTDIR=\"@datarootdir@\"
  INCLUDES		=	-I $(top_srcdir)
  # -I /usr/include/w3c-libwww # !!!
--- 23,27 ----
  libSystemincludedir	=	$(includedir)/compbenchmarks/System
  
! AM_CXXFLAGS		=	-DERRNO_DONE=1 -DDATAROOTDIR=\"@datarootdir@\"
  INCLUDES		=	-I $(top_srcdir)
  # -I /usr/include/w3c-libwww # !!!

[Compbench-devel] CompBenchmarks++/Benchmark benchmarks-genlibwrapper.sh, 1.1, 1.2

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

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

Modified Files:
	benchmarks-genlibwrapper.sh 
Log Message:
Adds a new line at the end of generated headers.
"EOF" string, which could appear, has been removed from generated headers.

Index: benchmarks-genlibwrapper.sh
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/benchmarks-genlibwrapper.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** benchmarks-genlibwrapper.sh	1 Nov 2006 13:03:30 -0000	1.1
--- benchmarks-genlibwrapper.sh	7 Dec 2006 21:24:21 -0000	1.2
***************
*** 66,70 ****
      return(0);
  }
- 
  EOF
  
--- 66,69 ----
***************
*** 74,76 ****
    return($number);
  }
! EOF
\ No newline at end of file
--- 73,77 ----
    return($number);
  }
! EOF
! 
! echo ""

[Compbench-devel] CompBenchmarks++/System System.cpp, 1.8, 1.9 System.h, 1.10, 1.11

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

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

Modified Files:
	System.cpp System.h 
Log Message:
A couple of compilation warnings fixed (signed/unsigned comparaison).

Index: System.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/System/System.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** System.cpp	23 Nov 2006 16:39:07 -0000	1.8
--- System.cpp	7 Dec 2006 21:05:06 -0000	1.9
***************
*** 106,110 ****
  
  
! std::string CBMSystem::Split(const std::string& str, const std::string& delim, int wantedIndex)
  {
      unsigned int offset = 0;
--- 106,110 ----
  
  
! std::string CBMSystem::Split(const std::string& str, const std::string& delim, unsigned int wantedIndex)
  {
      unsigned int offset = 0;

Index: System.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/System/System.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** System.h	1 Nov 2006 10:29:40 -0000	1.10
--- System.h	7 Dec 2006 21:05:06 -0000	1.11
***************
*** 113,117 ****
    virtual std::string Split(const std::string& str,
  			    const std::string& delim,
! 			    int wantedIndex);
  
    /** Remove trailing line-feed (and carriage return) from specified string.
--- 113,117 ----
    virtual std::string Split(const std::string& str,
  			    const std::string& delim,
! 			    unsigned int wantedIndex);
  
    /** Remove trailing line-feed (and carriage return) from specified string.

[Compbench-devel] CompBenchmarks++/Benchmark Makefile.am, 1.10, 1.11

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

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

Modified Files:
	Makefile.am 
Log Message:
benchpplinux support added.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Makefile.am	27 Nov 2006 17:18:24 -0000	1.10
--- Makefile.am	4 Dec 2006 19:28:29 -0000	1.11
***************
*** 5,8 ****
--- 5,9 ----
  						libcompbenchmarks-scimark2.la \
  						libcompbenchmarks-benchpp.la \
+ 						libcompbenchmarks-benchpplinux.la \
  						libcompbenchmarks-linpackc.la
  
***************
*** 32,35 ****
--- 33,39 ----
  libcompbenchmarks_benchpp_la_SOURCES	=	Benchmark-BENCHPP.cpp Benchmark-BENCHPP.h Benchmark-BENCHPP.libwrapper.h
  
+ Benchmark-BENCHPPLINUX.cpp: Benchmark-BENCHPPLINUX.libwrapper.h
+ libcompbenchmarks_benchpplinux_la_SOURCES	=	Benchmark-BENCHPPLINUX.cpp Benchmark-BENCHPPLINUX.h Benchmark-BENCHPPLINUX.libwrapper.h
+ 
  Benchmark-LINPACKC.cpp: Benchmark-LINPACKC.libwrapper.h
  libcompbenchmarks_linpackc_la_SOURCES   =	Benchmark-LINPACKC.cpp Benchmark-LINPACKC.h Benchmark-LINPACKC.libwrapper.h

[Compbench-devel] CompBenchmarks++/Benchmark Benchmark-BENCHPPLINUX.cpp, NONE, 1.1 Benchmark-BENCHPPLINUX.h, NONE, 1.1 benchmarks.list, 1.1, 1.2

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

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

Modified Files:
	benchmarks.list 
Added Files:
	Benchmark-BENCHPPLINUX.cpp Benchmark-BENCHPPLINUX.h 
Log Message:
Supports of a few benchmarks providen in benchpplinux.

Index: benchmarks.list
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/benchmarks.list,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** benchmarks.list	1 Nov 2006 13:13:12 -0000	1.1
--- benchmarks.list	4 Dec 2006 19:17:13 -0000	1.2
***************
*** 24,30 ****
  benchpp-whetstone:BENCHPP:BENCHPP_WHETSTONE
  benchpp-stepanov-al12:BENCHPP:BENCHPP_STEPANOV_AL12
  linpackc-sp-unroll:LINPACKC:LINPACKC_SP_UNROLL
  linpackc-sp-roll:LINPACKC:LINPACKC_SP_ROLL
  linpackc-dp-unroll:LINPACKC:LINPACKC_DP_UNROLL
  linpackc-dp-roll:LINPACKC:LINPACKC_DP_ROLL
- 
--- 24,31 ----
  benchpp-whetstone:BENCHPP:BENCHPP_WHETSTONE
  benchpp-stepanov-al12:BENCHPP:BENCHPP_STEPANOV_AL12
+ benchpplinux-dhrystone:BENCHPPLINUX:BENCHPPLINUX_DHRYSTONE
+ benchpplinux-whetstone:BENCHPPLINUX:BENCHPPLINUX_WHETSTONE
  linpackc-sp-unroll:LINPACKC:LINPACKC_SP_UNROLL
  linpackc-sp-roll:LINPACKC:LINPACKC_SP_ROLL
  linpackc-dp-unroll:LINPACKC:LINPACKC_DP_UNROLL
  linpackc-dp-roll:LINPACKC:LINPACKC_DP_ROLL

--- NEW FILE: Benchmark-BENCHPPLINUX.h ---
#ifndef H_CBMBENCHMARKBENCHPPLINUX
#define H_CBMBENCHMARKBENCHPPLINUX

#include <Benchmark/Benchmark.h>

/** \brief Defines the benchpp-linux package.
 */
class CBMBenchmarkBENCHPPLINUX : public CBMBenchmark
{
 public:
 private:
  virtual std::string downloadURL(void);
  virtual std::string expectedMD5(void);

  virtual std::string packageName(void);
  virtual std::string benchmarkName(void) = 0;
  virtual std::string benchmarkComments(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);
		

 protected:

  CBMBenchmarkBENCHPPLINUX(class CBMSystem *_system);

  virtual std::string benchppBenchmark(void) = 0;

  virtual std::string benchmarkBENCHPPLINUXComments(void) = 0;

  virtual char* extractDirectory(void);

  virtual int preConfigure(int _force);
  virtual int extract(int _force = 0);
  virtual int configure(CBMCompiler        *_currentCompiler,
			CBMCompilerOptions *_currentOptions);

  virtual int make(void);
  virtual std::string bench(void);
  virtual int release(void);

 public:
  virtual std::string license(void);
  virtual std::string homePage(void);
  virtual std::string author(void);

  virtual int benchmarkSize(void);
  virtual ~CBMBenchmarkBENCHPPLINUX();
		
};

/** \brief Defines the dhrystone benchmark within benchpp package.
 */
class CBMBenchmarkBENCHPPLINUX_DHRYSTONE : public CBMBenchmarkBENCHPPLINUX
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);

  virtual std::string benchppBenchmark(void);


 public:
  CBMBenchmarkBENCHPPLINUX_DHRYSTONE(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_DHRYSTONE();
};

/** \brief Defines the whetstone benchmark within benchpp package.
 */
class CBMBenchmarkBENCHPPLINUX_WHETSTONE : public CBMBenchmarkBENCHPPLINUX
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);

  virtual std::string benchppBenchmark(void);


 public:
  CBMBenchmarkBENCHPPLINUX_WHETSTONE(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_WHETSTONE();
};

lib_declare();

#endif

--- NEW FILE: Benchmark-BENCHPPLINUX.cpp ---
#include <Benchmark/Benchmark-BENCHPPLINUX.h>
#include <System/System.h>

#include <config.h>

#include <fstream>

#include "Benchmark/Benchmark-BENCHPPLINUX.libwrapper.h"

CBMBenchmarkBENCHPPLINUX::CBMBenchmarkBENCHPPLINUX(CBMSystem *_system)
  : CBMBenchmark(_system)
{
}

std::string CBMBenchmarkBENCHPPLINUX::downloadURL(void)
{
  return("http://downloads.sourceforge.net/benchpplinux/bench_plus_plus_1.1_linux5.tgz");
}

std::string CBMBenchmarkBENCHPPLINUX::expectedMD5(void)
{
  return("003deea400b98ec0bc14f4227a99f2c5");
}

std::string CBMBenchmarkBENCHPPLINUX::packageName(void)
{
  return("benchpp-linux");
}

std::string CBMBenchmarkBENCHPPLINUX::benchmarkComments(void)
{
  std::string comment;

  comment+=benchmarkBENCHPPLINUXComments();
  comment+=" (Comment from README file)";

  return(comment);
}

std::string CBMBenchmarkBENCHPPLINUX::packageVersion(void)
{
  return("1.1v5");
}

int CBMBenchmarkBENCHPPLINUX::packageSize(void)
{
  return(83702);
}

std::string CBMBenchmarkBENCHPPLINUX::packageComments(void)
{
  return("Bench++ for Linux was initially a port of Bench++ (based on" \
	 "ADA PIWG suite) to Linux.");
}

std::string CBMBenchmarkBENCHPPLINUX::localPackageName(void)
{
  return("bench_plus_plus_1.1_linux5.tgz");
}

std::string CBMBenchmarkBENCHPPLINUX::language(void)
{
  return("C++");
}

char* CBMBenchmarkBENCHPPLINUX::extractDirectory(void)
{
  return("bench++-linux");
}

int CBMBenchmarkBENCHPPLINUX::extract(int _force)
{
  std::string localFile = localPackageAbsoluteName();
  std::string cmd;
  std::string sstdout;

  cmd+="cd ";
  cmd+=system->temporaryDirectory(CBMSystem::Extract);
  cmd+=" && ";
  cmd+=CBM_PROG_MKDIR;
  cmd+=" bench++-linux-tmp && ";
  cmd+=CBM_PROG_ZCAT;
  cmd+=" ";
  cmd+=localFile;
  cmd+=" | ";
  cmd+=CBM_PROG_TAR;
  cmd+=" xvf - -C bench++-linux-tmp && mv bench++-linux-tmp/bench++ bench++-linux && rm -rf bench++-linux-tmp";

  return(system->exec(cmd, sstdout)==0);
}

int CBMBenchmarkBENCHPPLINUX::preConfigure(int _force)
{
  return(1);
}

int CBMBenchmarkBENCHPPLINUX::configure(CBMCompiler        *_currentCompiler,
					CBMCompilerOptions *_currentOptions)
{
  std::string cmd;
  std::string sstdout;

  cmd="cd ";
  cmd+=localPackageAbsoluteDirectory();
  cmd+=" && ";
  
  cmd+="CC=\"";
  cmd+=_currentCompiler->Binary();
  cmd+="\" ";
  if (_currentOptions->Options() != "") {
    cmd+="CCFLAGS=\"";
    cmd+=_currentOptions->Options();
    cmd+="\"";
  }

  return(system->exec(cmd, sstdout)==0);
}

int CBMBenchmarkBENCHPPLINUX::make(void)
{
  std::string cmd;
  std::string sstdout;

  cmd="cd ";
  cmd+=localPackageAbsoluteDirectory();
  cmd+=" && ";
  cmd+=CBM_PROG_MAKE;
  cmd+=" a000091 a000092"; // !!! #5a;

  cmd+=" CC=\"";
  cmd+=currentCompiler->Binary();
  cmd+="\" ";
  cmd+=" CCFLAGS=\'-DHAS_BOOL=1 -DGETTIMEOFDAY_UNDEF=0 ";
  cmd+=currentOptions->Options();
  cmd+="' 2> /dev/null";

  printf("%s\n", cmd.c_str());
  return(system->exec(cmd, sstdout)==0);
}

std::string CBMBenchmarkBENCHPPLINUX::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 CBMBenchmarkBENCHPPLINUX::release(void)
{
  std::string cmd;
  std::string sstdout;

  cmd="cd ";
  cmd+=localPackageAbsoluteDirectory();
  cmd+=" && ";
  cmd+=CBM_PROG_MAKE;
  cmd+=" clean 2> /dev/null";

  return(system->exec(cmd, sstdout)==0);
}

std::string CBMBenchmarkBENCHPPLINUX::license(void)
{
  return("Public domain");
}

std::string CBMBenchmarkBENCHPPLINUX::homePage(void)
{
  return("http://web.archive.org/web/20050307095704/www.research.att.com/~orost/bench_plus_plus.html");
}

std::string CBMBenchmarkBENCHPPLINUX::author(void)
{
  return("Joseph M. Orost");
}

int CBMBenchmarkBENCHPPLINUX::benchmarkSize(void)
{
  return(packageSize());
}

CBMBenchmarkBENCHPPLINUX::~CBMBenchmarkBENCHPPLINUX()
{
}

CBMBenchmarkBENCHPPLINUX_DHRYSTONE::CBMBenchmarkBENCHPPLINUX_DHRYSTONE(CBMSystem *_system)
  : CBMBenchmarkBENCHPPLINUX(_system)
{
}

std::string CBMBenchmarkBENCHPPLINUX_DHRYSTONE::benchmarkName(void)
{
  return("benchpp-dhrystone");
}

std::string CBMBenchmarkBENCHPPLINUX_DHRYSTONE::benchppBenchmark(void)
{
  return("a000091");
}

std::string CBMBenchmarkBENCHPPLINUX_DHRYSTONE::benchmarkBENCHPPLINUXComments(void)
{
  return("C++ implementation of the Dhrystone benchmark (see http://www.cs.wisc.edu/~thomas/comp.benchmarks.FAQ.html).");
}

CBMBenchmarkBENCHPPLINUX_DHRYSTONE::~CBMBenchmarkBENCHPPLINUX_DHRYSTONE()
{
}

CBMBenchmarkBENCHPPLINUX_WHETSTONE::CBMBenchmarkBENCHPPLINUX_WHETSTONE(CBMSystem *_system)
  : CBMBenchmarkBENCHPPLINUX(_system)
{
}

std::string CBMBenchmarkBENCHPPLINUX_WHETSTONE::benchmarkName(void)
{
  return("benchpp-whetstone");
}

std::string CBMBenchmarkBENCHPPLINUX_WHETSTONE::benchppBenchmark(void)
{
  return("a000092");
}

std::string CBMBenchmarkBENCHPPLINUX_WHETSTONE::benchmarkBENCHPPLINUXComments(void)
{
  return("C++ implementation of the Whetstone benchmark (see http://www.cs.wisc.edu/~thomas/comp.benchmarks.FAQ.html).");
}

CBMBenchmarkBENCHPPLINUX_WHETSTONE::~CBMBenchmarkBENCHPPLINUX_WHETSTONE()
{
}

[Compbench-devel] CompBenchmarks++ main.h,1.3,1.4

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

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

Modified Files:
	main.h 
Log Message:
Updated documentation.

Index: main.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/main.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** main.h	23 Nov 2006 16:42:48 -0000	1.3
--- main.h	29 Nov 2006 22:01:02 -0000	1.4
***************
*** 31,46 ****
   * Basically, operating system object is detected at CompBenchmarks
   * compilation time and instancied at run time to get others parts working.
!  * Only one user interface as been coded for actual need, it allows the C++
!  * core to interact with compbenchmarks-config. Many benchmarks have been
!  * derivated from base benchmark object; each benchmark can use compilers and
!  * options instances (e.g. through the operating system object).
   *
!  * \section Example
   *
   * Compiled on Linux, program'll use a CBMSystemLinux instance. It can install
   * defined packages (like \link CBMBenchmarkGZIP gzip\endlink or \link
   * CBMBenchmarkBENCHPP Bench++\endlink) via Internet and uses some benchmarks on them.
!  * Benchmarks can also be hard-coded in CompBenchmarks (as, for gzip : \link CBMBenchmarkGZIP1 gzip-1c\endlink) or directly providen by packages (\link CBMBenchmarkBENCHPP_WHETSTONE benchpp-whetstone\endlink).
   *
   */
  
--- 31,60 ----
   * Basically, operating system object is detected at CompBenchmarks
   * compilation time and instancied at run time to get others parts working.
!  * Only one user interface, compbenchmarks-ui-perl as been coded for actual
!  * needs, and it uses the compbenchmarks-core program.
!  * Many benchmarks have been derivated from base benchmark object;
!  * each benchmark can use compilers and options instances (e.g. through
!  * the operating system object).
   *
!  * \section Behaviour
   *
   * Compiled on Linux, program'll use a CBMSystemLinux instance. It can install
   * defined packages (like \link CBMBenchmarkGZIP gzip\endlink or \link
   * CBMBenchmarkBENCHPP Bench++\endlink) via Internet and uses some benchmarks on them.
!  * Benchmarks can also be hard-coded in CompBenchmarks (as, for gzip : \link CBMBenchmarkGZIP1 gzip-1c\endlink) or directly providen by packages (like \link CBMBenchmarkBENCHPP_WHETSTONE benchpp-whetstone\endlink).
   *
+  * External benchmark's packages are supported through independant shared
+  * libraries that use the libcompbenchmarks'.
+  *
+  * To start implementing the support
+  * of a new package, you should :
+  * - download the sources (http://compbench.sf.net),
+  * - take a quick look at \link CBMBenchmark CBMBenchmark\endlink class.
+  * - for, said, Foo_benchpack.tar.gz package, create the Benchmark-FOO-BENCHPACK.cpp and corresponding header files in Benchmark directory,
+  * - update Makefile.am in the Benchmark directory,
+  * - Look at Benchmark-SCIMARK2.cpp or Benchmark-BZIP2.cpp, which are good models.
+  * You can also get in touch with me, see http://compbench.sf.net/cgi-bin/feedback.cgi .
+  *
+  * \section
   */
  

[Compbench-devel] CompBenchmarks++ compbenchmarks-core.pod, 1.1, 1.2

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

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

Modified Files:
	compbenchmarks-core.pod 
Log Message:
compbenchmarks-config renamed to compbenchmarks-ui-perl.

Index: compbenchmarks-core.pod
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks-core.pod,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** compbenchmarks-core.pod	1 Nov 2006 13:19:50 -0000	1.1
--- compbenchmarks-core.pod	29 Nov 2006 19:19:34 -0000	1.2
***************
*** 82,90 ****
  according to customizable parameters.
  
! Normally used by compbenchmarks-config program.
  
  =head1 DIRECTORIES
  
! All but the latest are used by compbenchmark-config.
  
  =over
--- 82,90 ----
  according to customizable parameters.
  
! Normally used by compbenchmarks-ui-perl program.
  
  =head1 DIRECTORIES
  
! All but the latest are used by compbenchmarks-ui-perl
  
  =over
***************
*** 108,112 ****
  =head1 SEE ALSO
  
! Manpage of compbenchmarks-config.
  
  =head1 AUTHOR
--- 108,112 ----
  =head1 SEE ALSO
  
! Manpage of compbenchmarks-ui-perl.
  
  =head1 AUTHOR

[Compbench-devel] CompBenchmarks++/Benchmark Benchmark-SCIMARK2.cpp, 1.5, 1.6

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

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

Modified Files:
	Benchmark-SCIMARK2.cpp 
Log Message:
'lu' name corrected (was smm).

Index: Benchmark-SCIMARK2.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-SCIMARK2.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Benchmark-SCIMARK2.cpp	1 Nov 2006 12:59:56 -0000	1.5
--- Benchmark-SCIMARK2.cpp	28 Nov 2006 17:05:16 -0000	1.6
***************
*** 364,368 ****
  std::string CBMBenchmarkSCIMARK2_LU::benchmarkName(void)
  {
!   return("scimark2-smm");
  }
  
--- 364,368 ----
  std::string CBMBenchmarkSCIMARK2_LU::benchmarkName(void)
  {
!   return("scimark2-lu");
  }
  

[Compbench-devel] CompBenchmarks++ ChangeLog,1.18,1.19

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

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

Modified Files:
	ChangeLog 
Log Message:
A word about unavailable download URLs.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** ChangeLog	27 Nov 2006 17:23:36 -0000	1.18
--- ChangeLog	27 Nov 2006 17:59:21 -0000	1.19
***************
*** 6,10 ****
  	*  compbenchmarks binary renamed to compbenchmarks-core,
  	   compbenchmarks-config renamed to compbenchmarks-ui-perl.
! 	*  Updated download URLs for benchpp and nbench-byte.
  	
  0.3.2
--- 6,11 ----
  	*  compbenchmarks binary renamed to compbenchmarks-core,
  	   compbenchmarks-config renamed to compbenchmarks-ui-perl.
! 	*  Updated download URLs for benchpp and nbench-byte, unavailable
! 	   download URLs identified and reported.
  	
  0.3.2

[Compbench-devel] CompBenchmarks++ ChangeLog,1.17,1.18

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

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

Modified Files:
	ChangeLog 
Log Message:
Changes for 0.3.3.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ChangeLog	21 Nov 2006 19:29:15 -0000	1.17
--- ChangeLog	27 Nov 2006 17:23:36 -0000	1.18
***************
*** 1,9 ****
  0.3.3
  	*  New interfaces for packages and benchmarks providen through
! 	   independant shared libraries.
  	*  New libcompbenchmarks library.
  	*  Installation mechanism improved for headers and libraries.
  	*  compbenchmarks binary renamed to compbenchmarks-core,
  	   compbenchmarks-config renamed to compbenchmarks-ui-perl.
  	
  0.3.2
--- 1,10 ----
  0.3.3
  	*  New interfaces for packages and benchmarks providen through
! 	   shared libraries.
  	*  New libcompbenchmarks library.
  	*  Installation mechanism improved for headers and libraries.
  	*  compbenchmarks binary renamed to compbenchmarks-core,
  	   compbenchmarks-config renamed to compbenchmarks-ui-perl.
+ 	*  Updated download URLs for benchpp and nbench-byte.
  	
  0.3.2

[Compbench-devel] CompBenchmarks++ Makefile.am,1.11,1.12

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

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

Modified Files:
	Makefile.am 
Log Message:
Header files' root is now $(includedir)

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Makefile.am	1 Nov 2006 14:22:26 -0000	1.11
--- Makefile.am	27 Nov 2006 17:23:17 -0000	1.12
***************
*** 16,20 ****
  libcompbenchmarks_la_DEPENDENCIES =     $(libcompbenchmarks_la_LIBADD)
  
! include_HEADERS   = libcompbenchmarks.h config.h CBM.h
  
  compbenchmarks_core_LDADD	=       libcompbenchmarks.la
--- 16,22 ----
  libcompbenchmarks_la_DEPENDENCIES =     $(libcompbenchmarks_la_LIBADD)
  
! libcompbenchmarksinclude_HEADERS   = libcompbenchmarks.h config.h CBM.h
! 
! libcompbenchmarksincludedir		=	$(includedir)/compbenchmarks
  
  compbenchmarks_core_LDADD	=       libcompbenchmarks.la

[Compbench-devel] CompBenchmarks++/Compiler/Compiler-TCC Makefile.am, 1.1, 1.2

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

Update of /cvsroot/compbench/CompBenchmarks++/Compiler/Compiler-TCC
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv1403

Modified Files:
	Makefile.am 
Log Message:
Header files' root is now $(includedir)

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Compiler/Compiler-TCC/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am	1 Nov 2006 11:19:30 -0000	1.1
--- Makefile.am	27 Nov 2006 17:22:40 -0000	1.2
***************
*** 6,10 ****
  
  libCompilerinclude_HEADERS	=	$(sources:.cpp=.h)
! libCompilerincludedir		=	$(includedir)/Compiler/Compiler-TCC
  
  INCLUDES			=	-I $(top_srcdir)
\ No newline at end of file
--- 6,10 ----
  
  libCompilerinclude_HEADERS	=	$(sources:.cpp=.h)
! libCompilerincludedir		=	$(includedir)/compbenchmarks/Compiler/Compiler-TCC
  
  INCLUDES			=	-I $(top_srcdir)
\ No newline at end of file

[Compbench-devel] CompBenchmarks++/Compiler/Compiler-GCC Makefile.am, 1.1, 1.2

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

Update of /cvsroot/compbench/CompBenchmarks++/Compiler/Compiler-GCC
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv1378

Modified Files:
	Makefile.am 
Log Message:
Header files' root is now $(includedir)

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Compiler/Compiler-GCC/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am	1 Nov 2006 11:18:54 -0000	1.1
--- Makefile.am	27 Nov 2006 17:22:22 -0000	1.2
***************
*** 6,10 ****
  
  libCompilerinclude_HEADERS	=	$(sources:.cpp=.h)
! libCompilerincludedir		=	$(includedir)/Compiler/Compiler-GCC
  
  INCLUDES			=	-I $(top_srcdir)
\ No newline at end of file
--- 6,10 ----
  
  libCompilerinclude_HEADERS	=	$(sources:.cpp=.h)
! libCompilerincludedir		=	$(includedir)/compbenchmarks/Compiler/Compiler-GCC
  
  INCLUDES			=	-I $(top_srcdir)
\ No newline at end of file

[Compbench-devel] CompBenchmarks++/UI Makefile.am,1.1.1.1,1.2

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

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

Modified Files:
	Makefile.am 
Log Message:
Header files' root is now $(includedir)

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/UI/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.am	8 Sep 2006 17:04:28 -0000	1.1.1.1
--- Makefile.am	27 Nov 2006 17:21:30 -0000	1.2
***************
*** 5,9 ****
  libUI_la_SOURCES 	=	$(sources)
  
! noinst_HEADERS		=	$(sources:.cpp=.h)
  
  INCLUDES		=	-I $(top_srcdir)
--- 5,10 ----
  libUI_la_SOURCES 	=	$(sources)
  
! libUIinclude_HEADERS	=	$(sources:.cpp=.h)
! libUIincludedir		=	$(includedir)/compbenchmarks/UI
  
  INCLUDES		=	-I $(top_srcdir)

[Compbench-devel] CompBenchmarks++/System Makefile.am,1.7,1.8

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

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

Modified Files:
	Makefile.am 
Log Message:
Header files' root is now $(includedir)

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/System/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile.am	21 Nov 2006 19:32:12 -0000	1.7
--- Makefile.am	27 Nov 2006 17:20:06 -0000	1.8
***************
*** 21,25 ****
  
  libSysteminclude_HEADERS=	$(sources:.cpp=.h) $(EXTRA_DIST:.cpp=.h)
! libSystemincludedir	=	$(includedir)/System
  
  CXXFLAGS		+=	-DERRNO_DONE=1 -DDATAROOTDIR=\"@datarootdir@\"
--- 21,25 ----
  
  libSysteminclude_HEADERS=	$(sources:.cpp=.h) $(EXTRA_DIST:.cpp=.h)
! libSystemincludedir	=	$(includedir)/compbenchmarks/System
  
  CXXFLAGS		+=	-DERRNO_DONE=1 -DDATAROOTDIR=\"@datarootdir@\"

[Compbench-devel] CompBenchmarks++/Compiler Makefile.am,1.1,1.2

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

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

Modified Files:
	Makefile.am 
Log Message:
Header files' root is now $(includedir)

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Compiler/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am	1 Nov 2006 11:32:10 -0000	1.1
--- Makefile.am	27 Nov 2006 17:19:41 -0000	1.2
***************
*** 13,17 ****
  
  libCompilerinclude_HEADERS	=	$(sources:.cpp=.h)
! libCompilerincludedir		=	$(includedir)/Compiler
  
  
--- 13,17 ----
  
  libCompilerinclude_HEADERS	=	$(sources:.cpp=.h)
! libCompilerincludedir		=	$(includedir)/compbenchmarks/Compiler
  
  

[Compbench-devel] CompBenchmarks++/Benchmark Makefile.am,1.9,1.10

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

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

Modified Files:
	Makefile.am 
Log Message:
Header files' root is now $(includedir)

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Makefile.am	21 Nov 2006 19:31:45 -0000	1.9
--- Makefile.am	27 Nov 2006 17:18:24 -0000	1.10
***************
*** 40,44 ****
  
  libBenchmarkinclude_HEADERS		=	$(sources:.cpp=.h)
! libBenchmarkincludedir			=	$(includedir)/Benchmark
  
  INCLUDES				=	-I $(top_srcdir)
--- 40,44 ----
  
  libBenchmarkinclude_HEADERS		=	$(sources:.cpp=.h)
! libBenchmarkincludedir			=	$(includedir)/compbenchmarks/Benchmark
  
  INCLUDES				=	-I $(top_srcdir)

[Compbench-devel] CompBenchmarks++ main.h,1.2,1.3

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

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

Modified Files:
	main.h 
Log Message:
Minor fixes in class names.

Index: main.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/main.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** main.h	2 Oct 2006 16:28:11 -0000	1.2
--- main.h	23 Nov 2006 16:42:48 -0000	1.3
***************
*** 26,30 ****
   * - \link CBMSystem operating system\endlink,
   * - \link CBMBenchmark benchmark\endlink or packages,
!  * - \link CBMBenchmarkContextCompiler compiler\endlink,
   * - \link CBMUI user interface\endlink.
   *
--- 26,30 ----
   * - \link CBMSystem operating system\endlink,
   * - \link CBMBenchmark benchmark\endlink or packages,
!  * - \link CBMCompiler compiler\endlink,
   * - \link CBMUI user interface\endlink.
   *
***************
*** 41,45 ****
   * defined packages (like \link CBMBenchmarkGZIP gzip\endlink or \link
   * CBMBenchmarkBENCHPP Bench++\endlink) via Internet and uses some benchmarks on them.
!  * Benchmarks can be hard-coded in CompBenchmarks (as, for gzip : \link CBMBenchmarkGZIP1 gzip-1c\endlink) or directly providen by packages (\link CBMBenchmarkBENCHPP_WHETSTONE benchpp-whetstone\endlink).
   *
   */
--- 41,45 ----
   * defined packages (like \link CBMBenchmarkGZIP gzip\endlink or \link
   * CBMBenchmarkBENCHPP Bench++\endlink) via Internet and uses some benchmarks on them.
!  * Benchmarks can also be hard-coded in CompBenchmarks (as, for gzip : \link CBMBenchmarkGZIP1 gzip-1c\endlink) or directly providen by packages (\link CBMBenchmarkBENCHPP_WHETSTONE benchpp-whetstone\endlink).
   *
   */