compbench-devel Mailing List for CompBenchmarks (Page 29)

Brought to you by: xfred

compbench-devel

You can subscribe to this list here.

2006	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep (48)	_Oct (51)	_Nov (66)	_Dec (83)
2007	_Jan (242)	_Feb (56)	_Mar (95)	_Apr (120)	_May (127)	_Jun (32)	_Jul (10)	_Aug (55)	_Sep (114)	_Oct (3)	_Nov	_Dec

Flat | Threaded

<< < 1 .. 27 28 29 30 31 .. 45 > >> (Page 29 of 45)

[Compbench-devel] CompBenchmarks++/libcompbenchmarks/Base XMLReader.cpp, NONE, 1.1 XMLReader.h, NONE, 1.1

From: Frederic T. <xf...@us...> - 2007-01-23 18:43:51

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

Added Files:
	XMLReader.cpp XMLReader.h 
Log Message:
First import.

--- NEW FILE: XMLReader.cpp ---
#include <Base/XMLReader.h>
#include <Base/XML.h>

#include <System/System.h>

using namespace CBM;

XMLReader::XMLReader()
{
}

XMLNode *XMLReader::parse(xmlNode *node,
			  XMLNode **C)
{
  xmlNode      *cur_n;
  xmlAttr      *cur_a;
  XMLNode      *N;
  XMLAttribute *A;
  std::string  tmp_a;
  std::string  tmp_n;
  std::string  tmp_v;

  xmlChar      *tmpcat_n;
  xmlChar      *buffer;

  for(cur_n=node; cur_n; cur_n=cur_n->next) {
    if (cur_n->type == XML_TEXT_NODE) {
      if (*C) {
	tmpcat_n=xmlStrdup(cur_n->content);
	if (tmpcat_n) {
	  tmp_v=(char*) tmpcat_n;
	  xmlFree(tmpcat_n);
	  cbmSystem->Chomp(tmp_v);
	  if (tmp_v!="")
	    (*C)->append(tmp_v);
	}
      }
    }
    if (cur_n->type == XML_ELEMENT_NODE) {
      tmpcat_n=0;
      tmp_n="";
      cbmSystem->Chomp(tmp_n);
      N=new CBM::XMLNode((char*) cur_n->name,
			 tmp_n);
      if (!*(C)) {
	*C=N;
      } else {
	(*C)->add(N);
      }
      
      for(cur_a=cur_n->properties; cur_a; cur_a=cur_a->next) {
	tmp_a=(char*) xmlGetProp(cur_n, cur_a->name);
	cbmSystem->Chomp(tmp_a);
	A=new CBM::XMLAttribute((char*) cur_a->name,
				tmp_a);
	N->add(A);
      }
      parse(cur_n->children, &N);
    }
  }

  if (C)
    return(*C);
  else
    return(0);
}

XMLNode *XMLReader::read(std::string filename)
{
  xmlDoc        *doc;
  xmlNode       *root;
  XMLNode       *C = 0;

  xmlInitParser();

  LIBXML_TEST_VERSION

  doc=xmlReadFile(filename.c_str(), NULL, 0);
  if (!doc)
    return(0);

  root=xmlDocGetRootElement(doc);
  parse(root, &C);

  xmlCleanupParser();
  xmlMemoryDump();

  return(C);
}

XMLReader::~XMLReader()
{
}

--- NEW FILE: XMLReader.h ---
/* ----------------------------------------------------------------------------
   $Id: XMLReader.h,v 1.1 2007/01/23 18:43:45 xfred Exp $

   This is free software.
   For details, see the GNU Public License in the COPYING file, or
   Look http://www.fsf.org
   ------------------------------------------------------------------------- */
#ifndef H_XMLREADER
#define H_XMLREADER 1

#include <string>

#include <libxml/tree.h>
#include <libxml/parser.h>

namespace CBM {
  /** \brief XML file reader
   *  Class to read XML files and build an XMLNode.
   *  \sa XMLNode
   */
  class XMLReader {
  protected:
    virtual class XMLNode *parse(xmlNode       *node,
				 class XMLNode **C);
  public:
    /** Constructor */
    XMLReader();

    /** Parse a file
	Transform given XML file to and XMLNode representation.
	\param filename filename to read
	\return XMLNode instance (hierarchy)
	\sa XMLNode
    */
    class XMLNode *read(std::string filename);

    /** Destructor  */
    virtual ~XMLReader();
  };
}

#endif

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

From: Frederic T. <xf...@us...> - 2007-01-23 16:51:42

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

Modified Files:
	Benchmark.cpp Benchmark.h 
Log Message:
Measures execution time.

Index: Benchmark.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Benchmark.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Benchmark.h	22 Jan 2007 18:21:47 -0000	1.1
--- Benchmark.h	23 Jan 2007 16:51:26 -0000	1.2
***************
*** 50,53 ****
--- 50,56 ----
      virtual std::string bench(void) = 0;
  
+     /** \sa executionTime() */
+     std::string lastExecutionTime;
+ 
    public:
      /** Display informations about benchmark
***************
*** 68,73 ****
--- 71,84 ----
       *  \return benchmark's result (performance) as a non-null positive number. May changes status.
       *  \sa Make()
+      *  \sa executionTime()
       *  \sa status */
      virtual std::string Bench(void);
+     
+     /** Give execution time.
+      *  Returns last execution time (in seconds) of bench().
+      *  \return execution time in seconds
+      *  \sa Bench()
+      *  \sa bench() */
+     virtual std::string executionTime(void);
  
      /** Virtual destructor */

Index: Benchmark.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Benchmark.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Benchmark.cpp	22 Jan 2007 18:21:47 -0000	1.1
--- Benchmark.cpp	23 Jan 2007 16:51:26 -0000	1.2
***************
*** 41,45 ****
    std::string r;
    std::string info;
! 
  
    if (((Package()->getStatus()<Package::Tested) && (Package()->hasTest())) &&
--- 41,47 ----
    std::string r;
    std::string info;
!   time_t      beg;
!   time_t      end;
!   char        tmp[128];
  
    if (((Package()->getStatus()<Package::Tested) && (Package()->hasTest())) &&
***************
*** 56,63 ****
--- 58,70 ----
  		     Name());
  
+ 
+   beg=System()->Time();
    r=bench();
    Package()->System()->Chomp(r);
  
    if (r!="0") {
+     end=System()->Time();
+     sprintf(tmp, "%f", (double) (end-beg));
+     lastExecutionTime=tmp;
      Package()->storeStatus(Package::Benchmarked);
      cbmUI->Information(CBM::UI::BenchResult,
***************
*** 72,75 ****
--- 79,87 ----
  }
  
+ std::string Benchmark::executionTime(void)
+ {
+   return(lastExecutionTime);
+ }
+ 
  Benchmark::~Benchmark()
  {

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

From: Frederic T. <xf...@us...> - 2007-01-22 18:28:29

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

Modified Files:
	Makefile.am 
Log Message:
Source CVS tag added.
Build dependencies are explicit.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile.am	22 Jan 2007 18:17:20 -0000	1.7
--- Makefile.am	22 Jan 2007 18:28:22 -0000	1.8
***************
*** 1,4 ****
--- 1,5 ----
  # -----------------------------------------------------------------------------
  # $Id$
+ # $Source$
  #
  # This is free software.
***************
*** 11,14 ****
--- 12,17 ----
  libCBM_la_SOURCES	=	Glue.cpp Glue.h CBM_wrap.cxx
  
+ libCBM_la_DEPENDENCIES =      ../libcompbenchmarks/libcompbenchmarks.la
+ 
  SUBDIRS		=	t
  INCLUDES	 =	-I$(top_srcdir)/libcompbenchmarks -I$(top_srcdir)/CBM-PI -I.. -I. -I$(top_srcdir)

[Compbench-devel] CompBenchmarks++ Makefile.am,1.15,1.16

From: Frederic T. <xf...@us...> - 2007-01-22 18:27:55

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

Modified Files:
	Makefile.am 
Log Message:
Build dependencies are explicit.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Makefile.am	22 Jan 2007 18:18:39 -0000	1.15
--- Makefile.am	22 Jan 2007 18:27:50 -0000	1.16
***************
*** 17,20 ****
--- 17,21 ----
  
  compbenchmarks_core_LDADD	=       libcompbenchmarks/libcompbenchmarks.la
+ compbenchmarks_core_DEPENDENCIES =      libcompbenchmarks/libcompbenchmarks.la
  
  noinst_HEADERS			=	cloptions.h main.h $(libcompbenchmarks_la_SOURCES:.cpp=.h) # !!!

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

From: Frederic T. <xf...@us...> - 2007-01-22 18:25:39

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

Modified Files:
	Makefile.am 
Log Message:
Source CVS tag added.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/UI/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am	22 Jan 2007 18:16:51 -0000	1.1
--- Makefile.am	22 Jan 2007 18:25:23 -0000	1.2
***************
*** 1,4 ****
--- 1,5 ----
  # -----------------------------------------------------------------------------
  # $Id$
+ # $Source$
  #
  # This is free software.

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

From: Frederic T. <xf...@us...> - 2007-01-22 18:25:16

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

Modified Files:
	Makefile.am 
Log Message:
Source CVS tag added.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/System/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am	22 Jan 2007 17:50:39 -0000	1.1
--- Makefile.am	22 Jan 2007 18:25:02 -0000	1.2
***************
*** 1,4 ****
--- 1,5 ----
  # -----------------------------------------------------------------------------
  # $Id$
+ # $Source$
  #
  # This is free software.

[Compbench-devel] CompBenchmarks++/libcompbenchmarks/share/system/cygwin Makefile.am, 1.1, 1.2

From: Frederic T. <xf...@us...> - 2007-01-22 18:24:54

Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/system/cygwin
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20743/system/cygwin

Modified Files:
	Makefile.am 
Log Message:
Source CVS tag added.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/system/cygwin/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am	22 Jan 2007 18:03:55 -0000	1.1
--- Makefile.am	22 Jan 2007 18:24:45 -0000	1.2
***************
*** 1,2 ****
--- 1,11 ----
+ # -----------------------------------------------------------------------------
+ # $Id$
+ # $Source$
+ #
+ # This is free software.
+ # For details, see the GNU Public License in the COPYING file, or
+ # Look http://www.fsf.org
+ # -----------------------------------------------------------------------------
+ 
  source_sys	        = systemInfo.vbs

[Compbench-devel] CompBenchmarks++/libcompbenchmarks/share/system Makefile.am, 1.1, 1.2

From: Frederic T. <xf...@us...> - 2007-01-22 18:24:49

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

Modified Files:
	Makefile.am 
Log Message:
Source CVS tag added.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/system/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am	22 Jan 2007 18:03:55 -0000	1.1
--- Makefile.am	22 Jan 2007 18:24:45 -0000	1.2
***************
*** 1,2 ****
--- 1,11 ----
+ # -----------------------------------------------------------------------------
+ # $Id$
+ # $Source$
+ #
+ # This is free software.
+ # For details, see the GNU Public License in the COPYING file, or
+ # Look http://www.fsf.org
+ # -----------------------------------------------------------------------------
+ 
  SUBDIRS			=	cygwin

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

From: Frederic T. <xf...@us...> - 2007-01-22 18:24:48

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

Modified Files:
	Makefile.am 
Log Message:
Source CVS tag added.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am	22 Jan 2007 18:05:51 -0000	1.1
--- Makefile.am	22 Jan 2007 18:24:45 -0000	1.2
***************
*** 1 ****
--- 1,10 ----
+ # -----------------------------------------------------------------------------
+ # $Id$
+ # $Source$
+ #
+ # This is free software.
+ # For details, see the GNU Public License in the COPYING file, or
+ # Look http://www.fsf.org
+ # -----------------------------------------------------------------------------
+ 
  SUBDIRS		=	patches system
\ No newline at end of file

[Compbench-devel] CompBenchmarks++/libcompbenchmarks/share/patches Makefile.am, 1.1, 1.2

From: Frederic T. <xf...@us...> - 2007-01-22 18:24:48

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

Modified Files:
	Makefile.am 
Log Message:
Source CVS tag added.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/patches/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am	22 Jan 2007 18:04:48 -0000	1.1
--- Makefile.am	22 Jan 2007 18:24:45 -0000	1.2
***************
*** 1,2 ****
--- 1,11 ----
+ # -----------------------------------------------------------------------------
+ # $Id$
+ # $Source$
+ #
+ # This is free software.
+ # For details, see the GNU Public License in the COPYING file, or
+ # Look http://www.fsf.org
+ # -----------------------------------------------------------------------------
+ 
  data_DATA = scimark2.patch.gz benchpp.patch.gz

[Compbench-devel] CompBenchmarks++/libcompbenchmarks/Compiler Compiler-Options.cpp, NONE, 1.1 Compiler-Options.h, NONE, 1.1 Compiler.cpp, NONE, 1.1 Compiler.h, NONE, 1.1 Makefile.am, NONE, 1.1

From: Frederic T. <xf...@us...> - 2007-01-22 18:24:27

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

Added Files:
	Compiler-Options.cpp Compiler-Options.h Compiler.cpp 
	Compiler.h Makefile.am 
Log Message:
libcompbenchmarks moved in a separate directory.

--- NEW FILE: Compiler.h ---
/* ----------------------------------------------------------------------------
   $Id: Compiler.h,v 1.1 2007/01/22 18:24:21 xfred Exp $

   This is free software.
   For details, see the GNU Public License in the COPYING file, or
   Look http://www.fsf.org
   ------------------------------------------------------------------------- */

#ifndef H_CBMCOMPILER
#define H_CBMCOMPILER

#include <string>

namespace CBM {
  // class CBM::System;


  /** \brief Abstraction layer for handling compilers.
   *
   *  This class defines the base abstract (pure) object for all supported compilers.
   */
  class Compiler
  {
  private:
    /** Internal usage
     *   Speeds up compilerName().
     */
    std::string     cacheCompilerName;

    /** Internal usage
     *  Speeds up compilerVersion().
     */
    std::string     cacheCompilerVersion;

  protected:
    /** Used internally to get information on compiler's binary */
    class System    *system;

    /** Initialised by constructor.
	\sa Compiler()
    */
    char            *compilerBinary;

    /** Constructor
	\param _system the System to use internaly.
	\param _compilerBinary absolute or relative path to the compiler program */
    Compiler(class System *_system,
	     char         *_compilerBinary);

    /** Gets compiler's name
     *  \return std::string containing the name of the compiler
     *  \sa getCompilerName() */
    virtual std::string getCompilerName(void)    = 0;

    /** Gets compiler's version
     *  \return std::string containing the version of the compiler
     *  \sa getCompilerVersion() */
    virtual std::string getCompilerVersion(void) = 0;
  public:
    /** Display compiler's information.
     *  Format is strict. This output is used by compbenchmark-config.
     */
    virtual void display(void);

    /** Internal compiler id.
	\return std::string like 'gcc' or 'g++'.
    */
    virtual std::string compiler(void) = 0;
    /** Gets compiler's name. Do not overload.
	\sa getCompilerName()
	\return The compiler name. */
    virtual std::string compilerName(void);

    /** Gets compiler's version. Do not overload.
	\sa getCompilerVersion()
	\return The compiler version. */
    virtual std::string compilerVersion(void);

    /** Gets compiler's program (as specified in constructor).
	\return The compiler program (absolute or relative, depending on method used in instanciation). */
    virtual std::string Binary(void);

    /** Gets compiler's language.
	\return C or C++. */
    virtual char *language(void) = 0;
    /** Virtual destructor */
    virtual ~Compiler();
  };

  /** \brief Gives a compiler object according to a binary (or executable) program.
   *
   *  This class creates Compiler objects. It is only instancied once, and I currently see no need to derivate it.
   */
  class CompilerSelector
  {
  private:
  protected:
    class System *system;

  public:
    /** Constructor */
    CompilerSelector(class System *_system);
  
    /** Main method.
     *  Returns a Compiler object.
     *  \param compilerBinary Absolute or relative name of the compiler program
     */
    Compiler *select(char *compilerBinary);

    /** Virtual destructor */
    ~CompilerSelector();

  };
}

#endif

--- NEW FILE: Makefile.am ---
# -----------------------------------------------------------------------------
# $Id: Makefile.am,v 1.1 2007/01/22 18:24:21 xfred Exp $
# $Source: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Makefile.am,v $
#
# This is free software.
# For details, see the GNU Public License in the COPYING file, or
# Look http://www.fsf.org
# -----------------------------------------------------------------------------

noinst_LTLIBRARIES		=	libCompiler.la

SUBDIRS				=	Compiler-TCC Compiler-GCC


libCompiler_la_LIBADD		=       Compiler-TCC/libCompilerTCC.la \
					Compiler-GCC/libCompilerGCC.la

sources				=       Compiler.cpp \
					Compiler-Options.cpp

libCompiler_la_SOURCES 		=	$(sources)

libCompilerinclude_HEADERS	=	$(sources:.cpp=.h)
libCompilerincludedir		=	$(includedir)/compbenchmarks/Compiler


INCLUDES			=	-I $(top_srcdir)/libcompbenchmarks
--- NEW FILE: Compiler-Options.h ---
/* ----------------------------------------------------------------------------
   $Id: Compiler-Options.h,v 1.1 2007/01/22 18:24:21 xfred Exp $

   This is free software.
   For details, see the GNU Public License in the COPYING file, or
   Look http://www.fsf.org
   ------------------------------------------------------------------------- */

#ifndef H_CBMCOMPILER_OPTIONS
#define H_CBMCOMPILER_OPTIONS

#include <string>

namespace CBM {
  class CBMCompiler;

  /** \brief Abstraction layer for handling compilers' options.
   *
   *  This class defines the base object for all options to supported compilers.
   *  It only stores options (std::string, or char*) into an object and allows
   *  querying them.
   */
  class CompilerOptions
  {
  private:
    /** Stores options. Initialised by constructor.
     *  \sa Options()
     */

    std::string                       options;

    /** Stores compiler using options. Initialised by constructor.
     *  \sa Compiler()
     */
    class Compiler *compiler;

  protected:

  public:
    /** Constructor
	\param _compiler Compiler object related to given options
	\param _options Options to manage in current object.
    */
    CompilerOptions(class Compiler *_compiler,
		    char              *_options);

    /** Retrives compiler
	\return Compiler instance declared in constructor */
    virtual class Compiler *Compiler(void);

    /** Retrives options
	\return Options (to compiler instance) declared in constructor */
    virtual std::string Options(void);

    virtual ~CompilerOptions();
  };
}

#endif

--- NEW FILE: Compiler.cpp ---
/* ----------------------------------------------------------------------------
   $Id: Compiler.cpp,v 1.1 2007/01/22 18:24:21 xfred Exp $

   This is free software.
   For details, see the GNU Public License in the COPYING file, or
   Look http://www.fsf.org
   ------------------------------------------------------------------------- */

#include <Compiler/Compiler.h>
#include <Compiler/Compiler-GCC/Compiler-GCC.h>
#include <Compiler/Compiler-TCC/Compiler-TCC.h>

#include <System/System.h>
#include <iostream>

using namespace CBM;

Compiler::Compiler(System *_system,
		   char      *_compilerBinary)
{
  system=_system;
  compilerBinary=_compilerBinary;
}

std::string Compiler::compilerName(void)
{
  if (cacheCompilerName!="")
    return(cacheCompilerName);

  cacheCompilerName=getCompilerName();
  system->Chomp(cacheCompilerName);
  return(cacheCompilerName);
}

std::string Compiler::compilerVersion(void)
{
  if (cacheCompilerVersion!="")
    return(cacheCompilerVersion);

  cacheCompilerVersion=getCompilerVersion();
  system->Chomp(cacheCompilerVersion);
  return(cacheCompilerVersion);
}

std::string Compiler::Binary(void)
{
  return(compilerBinary);
}

void Compiler::display(void)
{
  std::cout << "compiler::id=" << compiler() << std::endl
	    << "compiler::name=" << compilerName() << std::endl
	    << "compiler::version=" << compilerVersion() << std::endl
	    << "compiler::language=" << language() << std::endl
	    << "compiler::binary=" << Binary() << std::endl;
}

Compiler::~Compiler()
{
}

CompilerSelector::CompilerSelector(CBM::System *_system)
{
  system=_system;
}

Compiler *CompilerSelector::select(char *compilerBinary)
{
  std::string cmd;
  std::string raw;

  cmd="(";
  cmd+=compilerBinary;
  cmd+=" --version) 2> /dev/null";

  system->exec(cmd, raw);
  if (raw!="") {
    if (((int) raw.find("(GCC)")>0) &&
	((int) raw.find("Free Software Foundation")>0)) {
      if ((int) raw.find("g++")>=0) {
	return(new CompilerGCC_cpp(system,
						      compilerBinary));
      } else
	return(new CompilerGCC(system,
						  compilerBinary));
    }
    raw=compilerBinary;
    if (((int) raw.find("g++")>0) || (raw=="g++")) {
      return(new CompilerGCC_cpp(system,
						    compilerBinary));
    }
    if (((int) raw.find("gcc")>0) || (raw=="gcc")) {
      return(new CompilerGCC(system,
						compilerBinary));
    }
  }

  cmd="(";
  cmd+=compilerBinary;
  cmd+=" -h) 2> /dev/null";

  system->exec(cmd, raw);  /* !!! */
  if (raw!="") {
    if ((int) raw.find("Tiny C Compiler">0)) {
      return(new CompilerTCC(system,
						compilerBinary));
    }
  }
  /* !!! */
  return(0);
}


CompilerSelector::~CompilerSelector()
{
}

--- NEW FILE: Compiler-Options.cpp ---
/* ----------------------------------------------------------------------------
   $Id: Compiler-Options.cpp,v 1.1 2007/01/22 18:24:21 xfred Exp $

   This is free software.
   For details, see the GNU Public License in the COPYING file, or
   Look http://www.fsf.org
   ------------------------------------------------------------------------- */

#include <Compiler/Compiler-Options.h>
#include <Compiler/Compiler.h>

using namespace CBM;

CompilerOptions::CompilerOptions(CBM::Compiler    *_compiler,
				 char             *_options)
{
  compiler=_compiler;
  options=_options;
}

Compiler *CompilerOptions::Compiler(void)
{
  return(compiler);
}

std::string CompilerOptions::Options(void)
{
  return(options);
}

CompilerOptions::~CompilerOptions()
{
}

[Compbench-devel] CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-GCC Compiler-GCC.cpp, NONE, 1.1 Compiler-GCC.h, NONE, 1.1 Makefile.am, NONE, 1.1

From: Frederic T. <xf...@us...> - 2007-01-22 18:24:25

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

Added Files:
	Compiler-GCC.cpp Compiler-GCC.h Makefile.am 
Log Message:
libcompbenchmarks moved in a separate directory.

--- NEW FILE: Compiler-GCC.h ---
/* ----------------------------------------------------------------------------
   $Id: Compiler-GCC.h,v 1.1 2007/01/22 18:24:21 xfred Exp $

   This is free software.
   For details, see the GNU Public License in the COPYING file, or
   Look http://www.fsf.org
   ------------------------------------------------------------------------- */

#ifndef H_CBMCOMPILER_GCC
#define H_CBMCOMPILER_GCC

#include <Compiler/Compiler.h>

namespace CBM {
  /** \brief Defines the gcc compiler
   */
  class CompilerGCC : public Compiler
  {
  private:
  protected:

    virtual std::string getCompilerName(void);
    virtual std::string getCompilerVersion(void);
    virtual char *language(void);

  public:
    CompilerGCC(class           System *_system,
		char            *_compilerBinary);

    virtual std::string compiler(void);
    virtual ~CompilerGCC();
  };


  /** \brief Defines the g++ compiler
   */
  class CompilerGCC_cpp : public Compiler
  {
  private:
  protected:

    virtual std::string getCompilerName(void);
    virtual std::string getCompilerVersion(void);
    virtual char *language(void);

  public:
    CompilerGCC_cpp (class           System *_system,
		     char            *_compilerBinary);

    virtual std::string compiler(void);
    virtual ~CompilerGCC_cpp();
  };
}

#endif

--- NEW FILE: Makefile.am ---
# -----------------------------------------------------------------------------
# $Id: Makefile.am,v 1.1 2007/01/22 18:24:21 xfred Exp $
# $Source: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-GCC/Makefile.am,v $
#
# This is free software.
# For details, see the GNU Public License in the COPYING file, or
# Look http://www.fsf.org
# -----------------------------------------------------------------------------

noinst_LTLIBRARIES		=	libCompilerGCC.la

sources				=       Compiler-GCC.cpp

libCompilerGCC_la_SOURCES 	=	$(sources)

libCompilerinclude_HEADERS	=	$(sources:.cpp=.h)
libCompilerincludedir		=	$(includedir)/compbenchmarks/Compiler/Compiler-GCC

INCLUDES			=	-I $(top_srcdir)/libcompbenchmarks
--- NEW FILE: Compiler-GCC.cpp ---
/* ----------------------------------------------------------------------------
   $Id: Compiler-GCC.cpp,v 1.1 2007/01/22 18:24:21 xfred Exp $

   This is free software.
   For details, see the GNU Public License in the COPYING file, or
   Look http://www.fsf.org
   ------------------------------------------------------------------------- */

#include <Compiler/Compiler-GCC/Compiler-GCC.h>
#include <System/System.h>

#include <config.h>

using namespace CBM;

CompilerGCC::CompilerGCC(CBM::System *_system,
	 char        *_compilerBinary)
  : Compiler(_system, _compilerBinary)
{
}

std::string CompilerGCC::compiler(void)
{
  std::string str = "gcc";

  return(str);
}

std::string CompilerGCC::getCompilerName(void)
{
  std::string cmd = compilerBinary;
  std::string result;
  std::string tmp;

  cmd+=" --version | ";
  cmd+=CBM_PROG_HEAD;
  cmd+=" -1";
  system->exec(cmd, result); /* !!! */

  if ((int) result.find("gcc")<0) {
    tmp="gcc ";
    tmp+=result;
    result=tmp;
  }
  return(result);
}

std::string CompilerGCC::getCompilerVersion(void)
{
  std::string cmd = "I=`";
  std::string result;

  cmd+=compilerBinary;

  cmd+=" --version | ";
  cmd+=CBM_PROG_HEAD;
  cmd+=" -1`; echo $I | ";
  cmd+=CBM_PROG_GREP;
  cmd+=" prerelease > /dev/null; if test $? = 0; then echo $I | ";
  cmd+=CBM_PROG_CUT;
  cmd+=" -f3-5 -d' '; else echo $I | ";
  cmd+=CBM_PROG_CUT;
  cmd+=" -f3 -d' '; fi"; /* !!! */

  system->exec(cmd, result); /* !!! */
  return(result);
}

char *CompilerGCC::language(void)
{
  return("C");
}

CompilerGCC::~CompilerGCC()
{
}

CompilerGCC_cpp::CompilerGCC_cpp(CBM::System *_system,
		 char      *_compilerBinary)
  : Compiler(_system, _compilerBinary)
{
}

std::string CompilerGCC_cpp::compiler(void)
{
  std::string str = "g++";

  return(str);
}

std::string CompilerGCC_cpp::getCompilerName(void)
{
  std::string cmd = compilerBinary;
  std::string result;
  std::string tmp;

  cmd+=" --version | ";
  cmd+=CBM_PROG_HEAD;
  cmd+=" -1";
  system->exec(cmd, result); /* !!! */

  if ((int) result.find("g++")<0) {
    tmp="g++ ";
    tmp+=result;
    result=tmp;
  }
  return(result);
}

std::string CompilerGCC_cpp::getCompilerVersion(void)
{
  std::string cmd = "I=`";
  std::string result;

  cmd+=compilerBinary;

  cmd+=" --version | ";
  cmd+=CBM_PROG_HEAD;
  cmd+=" -1`; echo $I | ";
  cmd+=CBM_PROG_GREP;
  cmd+=" prerelease > /dev/null; if test $? = 0; then echo $I | ";
  cmd+=CBM_PROG_CUT;
  cmd+=" -f3-5 -d' '; else echo $I | ";
  cmd+=CBM_PROG_CUT;
  cmd+=" -f3 -d' '; fi"; /* !!! */

  system->exec(cmd, result); /* !!! */
  return(result);
}

char *CompilerGCC_cpp::language(void)
{
  return("C++");
}

CompilerGCC_cpp::~CompilerGCC_cpp()
{
}

[Compbench-devel] CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-TCC Compiler-TCC.cpp, NONE, 1.1 Compiler-TCC.h, NONE, 1.1 Makefile.am, NONE, 1.1

From: Frederic T. <xf...@us...> - 2007-01-22 18:24:25

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

Added Files:
	Compiler-TCC.cpp Compiler-TCC.h Makefile.am 
Log Message:
libcompbenchmarks moved in a separate directory.

--- NEW FILE: Compiler-TCC.h ---
/* ----------------------------------------------------------------------------
   $Id: Compiler-TCC.h,v 1.1 2007/01/22 18:24:21 xfred Exp $

   This is free software.
   For details, see the GNU Public License in the COPYING file, or
   Look http://www.fsf.org
   ------------------------------------------------------------------------- */

#ifndef H_CBMCOMPILER_TCC
#define H_CBMCOMPILER_TCC

#include <Compiler/Compiler.h>

namespace CBM {
  /** \brief Defines the tcc compiler
   */
  class CompilerTCC : public Compiler
  {
  private:
  protected:
    
    virtual std::string getCompilerName(void);
    virtual std::string getCompilerVersion(void);
    virtual char *language(void);
    
  public:
    CompilerTCC (class System    *_system,
	 char            *_compilerBinary);
    
    virtual std::string compiler(void);
    virtual ~CompilerTCC();
  };
}

#endif

--- NEW FILE: Makefile.am ---
# -----------------------------------------------------------------------------
# $Id: Makefile.am,v 1.1 2007/01/22 18:24:21 xfred Exp $
# $Source: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-TCC/Makefile.am,v $
#
# This is free software.
# For details, see the GNU Public License in the COPYING file, or
# Look http://www.fsf.org
# -----------------------------------------------------------------------------

noinst_LTLIBRARIES		=	libCompilerTCC.la

sources				=       Compiler-TCC.cpp

libCompilerTCC_la_SOURCES 	=	$(sources)

libCompilerinclude_HEADERS	=	$(sources:.cpp=.h)
libCompilerincludedir		=	$(includedir)/compbenchmarks/Compiler/Compiler-TCC

INCLUDES			=	-I $(top_srcdir)/libcompbenchmarks
--- NEW FILE: Compiler-TCC.cpp ---
/* ----------------------------------------------------------------------------
   $Id: Compiler-TCC.cpp,v 1.1 2007/01/22 18:24:21 xfred Exp $

   This is free software.
   For details, see the GNU Public License in the COPYING file, or
   Look http://www.fsf.org
   ------------------------------------------------------------------------- */

#include <Compiler/Compiler-TCC/Compiler-TCC.h>
#include <System/System.h>

using namespace CBM;

CompilerTCC::CompilerTCC(System      *_system,
			 char        *_compilerBinary)
  : Compiler(_system, _compilerBinary)
{
}

std::string CompilerTCC::compiler(void)
{
  std::string str = "tcc";

  return(str);
}

std::string CompilerTCC::getCompilerName(void)
{
  std::string result = "Tiny C Compiler ";
  result+=getCompilerVersion();
  return(result);
}

std::string CompilerTCC::getCompilerVersion(void)
{
  std::string cmd;
  std::string result;

  cmd+=compilerBinary;
  cmd+=" -v";

  system->exec(cmd, result); /* !!! */
  return(result);
}

char *CompilerTCC::language(void)
{
  return("C");
}

CompilerTCC::~CompilerTCC()
{
}

[Compbench-devel] CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-TCC - New directory

From: Frederic T. <xf...@us...> - 2007-01-22 18:23:19

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

Log Message:
Directory /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-TCC added to the repository

[Compbench-devel] CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-GCC - New directory

From: Frederic T. <xf...@us...> - 2007-01-22 18:23:16

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

Log Message:
Directory /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-GCC added to the repository

[Compbench-devel] CompBenchmarks++/libcompbenchmarks/Benchmark Benchmark-Autotools.cpp, NONE, 1.1 Benchmark-Autotools.h, NONE, 1.1 Benchmark.cpp, NONE, 1.1 Benchmark-DLLoader.cpp, NONE, 1.1 Benchmark-DLLoader.h, NONE, 1.1 Benchmark.h, NONE, 1.1 Benchmark-xZIP.cpp, NONE, 1.1 Benchmark-xZIP.h, NONE, 1.1 Makefile.am, NONE, 1.1 Package.cpp, NONE, 1.1 Package.h, NONE, 1.1

From: Frederic T. <xf...@us...> - 2007-01-22 18:21:57

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

Added Files:
	Benchmark-Autotools.cpp Benchmark-Autotools.h Benchmark.cpp 
	Benchmark-DLLoader.cpp Benchmark-DLLoader.h Benchmark.h 
	Benchmark-xZIP.cpp Benchmark-xZIP.h Makefile.am Package.cpp 
	Package.h 
Log Message:
libcompbenchmarks moved in a separate directory.

--- NEW FILE: Benchmark.h ---
/* ----------------------------------------------------------------------------
   $Id: Benchmark.h,v 1.1 2007/01/22 18:21:47 xfred Exp $

   This is free software.
   For details, see the GNU Public License in the COPYING file, or
   Look http://www.fsf.org
   ------------------------------------------------------------------------- */

#ifndef H_CBMBENCHMARK
#define H_CBMBENCHMARK

#include <Compiler/Compiler.h>
#include <Compiler/Compiler-Options.h>

#include <vector>

namespace CBM {
  class System;

  /** \brief Defines an abstract benchmark.
   *
   *  This class can be overloaded in order to get new external benchmarks and packages
   *  supported by CompBenchmarks. Basically it sets up packages (like gzip), prepare,
   *  and run associated benchmarks according to a given context.
   *
   *  As most of times a distributed package have many benchmarks, it is usual that
   *  a first abstraction defines all methods related to package is then overloaded to
   *  get consistant informations about all related benchmarks.
   */
  class Benchmark
  {
  public:
    class Package *Package(void);
  private:
  protected:
    class Package *package;
    /** Constructor
     *  Initialise the Benchmark::system variable. */
    Benchmark(class Package *_package);

    /** Give object for underlaying system.
	Use package pointer.
	\sa package
    */
    virtual class System *System(void);

    /** Pure virtual method to run benchmark
     *  \return Benchmark's result (as number).
     */
    virtual std::string bench(void) = 0;

  public:
    /** Display informations about benchmark
     */
    void display(void);
    /** Benchmark name
	\return a std::string representing current benchmark's identification
	(e.g. gzip-1c) */
    virtual std::string Name(void) = 0;

    /** Benchmark comments
	\return a std::string containing comments about current benchmark */
    virtual std::string Comments(void) = 0;
  
    /** Run benchmark.
     *  Uses bench(). Overloading is unadvised.
     *  This step won't be done and'll return 1 if getStatus()>=Package::Benchmarked.
     *  \return benchmark's result (performance) as a non-null positive number. May changes status.
     *  \sa Make()
     *  \sa status */
    virtual std::string Bench(void);

    /** Virtual destructor */
    virtual ~Benchmark();
  };
}

#define DLdeclare()				\
  extern "C" CBM::Package *cbmlib_getPackage(void)

#define DLPackageWrapper_declare()			\
  virtual CBM::BenchmarkVector& Benchmarks(void);	\
  virtual CBM::Benchmark *Benchmark(std::string bid);	\
  virtual int benchmarkNumber(void)

#endif

--- NEW FILE: Benchmark-DLLoader.cpp ---
#include <Benchmark/Benchmark-DLLoader.h>
#include <libcompbenchmarks.h>

#include <string>
#include <iostream>

#include <config.h>

using namespace CBM;
std::vector<std::string>      CBM::cbmlib_paths;
std::vector<Package*>         CBM::cbmlib_packages;

/* cache... */
std::vector<cbmlib_internal*> cbmlib_loaded_libraries;

int                           CBM::PACKAGE_AUTOPURGE=1;

cbmlib_internal *cbmlib_check_previousload(char *package_id)
{
  int             i;
  int             s = cbmlib_loaded_libraries.size();
  cbmlib_internal *l;

  for(i=0; i<s; i++) {
    l=cbmlib_loaded_libraries[i];
    if (l->PackageGet()->Name()==package_id)
      return(l);
  }
  return(0);
}

cbmlib_internal *cbmlib_load_internal(const char *lib, char *package_id)
{
  void            *library;
  cbmlib_internal *r;

  if (UO_verbose)
    std::cout << "Loading " << lib << "... ";

  r=cbmlib_check_previousload(package_id);
  if (r) {
    if (UO_verbose)
      std::cout << "found (cached)." << std::endl;
    return(r);
  }

  library=dlopen(lib, RTLD_NOW);
  if (library) {
    if (UO_verbose)
      std::cout << "found." << std::endl;
    r=new cbmlib_internal;
    r->library=library;
    if (UO_verbose)
      std::cout << " Checking cbmlib_getPackage... ";
    r->PackageGet=(cbmlib_internal_getPackage_t) (dlsym(r->library, "cbmlib_getPackage"));
    if (!r->PackageGet) {
      dlclose(library);
      if (UO_verbose)
	std::cout << "Invalid" << std::endl;
      delete(r);
      return(0);
    } else {
      if (UO_verbose)
	std::cout << "found." << std::endl;
    }

    cbmlib_loaded_libraries.push_back(r);    
    return(r);
  } else {
    if (UO_verbose)
      std::cout << "N.A. (" << dlerror() << ")" << std::endl;
  }
  return(0);
}

cbmlib_internal *CBM::cbmlib_load(char *package_id)
{
  std::string     tmp;
  cbmlib_internal *r = 0;

  int i;
  int n = CBM::cbmlib_paths.size();
  
  for(i=0; i<n; i++) {
    tmp=CBM::cbmlib_paths[i];
    tmp+="/libcompbenchmarks-bm-";
    tmp+=package_id;
    tmp+=".so";
    r=cbmlib_load_internal(tmp.c_str(), package_id);
    if (r) {
      return(r);
    }
  }
  return(0);
}

void CBM::cbmlib_done(void)
{
  int             i;
  int             s;
  cbmlib_internal *l;

  s = CBM::cbmlib_packages.size();

  CBM::PACKAGE_AUTOPURGE=0;
  for(i=0; i<s; i++) {
    delete(CBM::cbmlib_packages[i]);
  }

  s = cbmlib_loaded_libraries.size();
  for(i=0; i<s; i++) {
    l=cbmlib_loaded_libraries[i];
    dlclose(l->library);
    delete(l);
  }
}


--- NEW FILE: Package.h ---
/* ----------------------------------------------------------------------------
   $Id: Package.h,v 1.1 2007/01/22 18:21:47 xfred Exp $

   This is free software.
   For details, see the GNU Public License in the COPYING file, or
   Look http://www.fsf.org
   ------------------------------------------------------------------------- */

#ifndef H_CBMPACKAGE
#define H_CBMPACKAGE

#include <Compiler/Compiler.h>
#include <Compiler/Compiler-Options.h>

#include <vector>

namespace CBM {
  class System;

  /** Defines a vector of benchmarks.
      Basically owned by CBM::Package instance.
  */
  typedef std::vector<std::string> BenchmarkVector;

  /** \brief Defines an abstract package.
   *
   *  This class can be overloaded in order to get new external packages
   *  supported by CompBenchmarks. Basically it sets up packages (like gzip),
   *  and prepares related benchmarks for evaluation.
   *
   *  \sa Benchmark
   */
  class Package
  {
  public:
    /** Package status
     *   Defines typedef used to code internal status of a given package
     */
    typedef enum Status { Unknown,       /*!< Unkown; benchmark/package probably
					  * not yet installed */
			  Downloaded,    /*!< Package has been downloaded and checksum
					  * is Ok. */
			  Extracted,     /*!< Package has been successfuly extracted */
			  Patched,       /*!< Package has been patched (optional step) */
			  Preconfigured, /*!< Package is now preconfigured. Also
					  * optionnal, but each package goes throught
					  * that step */
			  Configured,    /*!< Package is configured (./configure) */
			  Made,          /*!< Package has been made (make) */
			  Tested,        /*!< Package has been tested */
			  Benchmarked }; /*!< Benchmarked */
	
  private:
    /** Package status
     *  \sa Package::Status
     *  \sa storeStatus()
     *  \sa getStatus()
     *  \sa readStatus() */
    Status                             status;

    /** \sa buildTime() */
    std::string                        lastBuildTime;

    /** Expected MD5 on downloaded package
     *  \return MD5 expected, as an std::string */
    virtual std::string expectedMD5(void) = 0;

    /** Package's status
     *  Initialise the status from file in the directory defined
     *  by CBM::System::Status.
     *
     *  \sa Benchmark::Status
     *  \return 1 if ok. */
    virtual int readStatus(void);

  protected:
    /** \sa Benchmarks() */
    BenchmarkVector benchmarks;

    /** Stores current compiler. */
    Compiler        *currentCompiler;
    /** Stores current (compiler) options. */
    CompilerOptions *currentOptions;

    /** System used */
    class System    *system;
    /** Constructor
     *  Initialise the Package::system variable. */
    Package(class System *_system);

    /** Pure method to extract package
	\return 1 if ok
	\sa Extract()
	\sa localPackageAbsoluteDirectory() */
    virtual int extract(int _force = 0) = 0;

    /** Method to patch package
     *  Must be overloaded to patch package.
     *  \sa Patch() */
    virtual int patch(int _force = 0);

    /** Method to test package.
     *  Must be overloaded to test package using a method provided by package
     *  maintainers.
     *  \sa Test() */
    virtual int test(int _force = 0);

    /** Pure virtual method to pre-configure package
     *  Pre-configuration creates any needed elements (files or what ever) to benchmark
     *  package.
     *  \return 1 if ok.
     *  \sa PreConfigure()
     */
    virtual int preConfigure(int _force) = 0;

    /** Pure virtual method to configure package
     *  Broadly speaking, this is ./configure
     *  \sa Configure()
     *  \return 1 if ok */
    virtual int configure(Compiler        *_currentCompiler,
			  CompilerOptions *_currentOptions) = 0;

    /** Pure virtual method to build package
     *  This could be a simple make, for instance.
     *  \return 1 if ok
     *  \sa Make() */
    virtual int make(void) = 0;

    /** Pure virtual method to clean-up sources
     *  Useful bettween two Make() to get all sources compiled with same environment.
     *  \sa Release()
     *  \sa Configure()
     *  \sa Make() */
    virtual int release(void) = 0;

    /** Uninstall benchmark
     *  Removes information used by CompBenchmarks as well as any downloaded, extracted
     *  or built element. Default behaviour should be ok in most case.
     *  \return 1 if ok. */
    virtual int uninstall(void);
  
    /** Gets a context ID
     *  Give an unique ID according to compiler and options used. This can avoid useless
     *  recompilations.
     *  \return ID (MD5) as std::string
     *  \sa Make()
     *  \sa storeContext()
     *  \sa ContextMatches()
     */
    virtual std::string contextID(Compiler        *_currentCompiler,
				  CompilerOptions *_currentOptions);

    /** Stores (compilation) context ID
     *  Stores the context ID for the current benchmark.
     *  \sa contextID()
     *  \sa ContextMatches()
     *  \return 1 if ok
     */
    virtual int storeContext(Compiler        *_currentCompiler,
			     CompilerOptions *_currentOptions);
  public:
    /** Indicates if the package needs patching
     *  Must be overloaded if so. Returns 0 by default.
     *  \return 0 by default, 1 if patch is needed.
     *  \sa patch()
     *  \sa Patch()
     */
    virtual int hasPatch(void);

    /** Remove context.
     *  \sa storeContext()
     */
    virtual int resetContext(void);

    /** Display informations about package */
    virtual void display(void);

    /** Display informations about all supported benchmarks */
    virtual void displayBenchmarks(void);

    /** Get system abstraction object
	\return CBM::System
    */
    virtual class System *System(void);

    /** Get all supported benchmarks.
	\return Array of std::string. */
    virtual BenchmarkVector& Benchmarks(void);

    /** Get supported benchmarks' number
	\return An integer */
    virtual int benchmarkNumber(void);

    /** Get a benchmark according to its index
	\sa Benchmarks()
	\return A pointer to the benchmark instance */
    virtual class Benchmark *Benchmark(int i);

    /** Get a benchmark according to its identifier.
	\return References to a Benchmark object */
    virtual class Benchmark *Benchmark(std::string bid);
  
    /** Stores benchmark status
     *  Probably internal usage only.
     *  \return 1 if ok
     *  \sa readStatus()
     */
    virtual int storeStatus(Status _status);

    /** 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
     *  Gives comments about package. Short description, or what ever.
     *  \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
     *  \return std::string (C or C++) */
    virtual std::string language(void) = 0;
		
    /** Returns package or benchmark license
	\return a std::string describing license */
    virtual std::string license(void) = 0;

    /** Returns package home page
	\return URL in std::string */
    virtual std::string homePage(void) = 0;

    /** Author(s) of package
	\return std::string containing authors. */
    virtual std::string author(void) = 0;

    /** Convenience method
     *  \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
     *  \return relative directory to use (or used, depending) for package extraction
     *  \sa CBM::System::Extract */
    virtual char* extractDirectory(void) = 0;

    /** Indicates if the package provides a test method.
     *  Must be overloaded if so. Returns 0 by default.
     *  \return 0 by default, 1 if patch is needed.
     *  \sa test()
     *  \sa Test()
     */
    virtual int hasTest(void);

    /** URL used for downloading package.
     *  \return std::string representing the URL of the package
     *  \sa expectedMD5() */
    virtual std::string downloadURL(void) = 0;

    /** Total size of the package
     *  \return Total size, in bytes, of thepackage. This comprises data used
     *  in pre-configuration step.
     *  \sa preConfigure()
     *  \sa packageSize() */
   virtual int         totalSize(void);

    /** Compairs previous compilation context to current one
     *  \return 1 if they match.
     *  \sa contextID()
     *  \sa storeContext()
     *  \sa Make()
     */
    virtual int         ContextMatches(Compiler        *_currentCompiler,
				       CompilerOptions *_currentOptions);
    /** Download package.
     *  Gets downloadURL() object from Internet and verify checksum.
     *  Uses download(). Overloading is unadvised.
     *  This step won't be done and'll return 1 if getStatus()>=Package::Downloaded.
     *  \param _force sets to 1 to force operation. May changes status.
     *  \return 1 if ok.
     *  \sa status */
    virtual int         Download(int _force = 0);

    /** Extract package.
     *  Extracts downloaded package.
     *  Uses extract(). Overloading is unadvised.
     *  This step won't be done and'll return 1 if getStatus()>=Package::Extracted.
     *  \param _force sets to 1 to force operation. May changes status.
     *  \return 1 if ok.
     *  \sa Download()
     *  \sa status */
    virtual int         Extract(int _force = 0);

    /** Patch package.
     *  Patches extracted package.
     *  Overloading is unadvised, 1 is returned without any action, by default.
     *  If hasPatch() returns 1, uses patch().
     *  This step won't be done and'll return 1 if getStatus()>=Package::Patched.
     *  \param _force sets to 1 to force operation. May changes status.
     *  \return 1 if ok.
     *  \sa Extract()
     *  \sa status */
    virtual int         Patch(int _force = 0);

    /** Preconfigure package.
     *  Preconfigure downloaded package.
     *  Uses preConfigure(). Overloading is unadvised.
     *  This step won't be done and'll return 1 if
     *  getStatus()>=Package::PreConfigured. May changes status.
     *  \param _force sets to 1 to force operation.
     *  \return 1 if ok.
     *  \sa Patch()
     *  \sa status */
    virtual int         PreConfigure(int _force = 0);

    /** Configure package.
     *  Configure downloaded package.
     *  Uses configure(). Overloading is unadvised. Argument are used to keep
     *  compiler and options used for current bench (context), even
     *  if ./configure script is not present : they'll be used by Make().
     *  This step won't be done and'll return 1 if getStatus()>=Package::Configured. May changes status.
     *  \return 1 if ok.
     *  \sa Download()
     *  \sa Release()
     *  \sa ContextMatches()
     *  \sa Make().
     *  \sa status */
    virtual int         Configure(Compiler        *_currentCompiler,
				  CompilerOptions *_currentOptions);


    /** Build package.
     *  Builds package.
     *  Uses make(). Overloading is unadvised.
     *  This step won't be done and'll return 1 if getStatus()>=Package::Made.
     *  Updates lastBuildTime.
     *  \param _force sets to 1 to force operation. May changes status.
     *  \return 1 if ok. May changes status.
     *  \sa Configure()
     *  \sa Release()
     *  \sa buildTime()
     *  \sa status
     *  \sa ContextMatches() */
    virtual int         Make(int _force = 0);

    /** Give build time.
     *  Returns last time (in seconds) of make().
     *  \return build time in seconds
     *  \sa Make()
     *  \sa make() */
    virtual std::string buildTime(void);

    /** Test a package.
     *  Test a built package.
     *  Overloading is unadvised, 1 is returned without any action, by default.
     *  If hasPatch() returns 1, uses patch().
     *  This step won't be done and'll return 1 if getStatus()>=Package::Benchmarked.
     *  \param _force sets to 1 to force operation. May changes status.
     *  \return 1 if ok.
     *  \sa Make()
     *  \sa status */
    virtual int         Test(int _force = 0);


    /** Clean objects.
     *  Uses release(). Overloading is unadvised.
     *  This step won't be done and'll return 0 if getStatus()<Package::Made. May changes status.
     *  \return 1 if ok.
     *  \sa Bench() */
    virtual int         Release(void);

    /** Install package.
     *  Installs package, uses, in that order Download(), Extract(), Patch() (if needed)
     *  and PreConfigure(). Overloading is unadvised.
     *  This step won't be done and'll return 1 if getStatus()>=Package::PreConfigured.
     *  \param _force assign to 1 for forcing operation.
     *  \return 1 if ok. May changes status.
     *  \sa status */
    virtual int         Install(int _force = 0);

    /** Copy a local archive.
     *  Copy package to directory defined by CBM::System::Download. It'll be ready
     *  to be extracted using Install().
     *  \param _source the archive file
     *  \param _force assign to 1 for forcing operation.
     *  \return 1 if ok. May changes status.
     *  \sa status
     *  \sa extract */
    virtual int         Fetch(char *_source, int _force = 0);

    /** Uninstall package.
     *  Uses uninstall(). Overloading is unadvised.
     *  This step won't be done and'll return 1 if getStatus()==Package::Unknown.
     *  \return 1 if ok. May changes status.
     *  \sa status */
    virtual int         Uninstall(void);

    /** Returns benchmark's status
     *  \return status (enum).
     *  \sa Package::Status */
    virtual Status getStatus(void);

    /** Virtual destructor */
    virtual ~Package();
		
  };
}

#endif

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

#include <fstream>

using namespace CBM;

PackagexZIP::PackagexZIP(CBM::System *_system)
  : PackageAutotools(_system)
{
}

int PackagexZIP::preConfigure(int _force)
{
  std::string   fileName;
  std::ofstream OUT;
  int           n = 12 * 1024 * 1024;

  fileName+=localAbsoluteDirectory();
  fileName+="/Compbenchmarks.dat";
  
  OUT.open(fileName.c_str(), std::ios::out);
  /* !!! */
  while (n--) {
    OUT << std::hex << n;
  }
  OUT.close();

  return(1);
}

PackagexZIP::~PackagexZIP()
{
}

BenchmarkxZIP::BenchmarkxZIP(CBM::Package *_package)
  : Benchmark(_package)
{
}

std::string BenchmarkxZIP::bench(void)
{
  time_t start = System()->Time();
  time_t end;
  std::string cmd;
  std::string result;
  std::string sstdout;
  char dum[16] = { 0 };

  cmd="cd ";
  cmd+=package->localAbsoluteDirectory();
  cmd+=" && ./";
  cmd+=benchmarkProgram();
  cmd+=" -";
  cmd+=compressionLevel();
  cmd+="c Compbenchmarks.dat > /dev/null";

  if (System()->exec(cmd, sstdout)==0) {
    end=System()->Time();
    sprintf(dum, "%0.0f", ((float)package->totalSize())/((int)(end-start)));
    result=dum;
    return(result);
  } else {
    return("0");
  }  
}

BenchmarkxZIP::~BenchmarkxZIP()
{
}

--- NEW FILE: Benchmark.cpp ---
#include <Benchmark/Benchmark.h>
#include <Benchmark/Package.h>
#include <iostream>

#include <libcompbenchmarks.h>
#include <UI/UI.h>

using namespace CBM;

Benchmark::Benchmark(CBM::Package *_package)
{
  package=_package;
}

void Benchmark::display(void)
{
  std::cout << "benchmark::Name=" << Name() << 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=" << Comments() << std::endl
	    << std::endl;
}

Package *Benchmark::Package(void)
{
  return(package);
}

System *Benchmark::System(void)
{
  if (package)
    return(package->System());
  else
    return(0);
}

std::string Benchmark::Bench(void)
{
  std::string r;
  std::string info;


  if (((Package()->getStatus()<Package::Tested) && (Package()->hasTest())) &&
      (UO_enableTestSuite)) {
    info=Name();
    info+=" not tested !";
    cbmUI->Information(CBM::UI::BenchTest,
		       info);

    return("0");
  }

  cbmUI->Information(CBM::UI::BenchBench,
		     Name());

  r=bench();
  Package()->System()->Chomp(r);

  if (r!="0") {
    Package()->storeStatus(Package::Benchmarked);
    cbmUI->Information(CBM::UI::BenchResult,
		       r);
  } else {
    info="Benchmarking failed for ";
    info+=Package()->Name();
    cbmUI->Fatal(info);
  }

  return(r);
}

Benchmark::~Benchmark()
{
}

--- NEW FILE: Makefile.am ---
# -----------------------------------------------------------------------------
# $Id: Makefile.am,v 1.1 2007/01/22 18:21:47 xfred Exp $
# $Source: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Makefile.am,v $
#
# This is free software.
# For details, see the GNU Public License in the COPYING file, or
# Look http://www.fsf.org
# -----------------------------------------------------------------------------


noinst_LTLIBRARIES			=	libBenchmark.la

sources					=       Package.cpp \
						Benchmark.cpp \
						Benchmark-DLLoader.cpp \
						Benchmark-Autotools.cpp \
						Benchmark-xZIP.cpp

libBenchmark_la_SOURCES 		=	$(sources) 

libBenchmarkinclude_HEADERS		=	$(sources:.cpp=.h)
libBenchmarkincludedir			=	$(includedir)/compbenchmarks/Benchmark

INCLUDES				=	-I $(top_srcdir)/libcompbenchmarks
--- NEW FILE: Benchmark-xZIP.h ---
/* ----------------------------------------------------------------------------
   $Id: Benchmark-xZIP.h,v 1.1 2007/01/22 18:21:47 xfred Exp $

   This is free software.
   For details, see the GNU Public License in the COPYING file, or
   Look http://www.fsf.org
   ------------------------------------------------------------------------- */

#ifndef H_CBMBENCHMARKXZIP
#define H_CBMBENCHMARKXZIP

#include <Benchmark/Benchmark-Autotools.h>

namespace CBM {
  /** \brief Defines an abstract package based on ZIP utilities.
   *
   *  This class can be overloaded in order to get new external packages
   *  supported by CompBenchmarks. It provides a 70M (through preConfigure())
   *  file that can be compressed.
   *  \sa CBM::BenchmarkxZIP
   */
  class PackagexZIP : public PackageAutotools
  {
  private:

  protected:
    /** Pre-configure package
     *  Creates a ~70M files used for compression benchmarks.
     *  \param _force must be set to 1 to force operation.
     *  \sa CBM::Benchmark::preConfigure() */
    virtual int preConfigure(int _force = 0);
   
  public:
    /** Constructor */
    PackagexZIP(class System *_system);

    /** Virtual destructor */
    virtual ~PackagexZIP();
		
  };

  /** \brief Defines an abstract benchmark based on ZIP utilities.
   *
   *  This class can be overloaded in order to get new external packages
   *  supported by CompBenchmarks. It provides a 70M (through preConfigure())
   *  file that can be compressed.
   *  \sa PackagexZIP
   */

  class BenchmarkxZIP : public Benchmark
  {
  protected:
    BenchmarkxZIP(CBM::Package *_package);

    /** Compression level
	\return compression level ("0" .. "9") used.
    */
    virtual char* compressionLevel(void) = 0;

    /** Program name
	\return std::string like gzip or bzip2.
    */
    virtual std::string benchmarkProgram(void) = 0;


    /** Runs the benchmark
     *  Gives the amount of compressed bytes per seconds (as CompBenchmarks always apply
     *  "bigger is better" policy to benchmarks' results, we can just rely on time). */

    virtual std::string bench(void);
    virtual ~BenchmarkxZIP();
  };
}

#endif

--- NEW FILE: Benchmark-DLLoader.h ---
/* ----------------------------------------------------------------------------
   $Id: Benchmark-DLLoader.h,v 1.1 2007/01/22 18:21:47 xfred Exp $

   This is free software.
   For details, see the GNU Public License in the COPYING file, or
   Look http://www.fsf.org
   ------------------------------------------------------------------------- */

#ifndef H_CBMBENCHMARKDLLOADER
#define H_CBMBENCHMARKDLLOADER

#include <System/System.h>
#include <Benchmark/Benchmark.h>
#include <Benchmark/Package.h>

#include <dlfcn.h>
#include <vector>

namespace CBM {
  /** Paths to libraries */
  extern std::vector<std::string> cbmlib_paths;

  extern std::vector<Package*> cbmlib_packages;

  extern int PACKAGE_AUTOPURGE;

  /** Function prototype for accessing a Package object */
  typedef Package* (*cbmlib_internal_getPackage_t)(void);

  /** Low-level internal benchmark's shared library object */
  typedef struct cbmlib_internal {
    void                            *library;
    cbmlib_internal_getPackage_t    PackageGet;
  };

  /** \brief Low-level library loading according to the benchmark/package's
      internal name.
      \param package_id something like gzip, bzip2, nbench and so on.
  */
  cbmlib_internal *cbmlib_load(char *package_id);
  
  /** \brief Low-level function to Get a CBMBenchmark instance from a
   *   shared library.
   *  \param bench_id gzip-1c, benchpp-whetstone and so on.
   *  \param _system A system instance.
   */
  Benchmark *cbmlib_bench_load(char *bench_id, System *_system);
  
  /** \brief Low-level function for removing any internal existing reference to shared libraries. */
  void cbmlib_done(void);
}

#endif

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

#include <Benchmark/Benchmark-DLLoader.h>

#include <System/System.h>
#include <UI/UI.h>

#include <libcompbenchmarks.h>

#include <config.h>

#include <fstream>
#include <iostream>
#include <string>

using namespace CBM;

Package::Package(CBM::System *_system)
{
  system=_system;
  status=Unknown;
  currentCompiler=0;
  currentOptions=0;
}

BenchmarkVector& Package::Benchmarks(void)
{
  return(benchmarks);
}

int Package::benchmarkNumber(void)
{
  Benchmarks();
  return(benchmarks.size());
}

Benchmark *Package::Benchmark(int i)
{
  Benchmarks();
  return(Benchmark(benchmarks[i]));
}

Benchmark *Package::Benchmark(std::string bid)
{
  std::cerr << "virtual Package::Benchmark() called" << std::endl;
  return(0);
}

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
	    << "package::Author=" << author() << std::endl << std::endl;
}

void Package::displayBenchmarks(void)
{
  int            i;
  int            n;
  CBM::Benchmark *B;

  n=benchmarkNumber();
  for(i=0; i<n; i++) {
    B=Benchmark(i);
    B->display();
  }
}

System *Package::System(void)
{
  return(system);
}

std::string Package::Name(void)
{
  return("");
}

int Package::readStatus(void)
{
  char          s;
  std::string   r;
  std::string id;

  id="bm-status-";
  id+=Name();


  r=system->read((char*) id.c_str());

  if (r!="") {
    s=r.c_str()[0];
    status=(Status) ((int) s - (int) '0');
    return(1);
  } else {
    /* !!! */
    return(0);
  }
}

int Package::resetContext(void)
{
  std::string contextFile;

  contextFile=system->temporaryDirectory(System::Status);
  contextFile+="/";

  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;

  cmd+=system->temporaryDirectory(System::Extract);
  cmd+="/";
  cmd+=extractDirectory();

  return(cmd);
}

int Package::hasPatch(void)
{
  return(0);
}

int Package::patch(int _force)
{
  return(1);
}

int Package::totalSize(void)
{
  return(0);
}


int Package::hasTest(void)
{
  return(0);
}

int Package::test(int _force)
{
  return(1);
}


int Package::uninstall(void)
{
  std::string where = localAbsoluteDirectory();
  std::string cmd;
  cmd+=CBM_PROG_RM;
  cmd+=" -rf ";
  std::string sstdout;

  cmd+=where;

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

int Package::storeStatus(Status _status)
{
  int r;
  char        c[16] = { 0 };
  std::string tmp;
  std::string id;

  id="bm-status-";
  id+=Name();

  sprintf(c, "%d", (int) _status);
  tmp=c;
  r=system->store((char*) id.c_str(),
		  tmp);

  status=_status;
  return(r);
}

std::string Package::contextID(CBM::Compiler        *_currentCompiler,
			       CBM::CompilerOptions *_currentOptions)
{
  std::string what = _currentCompiler->Binary();
  what+="\n";
  what+=_currentOptions->Options();
  return(what);
}

int Package::storeContext(CBM::Compiler        *_currentCompiler,
			  CBM::CompilerOptions *_currentOptions)
{
  std::string context = contextID(_currentCompiler,
				  _currentOptions);
  std::string id;
  int         r;

  id="bm-context-";
  id+=Name();

  r=system->store((char*) id.c_str(),
		  context);

  return(r);  
}

int Package::ContextMatches(CBM::Compiler        *_currentCompiler,
			    CBM::CompilerOptions *_currentOptions)
{
  std::string previousContext;
  std::string context;
  std::string id;

  id="bm-context-";
  id+=Name();

  previousContext=system->read((char*) id.c_str());
  context=contextID(_currentCompiler,
		    _currentOptions);

  if (context==previousContext) {
    currentCompiler=_currentCompiler;
    currentOptions=_currentOptions;
    return(1);
  } else {
    return(0);
  }
}

int Package::Download(int _force)
{
  std::string localFile = localAbsoluteName();
  std::string expected_md5;
  std::string md5;
  std::string info;

  if ((!_force) &&
      (getStatus()>=Downloaded)) {
    return(1);
  }

  info=Name();
  info+=" ";
  info+=Version();

  cbmUI->Information(CBM::UI::BenchDownload,
		     info);
  
  try {
    system->download(downloadURL(),
		     (char*) localFile.c_str());
  }

  catch (...) {
  }

  if (cbmSystem->fileExists(localFile)) {
    expected_md5=expectedMD5();
    md5=system->md5File(localFile);

    if (expected_md5==md5) {
      cbmUI->Information(CBM::UI::ChecksumOK,
		      localFile);

      storeStatus(Downloaded);
      return(1);
    } else {
      cbmUI->Information(CBM::UI::ChecksumFailed,
		      localFile);

      system->unlink((char*) localFile.c_str());
      info="Unsuccesfull download ";
      info+=downloadURL();
      info+=" to ";
      info+=localFile;
      cbmUI->Fatal(info);
      return(0);
    }
  } else {
    info="Can't download ";
    info+=downloadURL();
    info+=" to ";
    info+=localFile;
    cbmUI->Fatal(info);
    
    system->unlink((char*) localFile.c_str());
  }
  return(0);
}

int Package::Extract(int _force)
{
  int r;

  if ((!_force) &&
      (getStatus()>=Extracted)) {
    return(1);
  }

  cbmUI->Information(CBM::UI::BenchExtract,
		     Name());
	   
  r=extract(_force);

  if (r)
    storeStatus(Extracted);
  else {
    std::string info;
    info="Error extracting ";
    info+=localAbsoluteName();
    info+=" into ";
    info+=system->temporaryDirectory(System::Extract);
    cbmUI->Fatal(info);
  }

  return(r);
}

int Package::Patch(int _force)
{
  int r;

  if (!hasPatch())
    return(1);

  if ((!_force) &&
      (getStatus()>=Patched)) {
    return(1);
  }

  cbmUI->Information(CBM::UI::BenchPatch,
		     Name());
	   
  r=patch(_force);

  if (r)
    storeStatus(Patched);
  else {
    std::string info;
    info="Error patching ";
    info+=localAbsoluteName();
    cbmUI->Fatal(info);
  }

  return(r);
}

int Package::PreConfigure(int _force)
{
  int r;

  if ((!_force) && (getStatus()>=Preconfigured)) {
    return(1);
  }
  if ( ((!hasPatch()) && (getStatus()<Extracted)) ||
       ((hasPatch()) && (getStatus()<Patched)) ) {
    return(0);
  }


  cbmUI->Information(CBM::UI::BenchPreconfigure,
		     Name());

  r=preConfigure(_force);

  if (r)
    storeStatus(Preconfigured);
  else {
    std::string info;

    info="Error in ";
    info+=Name();
    info+="'s pre-configuration";
    cbmUI->Fatal(info);
  }
  return(r);
}

int Package::Configure(CBM::Compiler *_currentCompiler,
		       CBM::CompilerOptions *_currentOptions)
{
  int         r;
  std::string info;

  if (getStatus()>=Configured) {
    currentCompiler=_currentCompiler;
    currentOptions=_currentOptions;
    return(1);
  }

  info=Name();
  info+=" with compiler ";
  info+=_currentCompiler->Binary();
  if (_currentOptions->Options()=="") {
    info+=" without options";
  } else {
    info+=" and options ";
    info+=_currentOptions->Options();
  }

  if (language()!=_currentCompiler->language()) {

    storeContext(_currentCompiler,
		 _currentOptions);
    info=_currentCompiler->Binary();
    info+=" is a ";
    info+=_currentCompiler->language();
    info+=" compiler, while benchmark is written is ";
    info+=language();
    info+=".";
    cbmUI->Fatal(info);
  }

  cbmUI->Information(CBM::UI::BenchConfigure,
		  info);

  r=configure(_currentCompiler,
	      _currentOptions);

  if (r) {
    storeStatus(Configured);
    currentCompiler=_currentCompiler;
    currentOptions=_currentOptions;
  } else {
    info="Configure failed for ";
    info+=Name();
    cbmUI->Fatal(info);
  }

  return(r);
}

int Package::Make(int _force)
{
  int         r;
  std::string info;
  time_t      beg;
  time_t      end;
  char        tmp[128];

  if ((getStatus()>=Made) && (!_force)) {
    return(1);
  }

  cbmUI->Information(CBM::UI::BenchMake,
		  Name());

  beg=system->Time();
  r=make();
  if (r) {
    end=system->Time();
    sprintf(tmp, "%f", (double) (end-beg));
    lastBuildTime=tmp;
    std::cout << "Build time : " << lastBuildTime << std::endl;
    storeStatus(Made);
    storeContext(currentCompiler,
		 currentOptions);
  } else {
    info="Make failed for ";
    info+=Name();
    cbmUI->Fatal(info);

  }

  return(r);
}

std::string Package::buildTime(void)
{
  return(lastBuildTime);
}

int Package::Test(int _force)
{
  int         r;
  std::string dum;

  if (!hasTest())
    return(1);

  if (getStatus()<Configured) {
    cbmUI->Fatal("Package is not configured");
  }

  if ((!_force) &&
      (getStatus()>=Benchmarked)) {
    return(1);
  }

  if (getStatus()<Made) {
    return(0);
  }

  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,
		    dum);
    r=1;
  }

  if (r)
    storeStatus(Tested);
  else {
    std::string info;
    info="Error testing ";
    info+=localAbsoluteName();
    cbmUI->Fatal(info);
  }

  return(r);
}

int Package::Release(void)
{
  int         r;
  std::string info;

  if (getStatus()<Configured) {
    return(0);
  }

  cbmUI->Information(CBM::UI::BenchClean,
		  Name());


  r=release();
  if (r) {
    resetContext();
    storeStatus(Preconfigured);
  } else {
    info="Clean failed for ";
    info+=Name();
    /* cbmUI->Fatal(info); */
  }

  return(r);
}

int Package::Install(int _force)
{
  int r;

  if (downloadURL()=="") {
    cbmUI->Fatal("Package is not known to be hosted anymore on the Internet. Use --fetch option.");
  }

  resetContext();

  r=Download(_force);
  if (!r)
    return(0);

  r=Extract(_force);
  if (!r)
    return(0);

  if (hasPatch()) {
    r=Patch();
    if (!r)
      return(0);
  }

  r=PreConfigure(_force);
  return(r);
}

int Package::Fetch(char *_source, int _force)
{
  std::string dest   = localAbsoluteName();
  std::string source = _source;
  std::string expected_md5;
  std::string md5;

  if ((getStatus()>=Downloaded) && (!_force)) {
    return(1);
  }

  if (dest!=source) {
    cbmSystem->copy(source, dest);
  }

  if (cbmSystem->fileExists(dest)) {
    expected_md5=expectedMD5();
    md5=system->md5File(dest);

    if (expected_md5==md5) {
      cbmUI->Information(CBM::UI::ChecksumOK,
		      dest);

      storeStatus(Downloaded);
      return(1);
    } else {
      cbmUI->Information(CBM::UI::ChecksumFailed,
		      dest);
    }
  }

  return(0);
}

int Package::Uninstall(void)
{
  std::string statusFile;
  int         r;

  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();
    r=uninstall();
    storeStatus(Unknown);
    currentCompiler=0;
    currentOptions=0;
    return(r);
  } else
    return(0);
}

Package::Status Package::getStatus(void)
{
  //  Status       result    = Unknown;
  std::string  localFile = localAbsoluteName();

  if (status==Unknown)
    readStatus();

  return(status);
}

Package::~Package()
{
  std::vector<Package*>::iterator it;

  if (PACKAGE_AUTOPURGE) {
    for(it=cbmlib_packages.begin(); it!=cbmlib_packages.end();) {
      if (*it == this) {
	cbmlib_packages.erase(it);
	break;
      }
    }
  }
}

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

#include <config.h>

#include <fstream>

using namespace CBM;

PackageAutotools::PackageAutotools(CBM::System *_system)
  : Package(_system)
{
}

int PackageAutotools::extract(int _force)
{
  std::string localFile = localAbsoluteName();
  std::string cmd;
  std::string sstdout;

  cmd+="cd ";
  cmd+=system->temporaryDirectory(CBM::System::Extract);
  cmd+=" && ";
  cmd+=CBM_PROG_ZCAT;
  cmd+=" ";
  cmd+=localFile;
  cmd+=" | ";
  cmd+=CBM_PROG_TAR;
  cmd+=" xvf -";

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

int PackageAutotools::configure(CBM::Compiler        *_currentCompiler,
				CBM::CompilerOptions *_currentOptions)

{
  std::string cmd;
  std::string sstdout;

  cmd="cd ";
  cmd+=localAbsoluteDirectory();
  cmd+=" && ";

  currentCompiler=_currentCompiler;
  currentOptions=_currentOptions;

  if (language()=="C") {
    cmd+="CC=";
  } else {
    if (language()=="C++") {
      cmd+="CXX=";
    } else {
      /* !!! */
    }
  }
  cmd+=currentCompiler->Binary();
  if (language()=="C") {
    cmd+=" CFLAGS=";
  } else {
    if (language()=="C++") {
      cmd+="CXXFLAGS=";
    } else {
      /* !!! */
    }
  }

  cmd+="'";
  cmd+=currentOptions->Options();
  cmd+="'";
  cmd+=" ./configure";

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

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

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

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

int PackageAutotools::release(void)
{
  std::string cmd;
  std::string sstdout;

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

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

PackageAutotools::~PackageAutotools()
{
}

--- NEW FILE: Benchmark-Autotools.h ---
/* ----------------------------------------------------------------------------
   $Id: Benchmark-Autotools.h,v 1.1 2007/01/22 18:21:47 xfred Exp $

   This is free software.
   For details, see the GNU Public License in the COPYING file, or
   Look http://www.fsf.org
   ------------------------------------------------------------------------- */

#ifndef H_CBMBENCHMARKAUTOTOOLS
#define H_CBMBENCHMARKAUTOTOOLS

#include <Benchmark/Package.h>
#include <Benchmark/Benchmark.h>

namespace CBM {
  /** \brief Defines an abstract package based on autotools.
   *
   *  This class can be overloaded in order to get new external packages
   *  supported by CompBenchmarks. Basically it sets up packages (like gzip)
   *  using GNU autotools (./configure, make).
   */
  class PackageAutotools : public Package
  {
  private:

  protected:

    /** Extracts package
     *  Extract a gzipped-tarball.
     *  \return 1 if ok.
     *  \sa CBMBenchmark::packageAbsoluteDirectory() */
    virtual int extract(int _force = 0);
    /** Configure package
	Use ./configure script and standard options.
	\sa CBMBenchmark::Configure()
	\sa CBMBenchmark::language()
	\return 1 if ok.
    */
    virtual int configure(Compiler        *_currentCompiler,
			  CompilerOptions *_currentOptions);

    /** Build package.
	Use make.
	\return 1 if ok.
	\sa CBMBenchmark::make() */
    virtual int make(void);

    /** Removes object files.
	Use make clean.
	\return 1 if ok.
	\sa CBMBenchmark::release() */
    virtual int release(void);

    /** Constructor */
    PackageAutotools(class System *_system);

    /** Virtual destructor */
    virtual ~PackageAutotools();
		
  };
}

#endif

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

From: Frederic T. <xf...@us...> - 2007-01-22 18:21:17

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

Modified Files:
	Makefile.am 
Log Message:
Source CVS tag added.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Base/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am	22 Jan 2007 17:46:28 -0000	1.1
--- Makefile.am	22 Jan 2007 18:21:05 -0000	1.2
***************
*** 1,2 ****
--- 1,11 ----
+ # -----------------------------------------------------------------------------
+ # $Id$
+ # $Source$
+ #
+ # This is free software.
+ # For details, see the GNU Public License in the COPYING file, or
+ # Look http://www.fsf.org
+ # -----------------------------------------------------------------------------
+ 
  noinst_LTLIBRARIES	=	libBase.la

[Compbench-devel] CompBenchmarks++/libcompbenchmarks Makefile.am, 1.2, 1.3

From: Frederic T. <xf...@us...> - 2007-01-22 18:19:59

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

Modified Files:
	Makefile.am 
Log Message:
Source CVS tag added.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	22 Jan 2007 18:16:33 -0000	1.2
--- Makefile.am	22 Jan 2007 18:19:52 -0000	1.3
***************
*** 1,4 ****
--- 1,5 ----
  # -----------------------------------------------------------------------------
  # $Id$
+ # $Source$
  #
  # This is free software.

[Compbench-devel] CompBenchmarks++ configure.in, 1.21, 1.22 Makefile.am, 1.14, 1.15

From: Frederic T. <xf...@us...> - 2007-01-22 18:18:46

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

Modified Files:
	configure.in Makefile.am 
Log Message:
libcompbenchmarks moved in a separate directory.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Makefile.am	28 Dec 2006 18:39:57 -0000	1.14
--- Makefile.am	22 Jan 2007 18:18:39 -0000	1.15
***************
*** 1,5 ****
! SUBDIRS				=	share System Compiler Benchmark UI CBM-PI SupportedBenchmarks
  
! lib_LTLIBRARIES			=	libcompbenchmarks.la
  
  bin_PROGRAMS			=	compbenchmarks-core
--- 1,12 ----
! # -----------------------------------------------------------------------------
! # $Id$
! #
! # This is free software.
! # For details, see the GNU Public License in the COPYING file, or
! # Look http://www.fsf.org
! # -----------------------------------------------------------------------------
  
! 
! SUBDIRS				=	libcompbenchmarks SupportedBenchmarks CBM-PI
  
  bin_PROGRAMS			=	compbenchmarks-core
***************
*** 7,25 ****
  compbenchmarks_core_SOURCES	=	cloptions.cpp main.cpp
  
- libcompbenchmarks_la_SOURCES	=	libcompbenchmarks.cpp
- 
- libcompbenchmarks_la_LIBADD	=	System/libSystem.la \
- 					Compiler/libCompiler.la \
- 					Benchmark/libBenchmark.la \
- 					UI/libUI.la
- #					-lwwwcore -lwwwapp -lwwwinit # !!!
- 
- libcompbenchmarks_la_DEPENDENCIES =     $(libcompbenchmarks_la_LIBADD)
- 
- libcompbenchmarksinclude_HEADERS   = libcompbenchmarks.h config.h CBM.h
- 
  libcompbenchmarksincludedir		=	$(includedir)/compbenchmarks
  
! compbenchmarks_core_LDADD	=       libcompbenchmarks.la
  
  noinst_HEADERS			=	cloptions.h main.h $(libcompbenchmarks_la_SOURCES:.cpp=.h) # !!!
--- 14,20 ----
  compbenchmarks_core_SOURCES	=	cloptions.cpp main.cpp
  
  libcompbenchmarksincludedir		=	$(includedir)/compbenchmarks
  
! compbenchmarks_core_LDADD	=       libcompbenchmarks/libcompbenchmarks.la
  
  noinst_HEADERS			=	cloptions.h main.h $(libcompbenchmarks_la_SOURCES:.cpp=.h) # !!!
***************
*** 27,31 ****
  EXTRA_DIST			=	compbenchmarks-ui-perl Doxyfile compbenchmarks-ui-perl.1 compbenchmarks-core.pod compbenchmarks-core.1
  
! INCLUDES			=	-I $(top_srcdir)
  
  man_MANS			=	compbenchmarks-ui-perl.1 compbenchmarks-core.1
--- 22,26 ----
  EXTRA_DIST			=	compbenchmarks-ui-perl Doxyfile compbenchmarks-ui-perl.1 compbenchmarks-core.pod compbenchmarks-core.1
  
! INCLUDES			=	-I $(top_srcdir)/libcompbenchmarks -I $(top_srcdir)
  
  man_MANS			=	compbenchmarks-ui-perl.1 compbenchmarks-core.1

Index: configure.in
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/configure.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** configure.in	21 Jan 2007 21:45:08 -0000	1.21
--- configure.in	22 Jan 2007 18:18:39 -0000	1.22
***************
*** 2,6 ****
  # Process this file with autoconf to produce a configure script.
  
! AC_INIT(Benchmark/Benchmark.cpp)
  
  AC_CANONICAL_HOST
--- 2,6 ----
  # Process this file with autoconf to produce a configure script.
  
! AC_INIT(libcompbenchmarks/Benchmark/Benchmark.cpp)
  
  AC_CANONICAL_HOST
***************
*** 8,12 ****
  
  AM_INIT_AUTOMAKE(compbenchmarks, 0.5.0)
! AM_CONFIG_HEADER(config.h)
  
  sys=`uname`
--- 8,12 ----
  
  AM_INIT_AUTOMAKE(compbenchmarks, 0.5.0)
! AM_CONFIG_HEADER(libcompbenchmarks/config.h)
  
  sys=`uname`
***************
*** 255,268 ****
  AC_SUBST(CXXFLAGS)
  
! AC_OUTPUT(share/Makefile
! 	  share/patches/Makefile
! 	  share/system/Makefile
! 	  share/system/cygwin/Makefile
! 	  System/Makefile
! 	  Compiler/Compiler-TCC/Makefile
! 	  Compiler/Compiler-GCC/Makefile
! 	  Compiler/Makefile
! 	  Benchmark/Makefile
! 	  UI/Makefile
  	  SupportedBenchmarks/Makefile
            CBM-PI/t/reference/Makefile
--- 255,270 ----
  AC_SUBST(CXXFLAGS)
  
! AC_OUTPUT(libcompbenchmarks/share/Makefile
! 	  libcompbenchmarks/share/patches/Makefile
! 	  libcompbenchmarks/share/system/Makefile
! 	  libcompbenchmarks/share/system/cygwin/Makefile
! 	  libcompbenchmarks/Base/Makefile
! 	  libcompbenchmarks/System/Makefile
! 	  libcompbenchmarks/Compiler/Compiler-TCC/Makefile
! 	  libcompbenchmarks/Compiler/Compiler-GCC/Makefile
! 	  libcompbenchmarks/Compiler/Makefile
!   	  libcompbenchmarks/Makefile
! 	  libcompbenchmarks/Benchmark/Makefile
! 	  libcompbenchmarks/UI/Makefile
  	  SupportedBenchmarks/Makefile
            CBM-PI/t/reference/Makefile

[Compbench-devel] CompBenchmarks++/CBM-PI CBM.i, 1.5, 1.6 CBM.pm, 1.10, 1.11 CBM_wrap.cxx, 1.10, 1.11 Glue.cpp, 1.5, 1.6 Glue.h, 1.3, 1.4 Makefile.am, 1.6, 1.7

From: Frederic T. <xf...@us...> - 2007-01-22 18:17:25

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

Modified Files:
	CBM.i CBM.pm CBM_wrap.cxx Glue.cpp Glue.h Makefile.am 
Log Message:
libcompbenchmarks moved in a separate directory.

Index: CBM.pm
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** CBM.pm	21 Jan 2007 21:28:07 -0000	1.10
--- CBM.pm	22 Jan 2007 18:17:20 -0000	1.11
***************
*** 52,143 ****
  *c_str = *CBMc::c_str;
  
- ############# Class : CBM::XMLAttribute ##############
- 
- package CBM::XMLAttribute;
- use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS);
- @ISA = qw( CBM );
- %OWNER = ();
- %ITERATORS = ();
- sub new {
-     my $pkg = shift;
-     my $self = CBMc::new_XMLAttribute(@_);
-     bless $self, $pkg if defined($self);
- }
- 
- *Name = *CBMc::XMLAttribute_Name;
- *Value = *CBMc::XMLAttribute_Value;
- *setValue = *CBMc::XMLAttribute_setValue;
- sub DESTROY {
-     return unless $_[0]->isa('HASH');
-     my $self = tied(%{$_[0]});
-     return unless defined $self;
-     delete $ITERATORS{$self};
-     if (exists $OWNER{$self}) {
-         CBMc::delete_XMLAttribute($self);
-         delete $OWNER{$self};
-     }
- }
- 
- sub DISOWN {
-     my $self = shift;
-     my $ptr = tied(%$self);
-     delete $OWNER{$ptr};
- }
- 
- sub ACQUIRE {
-     my $self = shift;
-     my $ptr = tied(%$self);
-     $OWNER{$ptr} = 1;
- }
- 
- 
- ############# Class : CBM::XMLNode ##############
- 
- package CBM::XMLNode;
- use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS);
- @ISA = qw( CBM );
- %OWNER = ();
- %ITERATORS = ();
- sub new {
-     my $pkg = shift;
-     my $self = CBMc::new_XMLNode(@_);
-     bless $self, $pkg if defined($self);
- }
- 
- *Name = *CBMc::XMLNode_Name;
- *Value = *CBMc::XMLNode_Value;
- *setValue = *CBMc::XMLNode_setValue;
- *childNumber = *CBMc::XMLNode_childNumber;
- *getChild = *CBMc::XMLNode_getChild;
- *attributeNumber = *CBMc::XMLNode_attributeNumber;
- *getAttribute = *CBMc::XMLNode_getAttribute;
- *addNode = *CBMc::XMLNode_addNode;
- *add = *CBMc::XMLNode_add;
- *addAttribute = *CBMc::XMLNode_addAttribute;
- *str = *CBMc::XMLNode_str;
- sub DESTROY {
-     return unless $_[0]->isa('HASH');
-     my $self = tied(%{$_[0]});
-     return unless defined $self;
-     delete $ITERATORS{$self};
-     if (exists $OWNER{$self}) {
-         CBMc::delete_XMLNode($self);
-         delete $OWNER{$self};
-     }
- }
- 
- sub DISOWN {
-     my $self = shift;
-     my $ptr = tied(%$self);
-     delete $OWNER{$ptr};
- }
- 
- sub ACQUIRE {
-     my $self = shift;
-     my $ptr = tied(%$self);
-     $OWNER{$ptr} = 1;
- }
- 
- 
  ############# Class : CBM::Package ##############
  
--- 52,55 ----
***************
*** 187,190 ****
--- 99,103 ----
  *Configure = *CBMc::Package_Configure;
  *Make = *CBMc::Package_Make;
+ *buildTime = *CBMc::Package_buildTime;
  *Test = *CBMc::Package_Test;
  *Release = *CBMc::Package_Release;
***************
*** 253,256 ****
--- 166,257 ----
  
  
+ ############# Class : CBM::XMLAttribute ##############
+ 
+ package CBM::XMLAttribute;
+ use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS);
+ @ISA = qw( CBM );
+ %OWNER = ();
+ %ITERATORS = ();
+ sub new {
+     my $pkg = shift;
+     my $self = CBMc::new_XMLAttribute(@_);
+     bless $self, $pkg if defined($self);
+ }
+ 
+ *Name = *CBMc::XMLAttribute_Name;
+ *Value = *CBMc::XMLAttribute_Value;
+ *setValue = *CBMc::XMLAttribute_setValue;
+ sub DESTROY {
+     return unless $_[0]->isa('HASH');
+     my $self = tied(%{$_[0]});
+     return unless defined $self;
+     delete $ITERATORS{$self};
+     if (exists $OWNER{$self}) {
+         CBMc::delete_XMLAttribute($self);
+         delete $OWNER{$self};
+     }
+ }
+ 
+ sub DISOWN {
+     my $self = shift;
+     my $ptr = tied(%$self);
+     delete $OWNER{$ptr};
+ }
+ 
+ sub ACQUIRE {
+     my $self = shift;
+     my $ptr = tied(%$self);
+     $OWNER{$ptr} = 1;
+ }
+ 
+ 
+ ############# Class : CBM::XMLNode ##############
+ 
+ package CBM::XMLNode;
+ use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS);
+ @ISA = qw( CBM );
+ %OWNER = ();
+ %ITERATORS = ();
+ sub new {
+     my $pkg = shift;
+     my $self = CBMc::new_XMLNode(@_);
+     bless $self, $pkg if defined($self);
+ }
+ 
+ *Name = *CBMc::XMLNode_Name;
+ *Value = *CBMc::XMLNode_Value;
+ *setValue = *CBMc::XMLNode_setValue;
+ *childNumber = *CBMc::XMLNode_childNumber;
+ *getChild = *CBMc::XMLNode_getChild;
+ *attributeNumber = *CBMc::XMLNode_attributeNumber;
+ *getAttribute = *CBMc::XMLNode_getAttribute;
+ *addNode = *CBMc::XMLNode_addNode;
+ *add = *CBMc::XMLNode_add;
+ *addAttribute = *CBMc::XMLNode_addAttribute;
+ *str = *CBMc::XMLNode_str;
+ sub DESTROY {
+     return unless $_[0]->isa('HASH');
+     my $self = tied(%{$_[0]});
+     return unless defined $self;
+     delete $ITERATORS{$self};
+     if (exists $OWNER{$self}) {
+         CBMc::delete_XMLNode($self);
+         delete $OWNER{$self};
+     }
+ }
+ 
+ sub DISOWN {
+     my $self = shift;
+     my $ptr = tied(%$self);
+     delete $OWNER{$ptr};
+ }
+ 
+ sub ACQUIRE {
+     my $self = shift;
+     my $ptr = tied(%$self);
+     $OWNER{$ptr} = 1;
+ }
+ 
+ 
  ############# Class : CBM::System ##############
  

Index: Glue.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Glue.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Glue.cpp	21 Jan 2007 20:47:56 -0000	1.5
--- Glue.cpp	22 Jan 2007 18:17:20 -0000	1.6
***************
*** 10,14 ****
  
  #include <CBM-PI/Glue.h>
! #include <Benchmark/Benchmark-DLLoader.h>
  
  CBM_SYSTEM *sys;
--- 10,14 ----
  
  #include <CBM-PI/Glue.h>
! #include <libcompbenchmarks.h>
  
  CBM_SYSTEM *sys;

Index: CBM_wrap.cxx
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM_wrap.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** CBM_wrap.cxx	21 Jan 2007 21:28:07 -0000	1.10
--- CBM_wrap.cxx	22 Jan 2007 18:17:20 -0000	1.11
***************
*** 1469,1473 ****
     #include "Benchmark/Benchmark.h"
     #include "Compiler/Compiler.h"
!    #include "System/XML.h"
     using namespace CBM;
  
--- 1469,1473 ----
     #include "Benchmark/Benchmark.h"
     #include "Compiler/Compiler.h"
!    #include "Base/XML.h"
     using namespace CBM;
[...2767 lines suppressed...]
  {"CBMc::System_init", _wrap_System_init},
  {"CBMc::System_hostid", _wrap_System_hostid},
***************
*** 8092,8097 ****
      SvREADONLY_on(sv);
    } while(0) /*@SWIG@*/;
-   SWIG_TypeClientData(SWIGTYPE_p_CBM__XMLAttribute, (void*) "CBM::XMLAttribute");
-   SWIG_TypeClientData(SWIGTYPE_p_CBM__XMLNode, (void*) "CBM::XMLNode");
    /*@SWIG:%set_constant@*/ do {
      SV *sv = get_sv((char*) SWIG_prefix "Package_Unknown", TRUE | 0x2);
--- 8122,8125 ----
***************
*** 8141,8144 ****
--- 8169,8174 ----
    SWIG_TypeClientData(SWIGTYPE_p_CBM__Package, (void*) "CBM::Package");
    SWIG_TypeClientData(SWIGTYPE_p_CBM__Benchmark, (void*) "CBM::Benchmark");
+   SWIG_TypeClientData(SWIGTYPE_p_CBM__XMLAttribute, (void*) "CBM::XMLAttribute");
+   SWIG_TypeClientData(SWIGTYPE_p_CBM__XMLNode, (void*) "CBM::XMLNode");
    /*@SWIG:%set_constant@*/ do {
      SV *sv = get_sv((char*) SWIG_prefix "System_Root", TRUE | 0x2);

Index: CBM.i
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM.i,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CBM.i	21 Jan 2007 20:47:56 -0000	1.5
--- CBM.i	22 Jan 2007 18:17:20 -0000	1.6
***************
*** 9,20 ****
     #include "Benchmark/Benchmark.h"
     #include "Compiler/Compiler.h"
!    #include "System/XML.h"
     using namespace CBM;
  %}
  
  %include "libcompbenchmarks.h"
- %include "System/XML.h"
  %include "Benchmark/Package.h"
  %include "Benchmark/Benchmark.h"
  %include "System/System.h"
  %include "Compiler/Compiler.h"
--- 9,20 ----
     #include "Benchmark/Benchmark.h"
     #include "Compiler/Compiler.h"
!    #include "Base/XML.h"
     using namespace CBM;
  %}
  
  %include "libcompbenchmarks.h"
  %include "Benchmark/Package.h"
  %include "Benchmark/Benchmark.h"
+ %include "Base/XML.h"
  %include "System/System.h"
  %include "Compiler/Compiler.h"

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile.am	21 Jan 2007 21:41:04 -0000	1.6
--- Makefile.am	22 Jan 2007 18:17:20 -0000	1.7
***************
*** 1,8 ****
  lib_LTLIBRARIES		= libCBM.la
  
! libCBM_la_SOURCES	=	Glue.cpp CBM_wrap.cxx
  
  SUBDIRS		=	t
! INCLUDES	 =	-I$(top_srcdir) -I$(top_srcdir)/CBM-PI -I.. -I.
  # LDFLAGS		  =	-L../testing/.libs -lcompbenchmarks
  PERL		  =     @CBM_PROG_PERL@
--- 1,17 ----
+ # -----------------------------------------------------------------------------
+ # $Id$
+ #
+ # This is free software.
+ # For details, see the GNU Public License in the COPYING file, or
+ # Look http://www.fsf.org
+ # -----------------------------------------------------------------------------
+ 
  lib_LTLIBRARIES		= libCBM.la
  
! libCBM_la_SOURCES	=	Glue.cpp Glue.h CBM_wrap.cxx
  
  SUBDIRS		=	t
! INCLUDES	 =	-I$(top_srcdir)/libcompbenchmarks -I$(top_srcdir)/CBM-PI -I.. -I. -I$(top_srcdir)
! 
  # LDFLAGS		  =	-L../testing/.libs -lcompbenchmarks
  PERL		  =     @CBM_PROG_PERL@
***************
*** 23,30 ****
  AM_CXXFLAGS = `$(PERL) -MExtUtils::Embed -e ccopts`
  
! ../libcompbenchmarks.la:
! 	make -C .. libcompbenchmarks.la
! 
! libCBM_la_LIBADD	= ../libcompbenchmarks.la
  
  test:
--- 32,36 ----
  AM_CXXFLAGS = `$(PERL) -MExtUtils::Embed -e ccopts`
  
! libCBM_la_LIBADD	= ../libcompbenchmarks/libcompbenchmarks.la
  
  test:

Index: Glue.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Glue.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Glue.h	21 Jan 2007 20:47:56 -0000	1.3
--- Glue.h	22 Jan 2007 18:17:20 -0000	1.4
***************
*** 12,16 ****
  
  #include <libcompbenchmarks.h>
- #include <Benchmark/Benchmark.h>
  
  extern CBM::System *Init(void);
--- 12,15 ----

[Compbench-devel] CompBenchmarks++/libcompbenchmarks/UI Makefile.am, NONE, 1.1 UI.cpp, NONE, 1.1 UI.h, NONE, 1.1

From: Frederic T. <xf...@us...> - 2007-01-22 18:16:55

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

Added Files:
	Makefile.am UI.cpp UI.h 
Log Message:
libcompbenchmarks moved in a separate directory.

--- NEW FILE: UI.h ---
/* ----------------------------------------------------------------------------
   $Id: UI.h,v 1.1 2007/01/22 18:16:51 xfred Exp $

   This is free software.
   For details, see the GNU Public License in the COPYING file, or
   Look http://www.fsf.org
   ------------------------------------------------------------------------- */

#ifndef H_CBMUI
#define H_CBMUI

#include <string>

namespace CBM {
  /** \brief Basic API for user interface.
   *
   *  This class defines few methods to interact with compbenchmarks-config, or
   *  with the console.
   */
  class UI
  {
  private:
  protected:
    /** Unused for now. */
    std::string progressMsg;
    /** Unused for now. */
    int         progressMax;
    /** Unused for now. */
    int         progressCur;


  public:
    UI();

    /** Typedef for message sent to UI object. */
    typedef enum Info { FileCreate,        /*!< File creation */
			FileRead,          /*!< File is being read */
			FileWrite,         /*!< File has been written */
			FileRemove,        /*!< File has been removed */
			ChecksumOK,        /*!< Correct checksum message */
			ChecksumFailed,    /*!< Bad checksum */
			DirectoryCheck,    /*!< Directory has been checked */
			DirectoryCreate,   /*!< Directory has been created */
			BenchDownload,     /*!< Benchmark downloaded */
			BenchExtract,      /*!< Benchmark extracted */
			BenchPatch,        /*!< Benchmark patched */
			BenchPreconfigure, /*!< Benchmark pre-configured */
			BenchConfigure,    /*!< Benchmark configured */
			BenchMake,         /*!< Benchmark (package) build */
			BenchTest,         /*!< Benchmark is tested */
			BenchBench,        /*!< Benchmark ran */
			BenchResult,       /*!< Benchmark result is being
					    *   displayed */
			BenchClean,        /*!< Package has been cleaned */
			BenchUninstall     /*!< Package uninstalled */
    };

    /** Throws a fatal error.
	Display a message and exits properly.
	\sa CBMSystem::done()
	\return 1 if ok.
    */
    virtual int Fatal(std::string msg);

    /** Display information.
	Prints an header corresponding to the type, then shows msg.
	\param type Type of information
	\param msg  Message (clear text) to display
    */
    virtual int Information(Info type,
			    std::string msg);

    /*
      virtual int ProgressInit(std::string& msg,
      int max) = 0;
      virtual int Progress(int step) = 0;
      virtual int ProgressDone(void) = 0;
    */

    /** Virtual destructor */
    virtual ~UI();
  };

  extern UI *cbmUI;
}

#endif

--- NEW FILE: UI.cpp ---
#include <UI/UI.h>
#include <System/System.h>
#include <libcompbenchmarks.h>

#include <iostream>

using namespace CBM;

CBM::UI *CBM::cbmUI = 0;

UI::UI()
{
  progressMsg="";
  progressMax=-1;
  progressCur=-1;
}

int UI::Fatal(std::string msg)
{
  std::cerr << "FATAL ERROR: " << msg << std::endl;
  if (UO_fatal) {
    CBM::cbmSystem->done();
    exit(1);
  }
  return(1);
}

int UI::Information(CBM::UI::Info type,
		    std::string   msg)
{
  std::string what;

  if (!UO_verbose)
    return(1);

  switch(type) {
  case FileCreate:
    what="Creating file";
    break;
  case FileRead:
    what="Reading";
    break;
  case FileWrite:
    what="Writing";
    break;
  case FileRemove:
    what="Removing";
    break;
  case ChecksumOK:
    what="MD5 Checksum successfuly verified on";
    break;
  case ChecksumFailed:
    what="Bad MD5 Checksum on";
    break;
  case DirectoryCheck:
    what="Checking directory";
    break;
  case DirectoryCreate:
    what="Creating directory";
    break;
  case BenchDownload:
    what="Downloading";
    break;
  case BenchExtract:
    what="Extracting";
    break;
  case BenchPatch:
    what="Patching";
    break;
  case BenchPreconfigure:
    what="Preconfiguring";
    break;
  case BenchConfigure:
    what="Configuring";
    break;
  case BenchTest:
    what="Testing";
    break;
  case BenchMake:
    what="Making";
    break;
  case BenchBench:
    what="Running benchmark";
    break;
  case BenchResult:
    what="Benchmark result :";
    break;
  case BenchClean:
    what="Cleaning";
    break;
  case BenchUninstall:
    what="Uninstalling";
    break;
  default:
    what="(?)";
  }
  std::cout << what << " " << msg << std::endl;
  return(1);
}

UI::~UI()
{
}

--- NEW FILE: Makefile.am ---
# -----------------------------------------------------------------------------
# $Id: Makefile.am,v 1.1 2007/01/22 18:16:51 xfred Exp $
#
# This is free software.
# For details, see the GNU Public License in the COPYING file, or
# Look http://www.fsf.org
# -----------------------------------------------------------------------------

noinst_LTLIBRARIES	=	libUI.la

sources			=       UI.cpp

libUI_la_SOURCES 	=	$(sources)

libUIinclude_HEADERS	=	$(sources:.cpp=.h)
libUIincludedir		=	$(includedir)/compbenchmarks/UI

INCLUDES		=	-I $(top_srcdir)/libcompbenchmarks

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

From: Frederic T. <xf...@us...> - 2007-01-22 18:16:38

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

Modified Files:
	Makefile.am 
Log Message:
libcompbenchmarks moved in a separate directory.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am	22 Jan 2007 17:42:43 -0000	1.1
--- Makefile.am	22 Jan 2007 18:16:33 -0000	1.2
***************
*** 1,5 ****
! # libcompbenchmarks/Makefile.am
  
! SUBDIRS				=	share System Compiler Benchmark UI
  
  lib_LTLIBRARIES			=	libcompbenchmarks.la
--- 1,11 ----
! # -----------------------------------------------------------------------------
! # $Id$
! #
! # This is free software.
! # For details, see the GNU Public License in the COPYING file, or
! # Look http://www.fsf.org
! # -----------------------------------------------------------------------------
  
! SUBDIRS				=	Base share System Compiler Benchmark UI
  
  lib_LTLIBRARIES			=	libcompbenchmarks.la
***************
*** 7,11 ****
  libcompbenchmarks_la_SOURCES	=	libcompbenchmarks.cpp
  
! libcompbenchmarks_la_LIBADD	=	System/libSystem.la \
  					Compiler/libCompiler.la \
  					Benchmark/libBenchmark.la \
--- 13,18 ----
  libcompbenchmarks_la_SOURCES	=	libcompbenchmarks.cpp
  
! libcompbenchmarks_la_LIBADD	=	Base/libBase.la \
! 					System/libSystem.la \
  					Compiler/libCompiler.la \
  					Benchmark/libBenchmark.la \

[Compbench-devel] CompBenchmarks++/UI Makefile.am, 1.2, NONE UI.cpp, 1.8, NONE UI.h, 1.5, NONE

From: Frederic T. <xf...@us...> - 2007-01-22 18:15:01

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

Removed Files:
	Makefile.am UI.cpp UI.h 
Log Message:
libcompbenchmarks moved in a separate directory.

--- UI.h DELETED ---

--- UI.cpp DELETED ---

--- Makefile.am DELETED ---

[Compbench-devel] CompBenchmarks++/System Makefile.am, 1.10, NONE System-Cygwin.cpp, 1.4, NONE System-Cygwin.h, 1.3, NONE System-FreeBSD.cpp, 1.7, NONE System-FreeBSD.h, 1.3, NONE System-Linux.cpp, 1.6, NONE System-Linux.h, 1.4, NONE System-Unix.cpp, 1.8, NONE System-Unix.h, 1.5, NONE System.cpp, 1.22, NONE System.h, 1.22, NONE XML.cpp, 1.3, NONE XML.h, 1.4, NONE md5.cpp, 1.1.1.1, NONE md5.h, 1.1.1.1, NONE

From: Frederic T. <xf...@us...> - 2007-01-22 18:14:13

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

Removed Files:
	Makefile.am System-Cygwin.cpp System-Cygwin.h 
	System-FreeBSD.cpp System-FreeBSD.h System-Linux.cpp 
	System-Linux.h System-Unix.cpp System-Unix.h System.cpp 
	System.h XML.cpp XML.h md5.cpp md5.h 
Log Message:
libcompbenchmarks moved in a separate directory.

--- XML.cpp DELETED ---

--- Makefile.am DELETED ---

--- md5.h DELETED ---

--- System-Cygwin.h DELETED ---

--- System-Linux.cpp DELETED ---

--- System.h DELETED ---

--- System-FreeBSD.cpp DELETED ---

--- md5.cpp DELETED ---

--- System-Cygwin.cpp DELETED ---

--- System.cpp DELETED ---

--- XML.h DELETED ---

--- System-Linux.h DELETED ---

--- System-FreeBSD.h DELETED ---

--- System-Unix.cpp DELETED ---

--- System-Unix.h DELETED ---

[Compbench-devel] CompBenchmarks++/Compiler/Compiler-GCC Compiler-GCC.cpp, 1.3, NONE Compiler-GCC.h, 1.3, NONE Makefile.am, 1.2, NONE

From: Frederic T. <xf...@us...> - 2007-01-22 18:13:08

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

Removed Files:
	Compiler-GCC.cpp Compiler-GCC.h Makefile.am 
Log Message:
libcompbenchmarks moved in a separate directory.

--- Compiler-GCC.h DELETED ---

--- Makefile.am DELETED ---

--- Compiler-GCC.cpp DELETED ---

Flat | Threaded

<< < 1 .. 27 28 29 30 31 .. 45 > >> (Page 29 of 45)

2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (48)	Oct (51)	Nov (66)	Dec (83)
2007	Jan (242)	Feb (56)	Mar (95)	Apr (120)	May (127)	Jun (32)	Jul (10)	Aug (55)	Sep (114)	Oct (3)	Nov	Dec