compbench-devel Mailing List for CompBenchmarks (Page 36)
Brought to you by:
xfred
Menu
▾
▴
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
|
|
From: Frederic T. <xf...@us...> - 2006-12-28 13:31:44
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23605 Modified Files: main.cpp Log Message: Obsolete code removed. Index: main.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/main.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** main.cpp 1 Nov 2006 13:06:47 -0000 1.6 --- main.cpp 28 Dec 2006 13:31:42 -0000 1.7 *************** *** 1,9 **** #include <config.h> #include <libcompbenchmarks.h> - - #ifdef CBM_SYSTEM_FREEBSD - # include <System/System-FreeBSD.h> - #endif - #include <cloptions.h> --- 1,4 ---- |
|
From: Frederic T. <xf...@us...> - 2006-12-28 13:29:37
|
Update of /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22787/SupportedBenchmarks Log Message: Directory /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks added to the repository |
|
From: Frederic T. <xf...@us...> - 2006-12-28 13:24:15
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20827 Modified Files: Glue.cpp Log Message: Verbosity is off, by default. Index: Glue.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Glue.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Glue.cpp 28 Dec 2006 00:38:14 -0000 1.1 --- Glue.cpp 28 Dec 2006 13:24:10 -0000 1.2 *************** *** 16,19 **** --- 16,20 ---- { sys = new CBM_SYSTEM; + UO_verbose=0; sys->init(); return(sys); |
|
From: Frederic T. <xf...@us...> - 2006-12-28 13:23:44
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20468 Modified Files: Makefile.am Log Message: Fixed output directories. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 28 Dec 2006 00:38:14 -0000 1.1 --- Makefile.am 28 Dec 2006 13:23:38 -0000 1.2 *************** *** 8,15 **** $(CXX) $(INCLUDES) -c $< -o $@ ! CBM.pm: CBM.i swig -c++ $(INCLUDES) -shadow -Wall -perl $< ! CBM.o: CBM.pm $(CXX) $(INCLUDES) -c $(top_srcdir)/CBM-PI/CBM_wrap.cxx `$(PERL) -MExtUtils::Embed -e ccopts` --- 8,15 ---- $(CXX) $(INCLUDES) -c $< -o $@ ! $(top_srcdir)/CBM-PI/CBM.pm: CBM.i swig -c++ $(INCLUDES) -shadow -Wall -perl $< ! CBM.o: $(top_srcdir)/CBM-PI/CBM.pm $(CXX) $(INCLUDES) -c $(top_srcdir)/CBM-PI/CBM_wrap.cxx `$(PERL) -MExtUtils::Embed -e ccopts` *************** *** 23,25 **** clean-local: ! rm -rf *.pm *.i~ *.cxx *.so *.o *.cpp~ *.h~ Makefile~ \ No newline at end of file --- 23,25 ---- clean-local: ! cd $(top_srcdir)/CBM-PI && rm -rf *.pm *.i~ *.cxx *.so *.o *.cpp~ *.h~ Makefile~ \ No newline at end of file |
|
From: Frederic T. <xf...@us...> - 2006-12-28 13:23:03
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20090 Modified Files: CBM.i CBM.pm CBM_wrap.cxx Log Message: libcompbenchmarks.h used. Index: CBM.pm =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CBM.pm 28 Dec 2006 00:38:14 -0000 1.1 --- CBM.pm 28 Dec 2006 13:22:57 -0000 1.2 *************** *** 47,50 **** --- 47,51 ---- package CBM; + *setVerbosity = *CBMc::setVerbosity; *Init = *CBMc::Init; *stringref = *CBMc::stringref; *************** *** 377,380 **** --- 378,382 ---- *CBM_SYSTEM_FREEBSD = *CBMc::CBM_SYSTEM_FREEBSD; *CBM_SYSTEM_LINUX = *CBMc::CBM_SYSTEM_LINUX; + *HAVE_CTYPE_H = *CBMc::HAVE_CTYPE_H; *HAVE_DLFCN_H = *CBMc::HAVE_DLFCN_H; *HAVE_GETOPT_H = *CBMc::HAVE_GETOPT_H; *************** *** 399,402 **** --- 401,409 ---- *STDC_HEADERS = *CBMc::STDC_HEADERS; *VERSION = *CBMc::VERSION; + *H_CBMLIBCOMPBENCHMARKS = *CBMc::H_CBMLIBCOMPBENCHMARKS; + *libcompbenchmarks_version = *CBMc::libcompbenchmarks_version; + *UO_enableTestSuite = *CBMc::UO_enableTestSuite; + *UO_force = *CBMc::UO_force; + *UO_verbose = *CBMc::UO_verbose; my %__cbmSystem_hash; Index: CBM_wrap.cxx =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM_wrap.cxx,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CBM_wrap.cxx 28 Dec 2006 00:38:14 -0000 1.1 --- CBM_wrap.cxx 28 Dec 2006 13:22:57 -0000 1.2 *************** *** 1375,1378 **** --- 1375,1381 ---- + #define SWIG_exception(code, msg) do { SWIG_Error(code, msg);; } while(0) + + /* -------- TYPES TABLE (BEGIN) -------- */ *************** *** 1424,1430 **** --- 1427,1464 ---- + #include <stdexcept> + + #include <string> + double SwigSvToNumber(SV* sv) { + return SvIOK(sv) ? double(SvIVX(sv)) : SvNVX(sv); + } + std::string SwigSvToString(SV* sv) { + STRLEN len; + return SvPV(sv,len); + } + void SwigSvFromString(SV* sv, const std::string& s) { + sv_setpv(sv,s.c_str()); + } + + + #include <string> + + + #include <vector> + #include <algorithm> + #include <stdexcept> + + #include <map> + #include <algorithm> + #include <stdexcept> + + + #include <utility> + + + #include "libcompbenchmarks.h" #include "Glue.h" *************** *** 1492,1574 **** - SWIGINTERN swig_type_info* - SWIG_pchar_descriptor() - { - static int init = 0; - static swig_type_info* info = 0; - if (!init) { - info = SWIG_TypeQuery("_p_char"); - init = 1; - } - return info; - } - - - SWIGINTERN int - SWIG_AsCharPtrAndSize(SV *obj, char** cptr, size_t* psize, int *alloc) - { - if (SvPOK(obj)) { - STRLEN len = 0; - char *cstr = SvPV(obj, len); - size_t size = len + 1; - if (cptr) { - if (alloc) { - if (*alloc == SWIG_NEWOBJ) { - *cptr = reinterpret_cast<char* >(memcpy((new char[size]), cstr, sizeof(char)*(size))); - } else { - *cptr = cstr; - *alloc = SWIG_OLDOBJ; - } - } - } - if (psize) *psize = size; - return SWIG_OK; - } else { - swig_type_info* pchar_descriptor = SWIG_pchar_descriptor(); - if (pchar_descriptor) { - char* vptr = 0; - if (SWIG_ConvertPtr(obj, (void**)&vptr, pchar_descriptor, 0) == SWIG_OK) { - if (cptr) *cptr = vptr; - if (psize) *psize = vptr ? (strlen(vptr) + 1) : 0; - if (alloc) *alloc = SWIG_OLDOBJ; - return SWIG_OK; - } - } - } - return SWIG_TypeError; - } - - - SWIGINTERN int - SWIG_AsPtr_std_string SWIG_PERL_DECL_ARGS_2(SV * obj, std::string **val) - { - char* buf = 0 ; size_t size = 0; int alloc = SWIG_OLDOBJ; - if (SWIG_IsOK((SWIG_AsCharPtrAndSize(obj, &buf, &size, &alloc)))) { - if (buf) { - if (val) *val = new std::string(buf, size - 1); - if (alloc == SWIG_NEWOBJ) delete[] buf; - return SWIG_NEWOBJ; - } else { - if (val) *val = 0; - return SWIG_OLDOBJ; - } - } else { - static int init = 0; - static swig_type_info* descriptor = 0; - if (!init) { - descriptor = SWIG_TypeQuery("std::string" " *"); - init = 1; - } - if (descriptor) { - std::string *vptr; - int res = SWIG_ConvertPtr(obj, (void**)&vptr, descriptor, 0); - if (SWIG_IsOK(res) && val) *val = vptr; - return res; - } - } - return SWIG_ERROR; - } - - #include <limits.h> #ifndef LLONG_MIN --- 1526,1529 ---- *************** *** 1649,1665 **** SWIGINTERN int ! SWIG_AsVal_unsigned_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, unsigned long *val) { ! if (SvUOK(obj)) { ! if (val) *val = SvUV(obj); return SWIG_OK; - } else if (SvIOK(obj)) { - long v = SvIV(obj); - if (v >= 0) { - if (val) *val = v; - return SWIG_OK; - } else { - return SWIG_OverflowError; - } } else { int dispatch = 0; --- 1604,1612 ---- SWIGINTERN int ! SWIG_AsVal_long SWIG_PERL_DECL_ARGS_2(SV *obj, long* val) { ! if (SvIOK(obj)) { ! if (val) *val = SvIV(obj); return SWIG_OK; } else { int dispatch = 0; *************** *** 1667,1671 **** if (nptr) { char *endptr; ! unsigned long v = strtoul(nptr, &endptr,0); if (errno == ERANGE) { errno = 0; --- 1614,1618 ---- if (nptr) { char *endptr; ! long v = strtol(nptr, &endptr,0); if (errno == ERANGE) { errno = 0; *************** *** 1681,1686 **** double d; int res = SWIG_AddCast(SWIG_AsVal_double SWIG_PERL_CALL_ARGS_2(obj,&d)); ! if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, 0, ULONG_MAX)) { ! if (val) *val = (unsigned long)(d); return res; } --- 1628,1633 ---- double d; int res = SWIG_AddCast(SWIG_AsVal_double SWIG_PERL_CALL_ARGS_2(obj,&d)); ! if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, LONG_MIN, LONG_MAX)) { ! if (val) *val = (long)(d); return res; } *************** *** 1692,1704 **** SWIGINTERN int ! SWIG_AsVal_unsigned_SS_int SWIG_PERL_DECL_ARGS_2(SV * obj, unsigned int *val) { ! unsigned long v; ! int res = SWIG_AsVal_unsigned_SS_long SWIG_PERL_CALL_ARGS_2(obj, &v); if (SWIG_IsOK(res)) { ! if ((v > UINT_MAX)) { return SWIG_OverflowError; } else { ! if (val) *val = static_cast<unsigned int >(v); } } --- 1639,1651 ---- SWIGINTERN int ! SWIG_AsVal_int SWIG_PERL_DECL_ARGS_2(SV * obj, int *val) { ! long v; ! int res = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(obj, &v); if (SWIG_IsOK(res)) { ! if ((v < INT_MIN || v > INT_MAX)) { return SWIG_OverflowError; } else { ! if (val) *val = static_cast<int >(v); } } *************** *** 1707,1723 **** ! SWIGINTERNINLINE SV * ! SWIG_From_std_string SWIG_PERL_DECL_ARGS_1(const std::string& s) { ! return SWIG_FromCharPtrAndSize(s.data(), s.size()); } SWIGINTERN int ! SWIG_AsVal_long SWIG_PERL_DECL_ARGS_2(SV *obj, long* val) { ! if (SvIOK(obj)) { ! if (val) *val = SvIV(obj); return SWIG_OK; } else { int dispatch = 0; --- 1654,1750 ---- ! SWIGINTERN swig_type_info* ! SWIG_pchar_descriptor() { ! static int init = 0; ! static swig_type_info* info = 0; ! if (!init) { ! info = SWIG_TypeQuery("_p_char"); ! init = 1; ! } ! return info; } SWIGINTERN int ! SWIG_AsCharPtrAndSize(SV *obj, char** cptr, size_t* psize, int *alloc) { ! if (SvPOK(obj)) { ! STRLEN len = 0; ! char *cstr = SvPV(obj, len); ! size_t size = len + 1; ! if (cptr) { ! if (alloc) { ! if (*alloc == SWIG_NEWOBJ) { ! *cptr = reinterpret_cast<char* >(memcpy((new char[size]), cstr, sizeof(char)*(size))); ! } else { ! *cptr = cstr; ! *alloc = SWIG_OLDOBJ; ! } ! } ! } ! if (psize) *psize = size; ! return SWIG_OK; ! } else { ! swig_type_info* pchar_descriptor = SWIG_pchar_descriptor(); ! if (pchar_descriptor) { ! char* vptr = 0; ! if (SWIG_ConvertPtr(obj, (void**)&vptr, pchar_descriptor, 0) == SWIG_OK) { ! if (cptr) *cptr = vptr; ! if (psize) *psize = vptr ? (strlen(vptr) + 1) : 0; ! if (alloc) *alloc = SWIG_OLDOBJ; ! return SWIG_OK; ! } ! } ! } ! return SWIG_TypeError; ! } ! ! ! SWIGINTERN int ! SWIG_AsPtr_std_string SWIG_PERL_DECL_ARGS_2(SV * obj, std::string **val) ! { ! char* buf = 0 ; size_t size = 0; int alloc = SWIG_OLDOBJ; ! if (SWIG_IsOK((SWIG_AsCharPtrAndSize(obj, &buf, &size, &alloc)))) { ! if (buf) { ! if (val) *val = new std::string(buf, size - 1); ! if (alloc == SWIG_NEWOBJ) delete[] buf; ! return SWIG_NEWOBJ; ! } else { ! if (val) *val = 0; ! return SWIG_OLDOBJ; ! } ! } else { ! static int init = 0; ! static swig_type_info* descriptor = 0; ! if (!init) { ! descriptor = SWIG_TypeQuery("std::string" " *"); ! init = 1; ! } ! if (descriptor) { ! std::string *vptr; ! int res = SWIG_ConvertPtr(obj, (void**)&vptr, descriptor, 0); ! if (SWIG_IsOK(res) && val) *val = vptr; ! return res; ! } ! } ! return SWIG_ERROR; ! } ! ! ! SWIGINTERN int ! SWIG_AsVal_unsigned_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, unsigned long *val) ! { ! if (SvUOK(obj)) { ! if (val) *val = SvUV(obj); return SWIG_OK; + } else if (SvIOK(obj)) { + long v = SvIV(obj); + if (v >= 0) { + if (val) *val = v; + return SWIG_OK; + } else { + return SWIG_OverflowError; + } } else { int dispatch = 0; *************** *** 1725,1729 **** if (nptr) { char *endptr; ! long v = strtol(nptr, &endptr,0); if (errno == ERANGE) { errno = 0; --- 1752,1756 ---- if (nptr) { char *endptr; ! unsigned long v = strtoul(nptr, &endptr,0); if (errno == ERANGE) { errno = 0; *************** *** 1739,1744 **** double d; int res = SWIG_AddCast(SWIG_AsVal_double SWIG_PERL_CALL_ARGS_2(obj,&d)); ! if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, LONG_MIN, LONG_MAX)) { ! if (val) *val = (long)(d); return res; } --- 1766,1771 ---- double d; int res = SWIG_AddCast(SWIG_AsVal_double SWIG_PERL_CALL_ARGS_2(obj,&d)); ! if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, 0, ULONG_MAX)) { ! if (val) *val = (unsigned long)(d); return res; } *************** *** 1750,1762 **** SWIGINTERN int ! SWIG_AsVal_int SWIG_PERL_DECL_ARGS_2(SV * obj, int *val) { ! long v; ! int res = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(obj, &v); if (SWIG_IsOK(res)) { ! if ((v < INT_MIN || v > INT_MAX)) { return SWIG_OverflowError; } else { ! if (val) *val = static_cast<int >(v); } } --- 1777,1789 ---- SWIGINTERN int ! SWIG_AsVal_unsigned_SS_int SWIG_PERL_DECL_ARGS_2(SV * obj, unsigned int *val) { ! unsigned long v; ! int res = SWIG_AsVal_unsigned_SS_long SWIG_PERL_CALL_ARGS_2(obj, &v); if (SWIG_IsOK(res)) { ! if ((v > UINT_MAX)) { return SWIG_OverflowError; } else { ! if (val) *val = static_cast<unsigned int >(v); } } *************** *** 1765,1768 **** --- 1792,1802 ---- + SWIGINTERNINLINE SV * + SWIG_From_std_string SWIG_PERL_DECL_ARGS_1(const std::string& s) + { + return SWIG_FromCharPtrAndSize(s.data(), s.size()); + } + + *************** *** 1779,1782 **** --- 1813,1909 ---- return 0; } + SWIGCLASS_STATIC int _wrap_libcompbenchmarks_version_set(pTHX_ SV* sv, MAGIC * SWIGUNUSEDPARM(mg)) { + MAGIC_PPERL + { + char *cptr = 0; size_t csize = 0; int alloc = SWIG_NEWOBJ; + int res = SWIG_AsCharPtrAndSize(sv, &cptr, &csize, &alloc); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), "in variable '""libcompbenchmarks_version""' of type '""char *""'"); + } + if (libcompbenchmarks_version) delete[] libcompbenchmarks_version; + if (alloc == SWIG_NEWOBJ) { + libcompbenchmarks_version = cptr; + } else { + libcompbenchmarks_version = csize ? reinterpret_cast<char* >(memcpy((new char[csize]), cptr, sizeof(char)*(csize))) : 0; + } + } + fail: + return 1; + } + + + SWIGCLASS_STATIC int _wrap_libcompbenchmarks_version_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) { + MAGIC_PPERL + sv_setsv(sv,SWIG_FromCharPtr(libcompbenchmarks_version)) ; + return 1; + } + + + SWIGCLASS_STATIC int _wrap_UO_enableTestSuite_set(pTHX_ SV* sv, MAGIC * SWIGUNUSEDPARM(mg)) { + MAGIC_PPERL + { + int val; + int res = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(sv, &val); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), "in variable '""UO_enableTestSuite""' of type '""int""'"); + } + UO_enableTestSuite = static_cast<int >(val); + } + fail: + return 1; + } + + + SWIGCLASS_STATIC int _wrap_UO_enableTestSuite_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) { + MAGIC_PPERL + sv_setsv(sv,SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast<int >(UO_enableTestSuite))) ; + return 1; + } + + + SWIGCLASS_STATIC int _wrap_UO_force_set(pTHX_ SV* sv, MAGIC * SWIGUNUSEDPARM(mg)) { + MAGIC_PPERL + { + int val; + int res = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(sv, &val); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), "in variable '""UO_force""' of type '""int""'"); + } + UO_force = static_cast<int >(val); + } + fail: + return 1; + } + + + SWIGCLASS_STATIC int _wrap_UO_force_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) { + MAGIC_PPERL + sv_setsv(sv,SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast<int >(UO_force))) ; + return 1; + } + + + SWIGCLASS_STATIC int _wrap_UO_verbose_set(pTHX_ SV* sv, MAGIC * SWIGUNUSEDPARM(mg)) { + MAGIC_PPERL + { + int val; + int res = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(sv, &val); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), "in variable '""UO_verbose""' of type '""int""'"); + } + UO_verbose = static_cast<int >(val); + } + fail: + return 1; + } + + + SWIGCLASS_STATIC int _wrap_UO_verbose_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) { + MAGIC_PPERL + sv_setsv(sv,SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast<int >(UO_verbose))) ; + return 1; + } + + SWIGCLASS_STATIC int _wrap_cbmSystem_set(pTHX_ SV* sv, MAGIC * SWIGUNUSEDPARM(mg)) { MAGIC_PPERL *************** *** 1810,1813 **** --- 1937,1968 ---- extern "C" { #endif + XS(_wrap_setVerbosity) { + { + int arg1 ; + int val1 ; + int ecode1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: setVerbosity(v);"); + } + ecode1 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(0), &val1); + if (!SWIG_IsOK(ecode1)) { + SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "setVerbosity" "', argument " "1"" of type '" "int""'"); + } + arg1 = static_cast<int >(val1); + setVerbosity(arg1); + + + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } + } + + XS(_wrap_CBMSystem_init) { { *************** *** 5246,5253 **** --- 5401,5413 ---- #endif static swig_variable_info swig_variables[] = { + { "CBMc::libcompbenchmarks_version", MAGIC_CLASS _wrap_libcompbenchmarks_version_set, MAGIC_CLASS _wrap_libcompbenchmarks_version_get,0 }, + { "CBMc::UO_enableTestSuite", MAGIC_CLASS _wrap_UO_enableTestSuite_set, MAGIC_CLASS _wrap_UO_enableTestSuite_get,0 }, + { "CBMc::UO_force", MAGIC_CLASS _wrap_UO_force_set, MAGIC_CLASS _wrap_UO_force_get,0 }, + { "CBMc::UO_verbose", MAGIC_CLASS _wrap_UO_verbose_set, MAGIC_CLASS _wrap_UO_verbose_get,0 }, { "CBMc::cbmSystem", MAGIC_CLASS _wrap_cbmSystem_set, MAGIC_CLASS _wrap_cbmSystem_get,&SWIGTYPE_p_CBMSystem }, {0,0,0,0} }; static swig_command_info swig_commands[] = { + {"CBMc::setVerbosity", _wrap_setVerbosity}, {"CBMc::CBMSystem_init", _wrap_CBMSystem_init}, {"CBMc::CBMSystem_Split", _wrap_CBMSystem_Split}, *************** *** 5701,5704 **** --- 5861,5869 ---- } while(0) /*@SWIG@*/; /*@SWIG:%set_constant@*/ do { + SV *sv = get_sv((char*) SWIG_prefix "HAVE_CTYPE_H", TRUE | 0x2); + sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast<int >(1))); + SvREADONLY_on(sv); + } while(0) /*@SWIG@*/; + /*@SWIG:%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "HAVE_DLFCN_H", TRUE | 0x2); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast<int >(1))); *************** *** 5811,5814 **** --- 5976,5984 ---- } while(0) /*@SWIG@*/; /*@SWIG:%set_constant@*/ do { + SV *sv = get_sv((char*) SWIG_prefix "H_CBMLIBCOMPBENCHMARKS", TRUE | 0x2); + sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast<int >(1))); + SvREADONLY_on(sv); + } while(0) /*@SWIG@*/; + /*@SWIG:%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CBMSystem_Root", TRUE | 0x2); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast<int >(CBMSystem::Root))); Index: CBM.i =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CBM.i 28 Dec 2006 00:38:14 -0000 1.1 --- CBM.i 28 Dec 2006 13:22:57 -0000 1.2 *************** *** 1,6 **** ! %include std_string.i %module CBM %{ #include "Glue.h" %} --- 1,7 ---- ! %include stl.i %module CBM %{ + #include "libcompbenchmarks.h" #include "Glue.h" %} *************** *** 37,40 **** --- 38,42 ---- %include "config.h" + %include "libcompbenchmarks.h" %include "System/System.h" %include "System/System-Unix.h" |
|
From: Frederic T. <xf...@us...> - 2006-12-28 13:22:18
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20039 Modified Files: libcompbenchmarks.cpp libcompbenchmarks.h Log Message: Parametrable verbosity. Index: libcompbenchmarks.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** libcompbenchmarks.h 1 Nov 2006 13:20:05 -0000 1.1 --- libcompbenchmarks.h 28 Dec 2006 13:22:15 -0000 1.2 *************** *** 24,27 **** --- 24,31 ---- #endif + /** Enable/disable verbosity + * \sa UO_verbose */ + extern void setVerbosity(int v); + /** Defines version of the libcompbenchmarks library */ extern char *libcompbenchmarks_version; *************** *** 34,36 **** --- 38,45 ---- + /** Verbose mode. + * If set to 0, disable verbose mode (UI messages disabled). */ + extern int UO_verbose; + + #endif Index: libcompbenchmarks.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** libcompbenchmarks.cpp 1 Nov 2006 13:20:05 -0000 1.1 --- libcompbenchmarks.cpp 28 Dec 2006 13:22:15 -0000 1.2 *************** *** 5,6 **** --- 5,13 ---- int UO_enableTestSuite = 1; int UO_force = 0; + int UO_verbose = 1; + + + void setVerbosity(int v) + { + UO_verbose=v; + } |
|
From: Frederic T. <xf...@us...> - 2006-12-28 13:21:14
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19562 Modified Files: configure.in Log Message: Bump to 0.5.0. Index: configure.in =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/configure.in,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** configure.in 28 Dec 2006 00:40:56 -0000 1.17 --- configure.in 28 Dec 2006 13:21:09 -0000 1.18 *************** *** 7,11 **** AC_CANONICAL_TARGET ! AM_INIT_AUTOMAKE(compbenchmarks, 0.4.1) AM_CONFIG_HEADER(config.h) --- 7,11 ---- AC_CANONICAL_TARGET ! AM_INIT_AUTOMAKE(compbenchmarks, 0.5.0) AM_CONFIG_HEADER(config.h) |
|
From: Frederic T. <xf...@us...> - 2006-12-28 13:20:49
|
Update of /cvsroot/compbench/CompBenchmarks++/Benchmark In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19161 Modified Files: Makefile.am Log Message: Support libraries now explicitly depends on libcompbenchmarks.la (which breaks build at this time). Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Makefile.am,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Makefile.am 18 Dec 2006 17:49:43 -0000 1.14 --- Makefile.am 28 Dec 2006 13:20:45 -0000 1.15 *************** *** 16,19 **** --- 16,28 ---- Benchmark-xZIP.cpp + + libcompbenchmarks_gzip_la_LIBADD = ../libcompbenchmarks.la + libcompbenchmarks_bzip2_la_LIBADD = ../libcompbenchmarks.la + libcompbenchmarks_nbench_la_LIBADD = ../libcompbenchmarks.la + libcompbenchmarks_scimark2_la_LIBADD = ../libcompbenchmarks.la + libcompbenchmarks_benchpp_la_LIBADD = ../libcompbenchmarks.la + libcompbenchmarks_benchpplinux_la_LIBADD = ../libcompbenchmarks.la + libcompbenchmarks_linpackc_la_LIBADD = ../libcompbenchmarks.la + Benchmark-Selector.cpp: Benchmark-Selector.liblist.h |
|
From: Frederic T. <xf...@us...> - 2006-12-28 13:19:50
|
Update of /cvsroot/compbench/CompBenchmarks++/Benchmark In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18730 Modified Files: Benchmark.cpp Benchmark.h Log Message: packageName() is not a pure method anymore. Index: Benchmark.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Benchmark.h 23 Nov 2006 16:35:32 -0000 1.10 --- Benchmark.h 28 Dec 2006 13:19:47 -0000 1.11 *************** *** 59,63 **** /** Package name * \return a std::string like 'gzip', without quotes */ ! virtual std::string packageName(void) = 0; /** Package version --- 59,63 ---- /** Package name * \return a std::string like 'gzip', without quotes */ ! virtual std::string packageName(void); /** Package version Index: Benchmark.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Benchmark.cpp 27 Dec 2006 18:21:45 -0000 1.16 --- Benchmark.cpp 28 Dec 2006 13:19:47 -0000 1.17 *************** *** 20,23 **** --- 20,28 ---- } + std::string CBMBenchmark::packageName(void) + { + return(""); + } + int CBMBenchmark::readStatus(void) { |
|
From: Frederic T. <xf...@us...> - 2006-12-28 13:18:58
|
Update of /cvsroot/compbench/CompBenchmarks++/Benchmark In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18335 Modified Files: Benchmark-DLLoader.cpp Benchmark-DLLoader.h Log Message: Take care of UO_verbose. Paths to libraries are now defined through a vector. Index: Benchmark-DLLoader.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-DLLoader.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Benchmark-DLLoader.cpp 1 Nov 2006 13:03:13 -0000 1.1 --- Benchmark-DLLoader.cpp 28 Dec 2006 13:18:55 -0000 1.2 *************** *** 1,9 **** #include <Benchmark/Benchmark-DLLoader.h> #include <string> #include <iostream> - #include <vector> #include <config.h> /* cache... */ std::vector<cbmlib_internal*> cbmlib_loaded_libraries; --- 1,12 ---- #include <Benchmark/Benchmark-DLLoader.h> + #include <libcompbenchmarks.h> + #include <string> #include <iostream> #include <config.h> + std::vector<std::string> cbmlib_paths; + /* cache... */ std::vector<cbmlib_internal*> cbmlib_loaded_libraries; *************** *** 28,36 **** cbmlib_internal *r; ! std::cout << "Loading " << lib << "... "; r=cbmlib_check_previousload(package_id); if (r) { ! std::cout << "found (cached)." << std::endl; return(r); } --- 31,41 ---- 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); } *************** *** 38,75 **** library=dlopen(lib, RTLD_NOW); if (library) { ! std::cout << "found." << std::endl; r=new cbmlib_internal; r->library=library; ! std::cout << " Checking cbmlib_getBenchmarkNumber... "; r->Number=(cbmlib_internal_number_t) (dlsym(r->library, "cbmlib_getBenchmarkNumber")); if (!r->Number) { dlclose(library); ! std::cout << "N.A." << std::endl; delete(r); return(0); } else { ! std::cout << "found." << std::endl; } ! std::cout << " Checking cbmlib_getBenchmark... "; r->Bench=(cbmlib_internal_bench_t) dlsym(r->library, "cbmlib_getBenchmark"); if (!r->Bench) { dlclose(library); ! std::cout << "N.A." << std::endl; delete(r); return(0); } else { ! std::cout << "found." << std::endl; } ! std::cout << " Checking cbmlib_getBenchmarkByName... "; r->BenchByName=(cbmlib_internal_benchbyname_t) dlsym(r->library, "cbmlib_getBenchmarkByName"); if (!r->Bench) { dlclose(library); ! std::cout << "N.A." << std::endl; delete(r); return(0); } else { ! std::cout << "found." << std::endl; } r->package_id=package_id; --- 43,90 ---- 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_getBenchmarkNumber... "; r->Number=(cbmlib_internal_number_t) (dlsym(r->library, "cbmlib_getBenchmarkNumber")); if (!r->Number) { dlclose(library); ! if (UO_verbose) ! std::cout << "N.A." << std::endl; delete(r); return(0); } else { ! if (UO_verbose) ! std::cout << "found." << std::endl; } ! if (UO_verbose) ! std::cout << " Checking cbmlib_getBenchmark... "; r->Bench=(cbmlib_internal_bench_t) dlsym(r->library, "cbmlib_getBenchmark"); if (!r->Bench) { dlclose(library); ! if (UO_verbose) ! std::cout << "N.A." << std::endl; delete(r); return(0); } else { ! if (UO_verbose) ! std::cout << "found." << std::endl; } ! if (UO_verbose) ! std::cout << " Checking cbmlib_getBenchmarkByName... "; r->BenchByName=(cbmlib_internal_benchbyname_t) dlsym(r->library, "cbmlib_getBenchmarkByName"); if (!r->Bench) { dlclose(library); ! if (UO_verbose) ! std::cout << "N.A." << std::endl; delete(r); return(0); } else { ! if (UO_verbose) ! std::cout << "found." << std::endl; } r->package_id=package_id; *************** *** 77,81 **** return(r); } else { ! std::cout << "N.A." << std::endl; } return(0); --- 92,97 ---- return(r); } else { ! if (UO_verbose) ! std::cout << "N.A." << std::endl; } return(0); *************** *** 84,105 **** cbmlib_internal *cbmlib_load(char *package_id) { ! std::string local = "./Benchmark/.libs/libcompbenchmarks-"; ! cbmlib_internal *r; ! ! local+=package_id; ! local+=".so"; ! ! r=cbmlib_load_internal(local.c_str(), package_id); ! if (r) ! return(r); ! local=PREFIX; ! local+="/lib/libcompbenchmarks-"; ! local+=package_id; ! local+=".so"; ! r=cbmlib_load_internal(local.c_str(), package_id); ! ! return(r); } --- 100,120 ---- cbmlib_internal *cbmlib_load(char *package_id) { ! std::string tmp; ! cbmlib_internal *r = 0; ! int i; ! int n = cbmlib_paths.size(); ! for(i=0; i<n; i++) { ! tmp=cbmlib_paths[i]; ! tmp+="/libcompbenchmarks-"; ! tmp+=package_id; ! tmp+=".so"; ! r=cbmlib_load_internal(tmp.c_str(), package_id); ! if (r) { ! return(r); ! } ! } ! return(0); } Index: Benchmark-DLLoader.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-DLLoader.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Benchmark-DLLoader.h 1 Nov 2006 13:03:13 -0000 1.1 --- Benchmark-DLLoader.h 28 Dec 2006 13:18:55 -0000 1.2 *************** *** 13,16 **** --- 13,20 ---- #include <Benchmark/Benchmark.h> #include <dlfcn.h> + #include <vector> + + /** Paths to libraries */ + extern std::vector<std::string> cbmlib_paths; /** Function prototype for getting benchmark's number in a shared library */ *************** *** 21,25 **** typedef CBMBenchmark* (*cbmlib_internal_benchbyname_t)(char*, CBMSystem*); ! /** Internal benchmark's shared library object */ typedef struct cbmlib_internal { void *library; --- 25,29 ---- typedef CBMBenchmark* (*cbmlib_internal_benchbyname_t)(char*, CBMSystem*); ! /** Low-level internal benchmark's shared library object */ typedef struct cbmlib_internal { void *library; *************** *** 31,46 **** ! /** \brief Load a library 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 Gets a CBMBenchmark instance from a shared library. ! \param bench_id gzip-1c, benchpp-whetstone and so on. ! \param _system A system instance. */ CBMBenchmark *cbmlib_bench_load(char *bench_id, CBMSystem *_system); ! /** \brief Remove any internal existing reference to shared library. */ void cbmlib_done(void); --- 35,52 ---- ! /** \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. */ CBMBenchmark *cbmlib_bench_load(char *bench_id, CBMSystem *_system); ! /** \brief Low-level function for removing any internal existing reference to shared libraries. */ void cbmlib_done(void); |
|
From: Frederic T. <xf...@us...> - 2006-12-28 13:18:21
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18301 Modified Files: 00-CBMSystem-public.pl Log Message: Minor changes on reporting some specific failures. Index: 00-CBMSystem-public.pl =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/00-CBMSystem-public.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 00-CBMSystem-public.pl 28 Dec 2006 00:39:28 -0000 1.1 --- 00-CBMSystem-public.pl 28 Dec 2006 13:18:17 -0000 1.2 *************** *** 21,28 **** $sys->Chomp($t0); ! ok(CBM::c_str($t0) eq "test"); $sys->Chomp($t1); ! ok(CBM::c_str($t1) eq "test"); } --- 21,28 ---- $sys->Chomp($t0); ! ok(CBM::c_str($t0) eq "test", "'" . CBM::c_str($t0) . "' should return 'test'"); $sys->Chomp($t1); ! ok(CBM::c_str($t1) eq "test", "'" . CBM::c_str($t1) . "' should return 'test'"); } *************** *** 175,179 **** test_getLastCommandOutput(); - print ".... " . $sys->arch() . "\n"; - $sys->done(); --- 175,177 ---- |
|
From: Frederic T. <xf...@us...> - 2006-12-28 13:17:33
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17923 Modified Files: Makefile.am Log Message: New tests defined, LD_LIBRARY_PATH set. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 28 Dec 2006 00:39:28 -0000 1.1 --- Makefile.am 28 Dec 2006 13:17:30 -0000 1.2 *************** *** 1,8 **** ! prog_tests = 00-CBMSystem-public.pl 01-CBMSystem-protected.pl ! tests = $(top_srcdir)/CBM-PI/t/00-CBMSystem-public.pl \ ! $(top_srcdir)/CBM-PI/t/01-CBMSystem-protected.pl data_DATA = $(prog_tests) test: ! PERL_DL_NONLAZY=1 @CBM_PROG_PERL@ "-MExtUtils::Command::MM" "-e" "test_harness(0, '$(top_srcdir)/CBM-PI', '$(INST_ARCHLIB)')" $(tests) \ No newline at end of file --- 1,13 ---- ! prog_tests = 00-Glue.pl \ ! 00-CBMSystem-public.pl 01-CBMSystem-protected.pl \ ! 02-CBMBenchmarkSelector-public.pl ! ! tests = $(top_srcdir)/CBM-PI/t/00-Glue.pl \ ! $(top_srcdir)/CBM-PI/t/00-CBMSystem-public.pl \ ! $(top_srcdir)/CBM-PI/t/01-CBMSystem-protected.pl \ ! $(top_srcdir)/CBM-PI/t/02-CBMBenchmarkSelector-public.pl data_DATA = $(prog_tests) test: ! export LD_LIBRARY_PATH=../../.libs:$$LD_LIBRARY_PATH && PERL_DL_NONLAZY=1 @CBM_PROG_PERL@ "-MExtUtils::Command::MM" "-e" "test_harness(0, '$(top_srcdir)/CBM-PI', '$(INST_ARCHLIB)')" $(tests) \ No newline at end of file |
|
From: Frederic T. <xf...@us...> - 2006-12-28 13:16:53
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17551 Removed Files: Makefile.in Log Message: Useless. --- Makefile.in DELETED --- |
|
From: Frederic T. <xf...@us...> - 2006-12-28 13:16:28
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17508 Added Files: 00-Glue.pl 02-CBMBenchmarkSelector-public.pl Log Message: First import. --- NEW FILE: 00-Glue.pl --- #!/usr/bin/perl -w -I .. use strict; use CBM; use Test::Simple tests => 4; my $t0 = CBM::stringref(" test"); my $t1 = CBM::stringref(" test\n"); my $sys = CBM::Init(); ok(CBM::c_str($t0) eq " test"); ok(CBM::c_str($t1) eq " test\n"); $t1=$t0; ok(CBM::c_str($t0) eq " test"); ok(CBM::c_str($t1) eq " test"); $sys->done(); --- NEW FILE: 02-CBMBenchmarkSelector-public.pl --- #!/usr/bin/perl -w -I .. use strict; use CBM; use Test::More; my $top_srcdir = $0; $top_srcdir =~ s/(.+)\/.*/$1/; my @benchmarks = `cat $top_srcdir/../../Benchmark/benchmarks.list | grep -v '^#' | cut -f1 -d':'`; chomp(@benchmarks); plan tests => (@benchmarks+0)*5; my $sys; sub check_simple { my $str = shift; ok($str ne ""); if ($str =~ /\n/) { ok(0); } else { ok(1); } if ($str =~ /^ +(.*)/) { ok(0, "'$str' starts with space(s)"); } else { ok(1); } if ($str =~ / $/) { ok(0, "'$str' ends with space(s)"); } else { ok(1); } } $sys = CBM::Init(); my $BMS = CBM::CBMBenchmarkSelector->new($sys); my $b; foreach(@benchmarks) { $b = $BMS->select($_); ok(defined($b), "loading $_"); if (!defined($b)) { ok(0); ok(0); } my $s=$b->getStatus(); ok(defined($s), "status exists for $_"); ok(($s>=0) && ($s<=8), "valid status for $_ : '$s'"); my $pack = "$_"; $pack =~ s/^(.*?)-.+/$1/g; ok($pack eq $b->packageName(), "checking packageName() for $_"); } $sys->done(); |
|
From: Frederic T. <xf...@us...> - 2006-12-28 13:15:51
|
Update of /cvsroot/compbench/CompBenchmarks++/UI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17125 Modified Files: UI.cpp Log Message: No outputs if UO_verbose is 0. Index: UI.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/UI/UI.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** UI.cpp 2 Oct 2006 19:08:26 -0000 1.4 --- UI.cpp 28 Dec 2006 13:15:48 -0000 1.5 *************** *** 1,4 **** --- 1,5 ---- #include <UI/UI.h> #include <System/System.h> + #include <libcompbenchmarks.h> #include <iostream> *************** *** 26,29 **** --- 27,33 ---- std::string what; + if (!UO_verbose) + return(1); + switch(type) { case FileCreate: |
|
From: Frederic T. <xf...@us...> - 2006-12-28 13:15:13
|
Update of /cvsroot/compbench/CompBenchmarks++/System In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17008 Modified Files: System-Unix.cpp Log Message: copy() don't report errors if UO_verbose is 0. Index: System-Unix.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/System/System-Unix.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** System-Unix.cpp 11 Dec 2006 18:09:59 -0000 1.6 --- System-Unix.cpp 28 Dec 2006 13:15:07 -0000 1.7 *************** *** 1,3 **** --- 1,4 ---- #include <System/System-Unix.h> + #include <libcompbenchmarks.h> #include <UI/UI.h> *************** *** 35,38 **** --- 36,43 ---- cmd+=to; + if (! UO_verbose) { + cmd+=" 2> /dev/null"; + } + return(exec(cmd, sstdout)); } |
|
From: Frederic T. <xf...@us...> - 2006-12-28 13:14:34
|
Update of /cvsroot/compbench/CompBenchmarks++/System In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16711 Modified Files: System.cpp Log Message: init() also initialises the possible paths to benchmark's libraries. Index: System.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/System/System.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** System.cpp 28 Dec 2006 00:37:03 -0000 1.12 --- System.cpp 28 Dec 2006 13:14:30 -0000 1.13 *************** *** 22,29 **** --- 22,38 ---- CBMSystem::CBMSystem() { + std::string tmp; + cbmSystem=this; if (!UI) UI=new CBMUI; + + tmp=PREFIX; + tmp+="/lib"; + + cbmlib_paths.push_back(tmp); + cbmlib_paths.push_back("./Benchmark/.libs"); + cbmlib_paths.push_back("../../Benchmark/.libs"); } *************** *** 150,154 **** for(i=0;i<l;i++) { ! if (!((isspace((int) str[i])) && (sp))) { sp=0; dum+=str[i]; --- 159,163 ---- for(i=0;i<l;i++) { ! if ((!sp) || (!(isspace((int) str[i])))) { sp=0; dum+=str[i]; |
|
From: Frederic T. <xf...@us...> - 2006-12-28 00:41:47
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv32322 Modified Files: Makefile.am Log Message: New CBM-PI directory (providing the Perl interface to libcompbenchmarks). New 'test' target. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Makefile.am,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile.am 27 Nov 2006 17:23:17 -0000 1.12 --- Makefile.am 28 Dec 2006 00:41:43 -0000 1.13 *************** *** 1,3 **** ! SUBDIRS = share System Compiler Benchmark UI lib_LTLIBRARIES = libcompbenchmarks.la --- 1,3 ---- ! SUBDIRS = share System Compiler Benchmark UI CBM-PI lib_LTLIBRARIES = libcompbenchmarks.la *************** *** 38,39 **** --- 38,42 ---- install-exec-hook: cp compbenchmarks-ui-perl $(DESTDIR)$(bindir) + + test: + @CBM_PROG_MAKE@ -C CBM-PI test \ No newline at end of file |
|
From: Frederic T. <xf...@us...> - 2006-12-28 00:40:59
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv31940 Modified Files: configure.in Log Message: Checking for ctype.h New CBM-PI directory (Perl interface to libcompbenchmarks). Index: configure.in =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/configure.in,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** configure.in 27 Dec 2006 18:21:14 -0000 1.16 --- configure.in 28 Dec 2006 00:40:56 -0000 1.17 *************** *** 210,214 **** # Checks for header files. AC_HEADER_STDC ! AC_CHECK_HEADERS(string time.h stat.h types.h getopt.h dlfcn.h) # Checks for typedefs, structures, and compiler characteristics. --- 210,214 ---- # Checks for header files. AC_HEADER_STDC ! AC_CHECK_HEADERS(string time.h stat.h types.h getopt.h dlfcn.h ctype.h) # Checks for typedefs, structures, and compiler characteristics. *************** *** 252,255 **** --- 252,257 ---- top_srcdir=`cd $srcdir; pwd`; + AC_SUBST(CBM_PROG_PERL) + AC_SUBST(CXXFLAGS) AC_OUTPUT(share/Makefile *************** *** 263,266 **** --- 265,270 ---- Benchmark/Makefile UI/Makefile + CBM-PI/t/Makefile + CBM-PI/Makefile Makefile) |
|
From: Frederic T. <xf...@us...> - 2006-12-28 00:40:00
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv31524 Modified Files: config.h.in Log Message: Checking for ctype.h Index: config.h.in =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/config.h.in,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** config.h.in 12 Dec 2006 19:51:10 -0000 1.10 --- config.h.in 28 Dec 2006 00:39:57 -0000 1.11 *************** *** 70,73 **** --- 70,76 ---- #undef CBM_SYSTEM_LINUX + /* Define to 1 if you have the <ctype.h> header file. */ + #undef HAVE_CTYPE_H + /* Define to 1 if you have the <dlfcn.h> header file. */ #undef HAVE_DLFCN_H |
|
From: Frederic T. <xf...@us...> - 2006-12-28 00:39:32
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv31508 Added Files: 00-CBMSystem-public.pl 01-CBMSystem-protected.pl Makefile.am Makefile.in Log Message: First import. --- NEW FILE: Makefile.in --- # Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, # 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY, to the extent permitted by law; without # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. @SET_MAKE@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = CBM-PI/t DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(datadir)" dataDATA_INSTALL = $(INSTALL_DATA) DATA = $(data_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CBM_PROG_BZIP2 = @CBM_PROG_BZIP2@ CBM_PROG_CAT = @CBM_PROG_CAT@ CBM_PROG_CP = @CBM_PROG_CP@ CBM_PROG_CUT = @CBM_PROG_CUT@ CBM_PROG_DD = @CBM_PROG_DD@ CBM_PROG_DIALOG = @CBM_PROG_DIALOG@ CBM_PROG_GREP = @CBM_PROG_GREP@ CBM_PROG_GZIP = @CBM_PROG_GZIP@ CBM_PROG_HEAD = @CBM_PROG_HEAD@ CBM_PROG_MAKE = @CBM_PROG_MAKE@ CBM_PROG_MKDIR = @CBM_PROG_MKDIR@ CBM_PROG_PATCH = @CBM_PROG_PATCH@ CBM_PROG_PERL = @CBM_PROG_PERL@ CBM_PROG_RM = @CBM_PROG_RM@ CBM_PROG_TAIL = @CBM_PROG_TAIL@ CBM_PROG_TAR = @CBM_PROG_TAR@ CBM_PROG_UNZIP = @CBM_PROG_UNZIP@ CBM_PROG_WGET = @CBM_PROG_WGET@ CBM_PROG_ZCAT = @CBM_PROG_ZCAT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ prog_tests = 00-CBMSystem-public.pl 01-CBMSystem-protected.pl tests = $(top_srcdir)/CBM-PI/t/00-CBMSystem-public.pl \ $(top_srcdir)/CBM-PI/t/01-CBMSystem-protected.pl data_DATA = $(prog_tests) all: all-am .SUFFIXES: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ && exit 0; \ exit 1;; \ esac; \ done; \ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu CBM-PI/t/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu CBM-PI/t/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: -rm -f *.lo clean-libtool: -rm -rf .libs _libs install-dataDATA: $(data_DATA) @$(NORMAL_INSTALL) test -z "$(datadir)" || $(MKDIR_P) "$(DESTDIR)$(datadir)" @list='$(data_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \ $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \ done uninstall-dataDATA: @$(NORMAL_UNINSTALL) @list='$(data_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \ rm -f "$(DESTDIR)$(datadir)/$$f"; \ done tags: TAGS TAGS: ctags: CTAGS CTAGS: distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ dist_files=`for file in $$list; do echo $$file; done | \ sed -e "s|^$$srcdirstrip/||;t" \ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ case $$dist_files in \ */*) $(MKDIR_P) `echo "$$dist_files" | \ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ sort -u` ;; \ esac; \ for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ || exit 1; \ fi; \ done check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: for dir in "$(DESTDIR)$(datadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am install-data: install-data-am uninstall: uninstall-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am -rm -f Makefile distclean-am: clean-am distclean-generic dvi: dvi-am dvi-am: html: html-am info: info-am info-am: install-data-am: install-dataDATA install-dvi: install-dvi-am install-exec-am: install-html: install-html-am install-info: install-info-am install-man: install-pdf: install-pdf-am install-ps: install-ps-am installcheck-am: maintainer-clean: maintainer-clean-am -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic mostlyclean-libtool pdf: pdf-am pdf-am: ps: ps-am ps-am: uninstall-am: uninstall-dataDATA .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ install-data install-data-am install-dataDATA install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ uninstall uninstall-am uninstall-dataDATA test: PERL_DL_NONLAZY=1 @CBM_PROG_PERL@ "-MExtUtils::Command::MM" "-e" "test_harness(0, '$(top_srcdir)/CBM-PI', '$(INST_ARCHLIB)')" $(tests) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --- NEW FILE: 00-CBMSystem-public.pl --- #!/usr/bin/perl -w -I .. use strict; use CBM; use Test::Simple tests => 34; my $sys; my $top_srcdir = $0; $top_srcdir =~ s/(.+)\/.*/$1/; sub test_Split { ok($sys->Split("a\nb", "\n", 0) eq "a"); ok(!defined($sys->Split("a\n\nb", "\n", 1))); ok($sys->Split("a\nb", "\n", 1) eq "b"); ok($sys->Split("a\nb\n", "\n", 1) eq "b"); } sub test_Chomp { my $t0 = CBM::stringref(" test"); my $t1 = CBM::stringref(" test\n"); $sys->Chomp($t0); ok(CBM::c_str($t0) eq "test"); $sys->Chomp($t1); ok(CBM::c_str($t1) eq "test"); } sub test_Exec { my $cmd = CBM::stringref("echo Ok"); my $out = CBM::stringref(""); $sys->exec($cmd, $out); ok(CBM::c_str($out) eq "Ok\n"); } sub test_md5 { my $data = CBM::stringref("xYz012489787854A"); ok($sys->md5($data) eq "1003e694a238d54c400eb13eb6731503"); } sub test_md5File { my $dum = "$top_srcdir/reference/CBMSystem-copy.data"; my $ref = CBM::stringref("$dum"); ok($sys->md5File($ref) eq "654c4567bea6cba27c2bc123b8258319"); } # !!! TODO sub test_download { } sub test_copy { my $dum = "$top_srcdir/reference/CBMSystem-copy.data"; my $cmd = CBM::stringref("rm -rf $dum.2"); my $out = CBM::stringref(""); ok($sys->copy("no-such-file", "neither-that") eq 256); ok($sys->copy("$dum", "$dum.2") eq 0); ok($sys->exec($cmd, $out) eq 0); } sub test_mkdir { my $dum = "$top_srcdir/reference/CBMSystem-mkdir.test"; my $cmd = CBM::stringref("rm -rf $dum"); my $out = CBM::stringref(""); $sys->exec($cmd, $out); ok($sys->mkdir("$dum") eq 1); ok($sys->mkdir("$dum") eq 0); ok($sys->exec($cmd, $out) eq 0); } sub test_checkDirectory { my $dum = "$top_srcdir/reference/CBMSystem-mkdir.test"; my $cmd = CBM::stringref("rm -rf $dum"); my $out = CBM::stringref(""); $sys->exec($cmd, $out); ok($sys->checkDirectory($dum) eq 0); $sys->mkdir("$dum"); ok($sys->checkDirectory($dum) eq 1); $sys->exec($cmd, $out); } # !!! TODO sub test_temporaryDirectory { } sub test_unlink { my $dum = "$top_srcdir/reference/CBMSystem-unlink.test"; my $cmd = CBM::stringref("echo 1 > $dum"); my $out = CBM::stringref(""); ok($sys->unlink($dum) eq 0); $sys->exec($cmd, $out); ok($sys->unlink($dum) eq 1); ok($sys->unlink($dum) eq 0); } sub test_store { ok($sys->store("compbenchmarks-testsuite.K0", "x") eq 1); ok($sys->store("compbenchmarks-testsuite.K1", "1") eq 1); } sub test_read { ok($sys->read("compbenchmarks-testsuite.K0") eq "x"); ok($sys->read("compbenchmarks-testsuite.K1") eq "1"); ok($sys->store("compbenchmarks-testsuite.K0", "y") eq 1); ok($sys->store("compbenchmarks-testsuite.K1", "2") eq 1); ok($sys->read("compbenchmarks-testsuite.K0") eq "y"); ok($sys->read("compbenchmarks-testsuite.K1") eq "2"); } sub test_fileExists { my $dum = "$top_srcdir/reference/CBMSystem-copy.data"; ok($sys->fileExists($dum) eq 1); ok($sys->fileExists("$dum.2") eq 0); } # !!! TODO sub test_Time { } sub test_getLastCommand { my $cmd0 = CBM::stringref("echo 1"); my $out0 = CBM::stringref(""); my $cmd1 = CBM::stringref("echo 0"); my $out1 = CBM::stringref(""); $sys->exec($cmd0, $out0); ok(CBM::c_str($sys->getLastCommand()) eq "echo 1"); $sys->exec($cmd1, $out1); ok(CBM::c_str($sys->getLastCommand()) eq "echo 0"); } sub test_getLastCommandOutput { my $cmd0 = CBM::stringref("echo 1"); my $out0 = CBM::stringref(""); my $cmd1 = CBM::stringref("echo 0"); my $out1 = CBM::stringref(""); $sys->exec($cmd0, $out0); ok(CBM::c_str($sys->getLastCommandOutput()) eq "1\n"); $sys->exec($cmd1, $out1); ok(CBM::c_str($sys->getLastCommandOutput()) eq "0\n"); } $sys = CBM::Init(); test_Split(); test_Chomp(); test_Exec(); test_md5(); test_md5File(); test_download(); test_copy(); test_mkdir(); test_checkDirectory(); test_temporaryDirectory(); test_unlink(); test_store(); test_read(); test_fileExists(); test_Time(); test_getLastCommand(); test_getLastCommandOutput(); print ".... " . $sys->arch() . "\n"; $sys->done(); --- NEW FILE: Makefile.am --- prog_tests = 00-CBMSystem-public.pl 01-CBMSystem-protected.pl tests = $(top_srcdir)/CBM-PI/t/00-CBMSystem-public.pl \ $(top_srcdir)/CBM-PI/t/01-CBMSystem-protected.pl data_DATA = $(prog_tests) test: PERL_DL_NONLAZY=1 @CBM_PROG_PERL@ "-MExtUtils::Command::MM" "-e" "test_harness(0, '$(top_srcdir)/CBM-PI', '$(INST_ARCHLIB)')" $(tests) --- NEW FILE: 01-CBMSystem-protected.pl --- #!/usr/bin/perl -w -I .. use strict; use CBM; use Test::Simple tests => 40; my $sys; my $top_srcdir = $0; $top_srcdir =~ s/(.+)\/.*/$1/; sub check_simple { my $str = shift; ok($str ne ""); if ($str =~ /\n/) { ok(0); } else { ok(1); } if ($str =~ /^ +(.*)/) { ok(0, "'$str' starts with space(s)"); } else { ok(1); } if ($str =~ / $/) { ok(0, "'$str' ends with space(s)"); } else { ok(1); } } # !!! TODO ??? sub test_exec0 { my $r0 = CBM::stringref("exit 0"); my $r1 = CBM::stringref("exit 1"); my $r2 = CBM::stringref("exit 232"); # ok($sys->exec0($r0) eq 0); # ok($sys->exec0($r1) eq 1); # ok($sys->exec0($r2) eq 232); } sub test_arch { my $arch = $sys->arch(); check_simple($arch); } sub test_hostid { my $id = $sys->hostid(); check_simple($id); ok(length($id) == 8); } sub test_hostname { my $host = $sys->hostname(); check_simple($host); } sub test_os { my $os = $sys->os(); check_simple($os); } sub test_os_version { my $ver = $sys->os_version(); check_simple($ver); } sub test_processor_name { my $proc = $sys->processor_name(); check_simple($proc); } sub test_processor_mhz { my $mhz = $sys->processor_mhz(); check_simple($mhz); ok($mhz > 1); } sub test_processor_cache { my $cache = $sys->processor_cache(); check_simple($cache); ok($cache > 1); } sub test_processor_number { my $num = $sys->processor_number(); check_simple($num); ok($num >= 1); } $sys = CBM::Init(); test_exec0(); test_arch(); test_hostid(); test_hostname(); test_os(); test_os_version(); test_processor_name(); test_processor_mhz(); test_processor_cache(); test_processor_number(); $sys->done(); |
|
From: Frederic T. <xf...@us...> - 2006-12-28 00:39:07
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/reference In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv31349 Added Files: CBMSystem-copy.data Log Message: First import. --- NEW FILE: CBMSystem-copy.data --- xYz |
|
From: Frederic T. <xf...@us...> - 2006-12-28 00:38:42
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/reference In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv31065/reference Log Message: Directory /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/reference added to the repository |
|
From: Frederic T. <xf...@us...> - 2006-12-28 00:38:29
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv31053/t Log Message: Directory /cvsroot/compbench/CompBenchmarks++/CBM-PI/t added to the repository |
|
From: Frederic T. <xf...@us...> - 2006-12-28 00:38:19
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv31033 Added Files: CBM.i CBM.pm CBM_wrap.cxx Glue.cpp Glue.h Makefile.am Log Message: First import. --- NEW FILE: CBM.pm --- # This file was created automatically by SWIG 1.3.28. # Don't modify this file, modify the SWIG interface instead. package CBM; require Exporter; require DynaLoader; @ISA = qw(Exporter DynaLoader); package CBMc; bootstrap CBM; package CBM; @EXPORT = qw( ); # ---------- BASE METHODS ------------- package CBM; sub TIEHASH { my ($classname,$obj) = @_; return bless $obj, $classname; } sub CLEAR { } sub FIRSTKEY { } sub NEXTKEY { } sub FETCH { my ($self,$field) = @_; my $member_func = "swig_${field}_get"; $self->$member_func(); } sub STORE { my ($self,$field,$newval) = @_; my $member_func = "swig_${field}_set"; $self->$member_func($newval); } sub this { my $ptr = shift; return tied(%$ptr); } # ------- FUNCTION WRAPPERS -------- package CBM; *Init = *CBMc::Init; *stringref = *CBMc::stringref; *c_str = *CBMc::c_str; ############# Class : CBM::CBMSystem ############## package CBM::CBMSystem; use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); @ISA = qw( CBM ); %OWNER = (); *Root = *CBMc::CBMSystem_Root; *HostDep = *CBMc::CBMSystem_HostDep; *Extract = *CBMc::CBMSystem_Extract; *Patches = *CBMc::CBMSystem_Patches; *System = *CBMc::CBMSystem_System; *Download = *CBMc::CBMSystem_Download; *Status = *CBMc::CBMSystem_Status; *Configuration = *CBMc::CBMSystem_Configuration; *init = *CBMc::CBMSystem_init; *Split = *CBMc::CBMSystem_Split; *Chomp = *CBMc::CBMSystem_Chomp; *display = *CBMc::CBMSystem_display; *displayPrograms = *CBMc::CBMSystem_displayPrograms; *exec = *CBMc::CBMSystem_exec; *md5 = *CBMc::CBMSystem_md5; *md5File = *CBMc::CBMSystem_md5File; *download = *CBMc::CBMSystem_download; *copy = *CBMc::CBMSystem_copy; *mkdir = *CBMc::CBMSystem_mkdir; *checkDirectory = *CBMc::CBMSystem_checkDirectory; *temporaryDirectory = *CBMc::CBMSystem_temporaryDirectory; *unlink = *CBMc::CBMSystem_unlink; *store = *CBMc::CBMSystem_store; *read = *CBMc::CBMSystem_read; *fileExists = *CBMc::CBMSystem_fileExists; *Time = *CBMc::CBMSystem_Time; *done = *CBMc::CBMSystem_done; *getLastCommand = *CBMc::CBMSystem_getLastCommand; *getLastCommandOutput = *CBMc::CBMSystem_getLastCommandOutput; 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::CBMSystemUnix ############## package CBM::CBMSystemUnix; use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); @ISA = qw( CBM::CBMSystem CBM ); %OWNER = (); %ITERATORS = (); *copy = *CBMc::CBMSystemUnix_copy; *mkdir = *CBMc::CBMSystemUnix_mkdir; *checkDirectory = *CBMc::CBMSystemUnix_checkDirectory; *arch = *CBMc::CBMSystemUnix_arch; *hostid = *CBMc::CBMSystemUnix_hostid; *hostname = *CBMc::CBMSystemUnix_hostname; *os = *CBMc::CBMSystemUnix_os; *os_version = *CBMc::CBMSystemUnix_os_version; *unlink = *CBMc::CBMSystemUnix_unlink; sub DESTROY { return unless $_[0]->isa('HASH'); my $self = tied(%{$_[0]}); return unless defined $self; delete $ITERATORS{$self}; if (exists $OWNER{$self}) { CBMc::delete_CBMSystemUnix($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::CBMSystemLinux ############## package CBM::CBMSystemLinux; use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); @ISA = qw( CBM::CBMSystemUnix CBM ); %OWNER = (); %ITERATORS = (); sub new { my $pkg = shift; my $self = CBMc::new_CBMSystemLinux(@_); bless $self, $pkg if defined($self); } *processor_name = *CBMc::CBMSystemLinux_processor_name; *processor_mhz = *CBMc::CBMSystemLinux_processor_mhz; *processor_cache = *CBMc::CBMSystemLinux_processor_cache; *processor_number = *CBMc::CBMSystemLinux_processor_number; sub DESTROY { return unless $_[0]->isa('HASH'); my $self = tied(%{$_[0]}); return unless defined $self; delete $ITERATORS{$self}; if (exists $OWNER{$self}) { CBMc::delete_CBMSystemLinux($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::CBMBenchmark ############## package CBM::CBMBenchmark; use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); @ISA = qw( CBM ); %OWNER = (); %ITERATORS = (); *Unknown = *CBMc::CBMBenchmark_Unknown; *Downloaded = *CBMc::CBMBenchmark_Downloaded; *Extracted = *CBMc::CBMBenchmark_Extracted; *Patched = *CBMc::CBMBenchmark_Patched; *Preconfigured = *CBMc::CBMBenchmark_Preconfigured; *Configured = *CBMc::CBMBenchmark_Configured; *Made = *CBMc::CBMBenchmark_Made; *Tested = *CBMc::CBMBenchmark_Tested; *Benchmarked = *CBMc::CBMBenchmark_Benchmarked; *downloadURL = *CBMc::CBMBenchmark_downloadURL; *display = *CBMc::CBMBenchmark_display; *benchmarkSize = *CBMc::CBMBenchmark_benchmarkSize; *ContextMatches = *CBMc::CBMBenchmark_ContextMatches; *Download = *CBMc::CBMBenchmark_Download; *Extract = *CBMc::CBMBenchmark_Extract; *Patch = *CBMc::CBMBenchmark_Patch; *PreConfigure = *CBMc::CBMBenchmark_PreConfigure; *Configure = *CBMc::CBMBenchmark_Configure; *Make = *CBMc::CBMBenchmark_Make; *Test = *CBMc::CBMBenchmark_Test; *Bench = *CBMc::CBMBenchmark_Bench; *Release = *CBMc::CBMBenchmark_Release; *Install = *CBMc::CBMBenchmark_Install; *Fetch = *CBMc::CBMBenchmark_Fetch; *Uninstall = *CBMc::CBMBenchmark_Uninstall; *getStatus = *CBMc::CBMBenchmark_getStatus; sub DESTROY { return unless $_[0]->isa('HASH'); my $self = tied(%{$_[0]}); return unless defined $self; delete $ITERATORS{$self}; if (exists $OWNER{$self}) { CBMc::delete_CBMBenchmark($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::CBMBenchmarkSelector ############## package CBM::CBMBenchmarkSelector; use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); @ISA = qw( CBM ); %OWNER = (); %ITERATORS = (); sub new { my $pkg = shift; my $self = CBMc::new_CBMBenchmarkSelector(@_); bless $self, $pkg if defined($self); } *select = *CBMc::CBMBenchmarkSelector_select; *displayList = *CBMc::CBMBenchmarkSelector_displayList; sub DESTROY { return unless $_[0]->isa('HASH'); my $self = tied(%{$_[0]}); return unless defined $self; delete $ITERATORS{$self}; if (exists $OWNER{$self}) { CBMc::delete_CBMBenchmarkSelector($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::CBMCompiler ############## package CBM::CBMCompiler; use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); @ISA = qw( CBM ); %OWNER = (); %ITERATORS = (); *display = *CBMc::CBMCompiler_display; *compiler = *CBMc::CBMCompiler_compiler; *compilerName = *CBMc::CBMCompiler_compilerName; *compilerVersion = *CBMc::CBMCompiler_compilerVersion; *Binary = *CBMc::CBMCompiler_Binary; *language = *CBMc::CBMCompiler_language; sub DESTROY { return unless $_[0]->isa('HASH'); my $self = tied(%{$_[0]}); return unless defined $self; delete $ITERATORS{$self}; if (exists $OWNER{$self}) { CBMc::delete_CBMCompiler($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::CBMCompilerSelector ############## package CBM::CBMCompilerSelector; use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); @ISA = qw( CBM ); %OWNER = (); %ITERATORS = (); sub new { my $pkg = shift; my $self = CBMc::new_CBMCompilerSelector(@_); bless $self, $pkg if defined($self); } *select = *CBMc::CBMCompilerSelector_select; sub DESTROY { return unless $_[0]->isa('HASH'); my $self = tied(%{$_[0]}); return unless defined $self; delete $ITERATORS{$self}; if (exists $OWNER{$self}) { CBMc::delete_CBMCompilerSelector($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; } # ------- VARIABLE STUBS -------- package CBM; *CBM_PROG_BZIP2 = *CBMc::CBM_PROG_BZIP2; *CBM_PROG_CAT = *CBMc::CBM_PROG_CAT; *CBM_PROG_CP = *CBMc::CBM_PROG_CP; *CBM_PROG_CUT = *CBMc::CBM_PROG_CUT; *CBM_PROG_DD = *CBMc::CBM_PROG_DD; *CBM_PROG_DIALOG = *CBMc::CBM_PROG_DIALOG; *CBM_PROG_GREP = *CBMc::CBM_PROG_GREP; *CBM_PROG_GZIP = *CBMc::CBM_PROG_GZIP; *CBM_PROG_HEAD = *CBMc::CBM_PROG_HEAD; *CBM_PROG_MAKE = *CBMc::CBM_PROG_MAKE; *CBM_PROG_MKDIR = *CBMc::CBM_PROG_MKDIR; *CBM_PROG_PATCH = *CBMc::CBM_PROG_PATCH; *CBM_PROG_PERL = *CBMc::CBM_PROG_PERL; *CBM_PROG_RM = *CBMc::CBM_PROG_RM; *CBM_PROG_TAIL = *CBMc::CBM_PROG_TAIL; *CBM_PROG_TAR = *CBMc::CBM_PROG_TAR; *CBM_PROG_UNZIP = *CBMc::CBM_PROG_UNZIP; *CBM_PROG_WGET = *CBMc::CBM_PROG_WGET; *CBM_PROG_ZCAT = *CBMc::CBM_PROG_ZCAT; *CBM_SYSTEM_CYGWIN = *CBMc::CBM_SYSTEM_CYGWIN; *CBM_SYSTEM_FREEBSD = *CBMc::CBM_SYSTEM_FREEBSD; *CBM_SYSTEM_LINUX = *CBMc::CBM_SYSTEM_LINUX; *HAVE_DLFCN_H = *CBMc::HAVE_DLFCN_H; *HAVE_GETOPT_H = *CBMc::HAVE_GETOPT_H; *HAVE_INTTYPES_H = *CBMc::HAVE_INTTYPES_H; *HAVE_LIBDL = *CBMc::HAVE_LIBDL; *HAVE_MEMORY_H = *CBMc::HAVE_MEMORY_H; *HAVE_STDINT_H = *CBMc::HAVE_STDINT_H; *HAVE_STDLIB_H = *CBMc::HAVE_STDLIB_H; *HAVE_STRINGS_H = *CBMc::HAVE_STRINGS_H; *HAVE_STRING_H = *CBMc::HAVE_STRING_H; *HAVE_SYS_STAT_H = *CBMc::HAVE_SYS_STAT_H; *HAVE_SYS_TYPES_H = *CBMc::HAVE_SYS_TYPES_H; *HAVE_TIME_H = *CBMc::HAVE_TIME_H; *HAVE_UNISTD_H = *CBMc::HAVE_UNISTD_H; *PACKAGE = *CBMc::PACKAGE; *PACKAGE_BUGREPORT = *CBMc::PACKAGE_BUGREPORT; *PACKAGE_NAME = *CBMc::PACKAGE_NAME; *PACKAGE_STRING = *CBMc::PACKAGE_STRING; *PACKAGE_TARNAME = *CBMc::PACKAGE_TARNAME; *PACKAGE_VERSION = *CBMc::PACKAGE_VERSION; *PREFIX = *CBMc::PREFIX; *STDC_HEADERS = *CBMc::STDC_HEADERS; *VERSION = *CBMc::VERSION; my %__cbmSystem_hash; tie %__cbmSystem_hash,"CBM::CBMSystem", $CBMc::cbmSystem; $cbmSystem= \%__cbmSystem_hash; bless $cbmSystem, CBM::CBMSystem; 1; --- NEW FILE: Glue.cpp --- /* ---------------------------------------------------------------------------- $Id: Glue.cpp,v 1.1 2006/12/28 00:38:14 xfred Exp $ Description : Missing declaration for CBM Perl module. This is free software. For details, see the GNU Public License in the COPYING file, or Look http://www.fsf.org ------------------------------------------------------------------------- */ #include <Glue.h> CBM_SYSTEM *sys; CBM_SYSTEM *Init(void) { sys = new CBM_SYSTEM; sys->init(); return(sys); } std::string & stringref(char *str) { std::string *dum = new std::string(str); return(*dum); } char *c_str(std::string &str) { return((char*) str.c_str()); } --- NEW FILE: CBM_wrap.cxx --- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). * Version 1.3.28 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make * changes to this file unless you know what you are doing--modify the SWIG * interface file instead. * ----------------------------------------------------------------------------- */ #define SWIGPERL #define SWIG_CASTRANK_MODE #ifdef __cplusplus template<class T> class SwigValueWrapper { T *tt; public: SwigValueWrapper() : tt(0) { } SwigValueWrapper(const SwigValueWrapper<T>& rhs) : tt(new T(*rhs.tt)) { } [...5868 lines suppressed...] SvREADONLY_on(sv); } while(0) /*@SWIG@*/; /*@SWIG:%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CBMBenchmark_Tested", TRUE | 0x2); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast<int >(CBMBenchmark::Tested))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; /*@SWIG:%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CBMBenchmark_Benchmarked", TRUE | 0x2); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast<int >(CBMBenchmark::Benchmarked))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; SWIG_TypeClientData(SWIGTYPE_p_CBMBenchmark, (void*) "CBM::CBMBenchmark"); SWIG_TypeClientData(SWIGTYPE_p_CBMBenchmarkSelector, (void*) "CBM::CBMBenchmarkSelector"); SWIG_TypeClientData(SWIGTYPE_p_CBMCompiler, (void*) "CBM::CBMCompiler"); SWIG_TypeClientData(SWIGTYPE_p_CBMCompilerSelector, (void*) "CBM::CBMCompilerSelector"); ST(0) = &PL_sv_yes; XSRETURN(1); } --- NEW FILE: CBM.i --- %include std_string.i %module CBM %{ #include "Glue.h" %} %module CBMSystem %{ #include "System/System.h" %} %module CBMSystemUnix %{ #include "System/System-Unix.h" %} %module CBMSystemLinux %{ #include "System/System-Linux.h" %} %module CBMBenchmark %{ #include "Benchmark/Benchmark.h" %} %module CBMBenchmarkSelector %{ #include "Benchmark/Benchmark-Selector.h" %} %module CBMCompiler %{ #include "Compiler/Compiler.h" %} %include "config.h" %include "System/System.h" %include "System/System-Unix.h" %include "System/System-Linux.h" %include "Benchmark/Benchmark.h" %include "Benchmark/Benchmark-Selector.h" %include "Compiler/Compiler.h" %include "Glue.h" --- NEW FILE: Makefile.am --- SUBDIRS = t INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/CBM-PI -I.. -I. # LDFLAGS = -L../testing/.libs -lcompbenchmarks PERL = @CBM_PROG_PERL@ data_DATA = $(top_srcdir)/CBM-PI/CBM.pm Glue.o: $(top_srcdir)/CBM-PI/Glue.cpp $(CXX) $(INCLUDES) -c $< -o $@ CBM.pm: CBM.i swig -c++ $(INCLUDES) -shadow -Wall -perl $< CBM.o: CBM.pm $(CXX) $(INCLUDES) -c $(top_srcdir)/CBM-PI/CBM_wrap.cxx `$(PERL) -MExtUtils::Embed -e ccopts` CBM.so: CBM.o Glue.o ld -G CBM_wrap.o Glue.o -o CBM.so -L ../.libs -lcompbenchmarks test: @CBM_PROG_MAKE@ -C t test all-local: CBM.so clean-local: rm -rf *.pm *.i~ *.cxx *.so *.o *.cpp~ *.h~ Makefile~ --- NEW FILE: Glue.h --- /* ---------------------------------------------------------------------------- $Id: Glue.h,v 1.1 2006/12/28 00:38:14 xfred Exp $ Description : Missing declaration for CBM Perl module. This is free software. For details, see the GNU Public License in the COPYING file, or Look http://www.fsf.org ------------------------------------------------------------------------- */ #ifndef H_CBM_PI_GLUE #define H_CBM_PI_GLUE #include <libcompbenchmarks.h> extern CBM_SYSTEM *Init(void); extern std::string & stringref(char *str); extern char *c_str(std::string &str); #endif |
