compbench-devel Mailing List for CompBenchmarks (Page 25)
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...> - 2007-02-05 20:04:18
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20411 Modified Files: Makefile.am Log Message: Dependency on Result.h Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Makefile.am,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Makefile.am 26 Jan 2007 13:03:04 -0000 1.13 --- Makefile.am 5 Feb 2007 20:04:13 -0000 1.14 *************** *** 22,25 **** --- 22,26 ---- $(top_srcdir)/libcompbenchmarks/Base/XMLReader.h \ $(top_srcdir)/libcompbenchmarks/Base/Config.h \ + $(top_srcdir)/libcompbenchmarks/Base/Result.h \ $(top_srcdir)/libcompbenchmarks/Plan/Plan.h \ $(top_srcdir)/CBM-PI/Glue.h |
|
From: Frederic T. <xf...@us...> - 2007-02-05 20:03:45
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20027 Modified Files: CBM.i CBM.pm CBM_wrap.cxx Log Message: API changes. Index: CBM.pm =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM.pm,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** CBM.pm 30 Jan 2007 20:03:34 -0000 1.17 --- CBM.pm 5 Feb 2007 20:03:22 -0000 1.18 *************** *** 73,78 **** *hasPatch = *CBMc::Package_hasPatch; *resetContext = *CBMc::Package_resetContext; - *display = *CBMc::Package_display; - *displayBenchmarks = *CBMc::Package_displayBenchmarks; *System = *CBMc::Package_System; *Benchmarks = *CBMc::Package_Benchmarks; --- 73,76 ---- *************** *** 141,145 **** %ITERATORS = (); *Package = *CBMc::Benchmark_Package; - *display = *CBMc::Benchmark_display; *Name = *CBMc::Benchmark_Name; *Comments = *CBMc::Benchmark_Comments; --- 139,142 ---- *************** *** 350,353 **** --- 347,393 ---- + ############# Class : CBM::Result ############## + + package CBM::Result; + use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); + @ISA = qw( CBM ); + %OWNER = (); + %ITERATORS = (); + sub new { + my $pkg = shift; + my $self = CBMc::new_Result(@_); + bless $self, $pkg if defined($self); + } + + *Value = *CBMc::Result_Value; + *compilationTime = *CBMc::Result_compilationTime; + *executionTime = *CBMc::Result_executionTime; + *tested = *CBMc::Result_tested; + *testOk = *CBMc::Result_testOk; + *resultNode = *CBMc::Result_resultNode; + sub DESTROY { + return unless $_[0]->isa('HASH'); + my $self = tied(%{$_[0]}); + return unless defined $self; + delete $ITERATORS{$self}; + if (exists $OWNER{$self}) { + CBMc::delete_Result($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 ############## *************** *** 381,386 **** *Package = *CBMc::System_Package; *Benchmark = *CBMc::System_Benchmark; - *displayAllPackages = *CBMc::System_displayAllPackages; - *displayAllBenchmarks = *CBMc::System_displayAllBenchmarks; *Split = *CBMc::System_Split; *Chomp = *CBMc::System_Chomp; --- 421,424 ---- *************** *** 560,563 **** --- 598,602 ---- *H_XMLREADER = *CBMc::H_XMLREADER; *H_CBMCONFIG = *CBMc::H_CBMCONFIG; + *H_CBMRESULT = *CBMc::H_CBMRESULT; my %__cbmSystem_hash; Index: CBM_wrap.cxx =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM_wrap.cxx,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** CBM_wrap.cxx 30 Jan 2007 20:03:34 -0000 1.17 --- CBM_wrap.cxx 5 Feb 2007 20:03:22 -0000 1.18 *************** *** 1433,1449 **** #define SWIGTYPE_p_CBM__Package swig_types[4] #define SWIGTYPE_p_CBM__Plan swig_types[5] ! #define SWIGTYPE_p_CBM__System swig_types[6] ! #define SWIGTYPE_p_CBM__XMLAttribute swig_types[7] ! #define SWIGTYPE_p_CBM__XMLNode swig_types[8] ! #define SWIGTYPE_p_CBM__XMLReader swig_types[9] ! #define SWIGTYPE_p_Compiler swig_types[10] ! #define SWIGTYPE_p_CompilerOptions swig_types[11] ! #define SWIGTYPE_p_XMLNode swig_types[12] ! #define SWIGTYPE_p_char swig_types[13] ! #define SWIGTYPE_p_std__string swig_types[14] ! #define SWIGTYPE_p_std__vectorTstd__string_t swig_types[15] ! #define SWIGTYPE_p_time_t swig_types[16] ! static swig_type_info *swig_types[18]; ! static swig_module_info swig_module = {swig_types, 17, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) --- 1433,1450 ---- #define SWIGTYPE_p_CBM__Package swig_types[4] #define SWIGTYPE_p_CBM__Plan swig_types[5] ! #define SWIGTYPE_p_CBM__Result swig_types[6] ! #define SWIGTYPE_p_CBM__System swig_types[7] ! #define SWIGTYPE_p_CBM__XMLAttribute swig_types[8] ! #define SWIGTYPE_p_CBM__XMLNode swig_types[9] ! #define SWIGTYPE_p_CBM__XMLReader swig_types[10] ! #define SWIGTYPE_p_Compiler swig_types[11] ! #define SWIGTYPE_p_CompilerOptions swig_types[12] ! #define SWIGTYPE_p_XMLNode swig_types[13] ! #define SWIGTYPE_p_char swig_types[14] ! #define SWIGTYPE_p_std__string swig_types[15] ! #define SWIGTYPE_p_std__vectorTstd__string_t swig_types[16] ! #define SWIGTYPE_p_time_t swig_types[17] ! static swig_type_info *swig_types[19]; ! static swig_module_info swig_module = {swig_types, 18, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) *************** *** 1524,1527 **** --- 1525,1529 ---- #include "Base/XMLReader.h" #include "Base/Config.h" + #include "Base/Result.h" #include "Plan/Plan.h" using namespace CBM; *************** *** 2117,2174 **** - XS(_wrap_Package_display) { - { - CBM::Package *arg1 = (CBM::Package *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - int argvi = 0; - dXSARGS; - - if ((items < 1) || (items > 1)) { - SWIG_croak("Usage: Package_display(self);"); - } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Package, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Package_display" "', argument " "1"" of type '" "CBM::Package *""'"); - } - arg1 = reinterpret_cast< CBM::Package * >(argp1); - (arg1)->display(); - - - XSRETURN(argvi); - fail: - - SWIG_croak_null(); - } - } - - - XS(_wrap_Package_displayBenchmarks) { - { - CBM::Package *arg1 = (CBM::Package *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - int argvi = 0; - dXSARGS; - - if ((items < 1) || (items > 1)) { - SWIG_croak("Usage: Package_displayBenchmarks(self);"); - } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Package, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Package_displayBenchmarks" "', argument " "1"" of type '" "CBM::Package *""'"); - } - arg1 = reinterpret_cast< CBM::Package * >(argp1); - (arg1)->displayBenchmarks(); - - - XSRETURN(argvi); - fail: - - SWIG_croak_null(); - } - } - - XS(_wrap_Package_System) { { --- 2119,2122 ---- *************** *** 4280,4310 **** - XS(_wrap_Benchmark_display) { - { - CBM::Benchmark *arg1 = (CBM::Benchmark *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - int argvi = 0; - dXSARGS; - - if ((items < 1) || (items > 1)) { - SWIG_croak("Usage: Benchmark_display(self);"); - } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Benchmark, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Benchmark_display" "', argument " "1"" of type '" "CBM::Benchmark *""'"); - } - arg1 = reinterpret_cast< CBM::Benchmark * >(argp1); - (arg1)->display(); - - - XSRETURN(argvi); - fail: - - SWIG_croak_null(); - } - } - - XS(_wrap_Benchmark_Name) { { --- 4228,4231 ---- *************** *** 6804,6807 **** --- 6725,7123 ---- + XS(_wrap_new_Result__SWIG_0) { + { + std::string arg1 ; + std::string arg2 ; + std::string arg3 ; + std::string arg4 ; + std::string arg5 ; + CBM::Result *result = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 5) || (items > 5)) { + SWIG_croak("Usage: new_Result(_value,_compilationTime,_executionTime,_tested,_testOk);"); + } + { + std::string *ptr = (std::string *)0; + int res = SWIG_AsPtr_std_string SWIG_PERL_CALL_ARGS_2(ST(0), &ptr); + if (!SWIG_IsOK(res) || !ptr) { + SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_Result" "', argument " "1"" of type '" "std::string""'"); + } + arg1 = *ptr; + if (SWIG_IsNewObj(res)) delete ptr; + } + { + std::string *ptr = (std::string *)0; + int res = SWIG_AsPtr_std_string SWIG_PERL_CALL_ARGS_2(ST(1), &ptr); + if (!SWIG_IsOK(res) || !ptr) { + SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_Result" "', argument " "2"" of type '" "std::string""'"); + } + arg2 = *ptr; + if (SWIG_IsNewObj(res)) delete ptr; + } + { + std::string *ptr = (std::string *)0; + int res = SWIG_AsPtr_std_string SWIG_PERL_CALL_ARGS_2(ST(2), &ptr); + if (!SWIG_IsOK(res) || !ptr) { + SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_Result" "', argument " "3"" of type '" "std::string""'"); + } + arg3 = *ptr; + if (SWIG_IsNewObj(res)) delete ptr; + } + { + std::string *ptr = (std::string *)0; + int res = SWIG_AsPtr_std_string SWIG_PERL_CALL_ARGS_2(ST(3), &ptr); + if (!SWIG_IsOK(res) || !ptr) { + SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_Result" "', argument " "4"" of type '" "std::string""'"); + } + arg4 = *ptr; + if (SWIG_IsNewObj(res)) delete ptr; + } + { + std::string *ptr = (std::string *)0; + int res = SWIG_AsPtr_std_string SWIG_PERL_CALL_ARGS_2(ST(4), &ptr); + if (!SWIG_IsOK(res) || !ptr) { + SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_Result" "', argument " "5"" of type '" "std::string""'"); + } + arg5 = *ptr; + if (SWIG_IsNewObj(res)) delete ptr; + } + result = (CBM::Result *)new CBM::Result(arg1,arg2,arg3,arg4,arg5); + ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CBM__Result, SWIG_OWNER | SWIG_SHADOW); argvi++ ; + + + + + + XSRETURN(argvi); + fail: + + + + + + SWIG_croak_null(); + } + } + + + XS(_wrap_new_Result__SWIG_1) { + { + CBM::XMLNode *arg1 = (CBM::XMLNode *) 0 ; + CBM::Result *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: new_Result(_node);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__XMLNode, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Result" "', argument " "1"" of type '" "CBM::XMLNode *""'"); + } + arg1 = reinterpret_cast< CBM::XMLNode * >(argp1); + result = (CBM::Result *)new CBM::Result(arg1); + ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CBM__Result, SWIG_OWNER | SWIG_SHADOW); argvi++ ; + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } + } + + + XS(_wrap_new_Result) { + dXSARGS; + + { + unsigned long _index = 0; + SWIG_TypeRank _rank = 0; + if (items == 1) { + SWIG_TypeRank _ranki = 0; + SWIG_TypeRank _rankm = 0; + SWIG_TypeRank _pi = 1; + int _v = 0; + { + void *vptr = 0; + int res = SWIG_ConvertPtr(ST(0), &vptr, SWIGTYPE_p_CBM__XMLNode, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_1; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + if (!_index || (_ranki < _rank)) { + _rank = _ranki; _index = 1; + if (_rank == _rankm) goto dispatch; + } + } + check_1: + + if (items == 5) { + SWIG_TypeRank _ranki = 0; + SWIG_TypeRank _rankm = 0; + SWIG_TypeRank _pi = 1; + int _v = 0; + { + int res = SWIG_AsPtr_std_string SWIG_PERL_CALL_ARGS_2(ST(0), (std::string**)(0)); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_2; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + { + int res = SWIG_AsPtr_std_string SWIG_PERL_CALL_ARGS_2(ST(1), (std::string**)(0)); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_2; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + { + int res = SWIG_AsPtr_std_string SWIG_PERL_CALL_ARGS_2(ST(2), (std::string**)(0)); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_2; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + { + int res = SWIG_AsPtr_std_string SWIG_PERL_CALL_ARGS_2(ST(3), (std::string**)(0)); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_2; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + { + int res = SWIG_AsPtr_std_string SWIG_PERL_CALL_ARGS_2(ST(4), (std::string**)(0)); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_2; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + if (!_index || (_ranki < _rank)) { + _rank = _ranki; _index = 2; + if (_rank == _rankm) goto dispatch; + } + } + check_2: + + dispatch: + switch(_index) { + case 1: + ++PL_markstack_ptr; SWIG_CALLXS(_wrap_new_Result__SWIG_1); return; + case 2: + ++PL_markstack_ptr; SWIG_CALLXS(_wrap_new_Result__SWIG_0); return; + } + } + + croak("No matching function for overloaded 'new_Result'"); + XSRETURN(0); + } + + + XS(_wrap_Result_Value) { + { + CBM::Result *arg1 = (CBM::Result *) 0 ; + std::string result; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: Result_Value(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Result, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Result_Value" "', argument " "1"" of type '" "CBM::Result *""'"); + } + arg1 = reinterpret_cast< CBM::Result * >(argp1); + result = (arg1)->Value(); + ST(argvi) = SWIG_From_std_string SWIG_PERL_CALL_ARGS_1(static_cast< std::string >(result)); argvi++ ; + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } + } + + + XS(_wrap_Result_compilationTime) { + { + CBM::Result *arg1 = (CBM::Result *) 0 ; + std::string result; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: Result_compilationTime(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Result, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Result_compilationTime" "', argument " "1"" of type '" "CBM::Result *""'"); + } + arg1 = reinterpret_cast< CBM::Result * >(argp1); + result = (arg1)->compilationTime(); + ST(argvi) = SWIG_From_std_string SWIG_PERL_CALL_ARGS_1(static_cast< std::string >(result)); argvi++ ; + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } + } + + + XS(_wrap_Result_executionTime) { + { + CBM::Result *arg1 = (CBM::Result *) 0 ; + std::string result; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: Result_executionTime(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Result, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Result_executionTime" "', argument " "1"" of type '" "CBM::Result *""'"); + } + arg1 = reinterpret_cast< CBM::Result * >(argp1); + result = (arg1)->executionTime(); + ST(argvi) = SWIG_From_std_string SWIG_PERL_CALL_ARGS_1(static_cast< std::string >(result)); argvi++ ; + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } + } + + + XS(_wrap_Result_tested) { + { + CBM::Result *arg1 = (CBM::Result *) 0 ; + std::string result; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: Result_tested(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Result, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Result_tested" "', argument " "1"" of type '" "CBM::Result *""'"); + } + arg1 = reinterpret_cast< CBM::Result * >(argp1); + result = (arg1)->tested(); + ST(argvi) = SWIG_From_std_string SWIG_PERL_CALL_ARGS_1(static_cast< std::string >(result)); argvi++ ; + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } + } + + + XS(_wrap_Result_testOk) { + { + CBM::Result *arg1 = (CBM::Result *) 0 ; + std::string result; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: Result_testOk(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Result, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Result_testOk" "', argument " "1"" of type '" "CBM::Result *""'"); + } + arg1 = reinterpret_cast< CBM::Result * >(argp1); + result = (arg1)->testOk(); + ST(argvi) = SWIG_From_std_string SWIG_PERL_CALL_ARGS_1(static_cast< std::string >(result)); argvi++ ; + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } + } + + + XS(_wrap_Result_resultNode) { + { + CBM::Result *arg1 = (CBM::Result *) 0 ; + CBM::XMLNode *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: Result_resultNode(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Result, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Result_resultNode" "', argument " "1"" of type '" "CBM::Result *""'"); + } + arg1 = reinterpret_cast< CBM::Result * >(argp1); + result = (CBM::XMLNode *)(arg1)->resultNode(); + ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CBM__XMLNode, 0 | SWIG_SHADOW); argvi++ ; + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } + } + + + XS(_wrap_delete_Result) { + { + CBM::Result *arg1 = (CBM::Result *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: delete_Result(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Result, SWIG_POINTER_DISOWN | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Result" "', argument " "1"" of type '" "CBM::Result *""'"); + } + arg1 = reinterpret_cast< CBM::Result * >(argp1); + delete arg1; + + + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } + } + + XS(_wrap_System_init) { { *************** *** 7606,7663 **** - XS(_wrap_System_displayAllPackages) { - { - CBM::System *arg1 = (CBM::System *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - int argvi = 0; - dXSARGS; - - if ((items < 1) || (items > 1)) { - SWIG_croak("Usage: System_displayAllPackages(self);"); - } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__System, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "System_displayAllPackages" "', argument " "1"" of type '" "CBM::System *""'"); - } - arg1 = reinterpret_cast< CBM::System * >(argp1); - (arg1)->displayAllPackages(); - - - XSRETURN(argvi); - fail: - - SWIG_croak_null(); - } - } - - - XS(_wrap_System_displayAllBenchmarks) { - { - CBM::System *arg1 = (CBM::System *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - int argvi = 0; - dXSARGS; - - if ((items < 1) || (items > 1)) { - SWIG_croak("Usage: System_displayAllBenchmarks(self);"); - } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__System, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "System_displayAllBenchmarks" "', argument " "1"" of type '" "CBM::System *""'"); - } - arg1 = reinterpret_cast< CBM::System * >(argp1); - (arg1)->displayAllBenchmarks(); - - - XSRETURN(argvi); - fail: - - SWIG_croak_null(); - } - } - - XS(_wrap_System_Split) { { --- 7922,7925 ---- *************** *** 10052,10055 **** --- 10314,10318 ---- static swig_type_info _swigt__p_CBM__Package = {"_p_CBM__Package", "CBM::Package *", 0, 0, (void*)"CBM::Package", 0}; static swig_type_info _swigt__p_CBM__Plan = {"_p_CBM__Plan", "CBM::Plan *", 0, 0, (void*)"CBM::Plan", 0}; + static swig_type_info _swigt__p_CBM__Result = {"_p_CBM__Result", "CBM::Result *", 0, 0, (void*)"CBM::Result", 0}; static swig_type_info _swigt__p_CBM__System = {"_p_CBM__System", "CBM::System *", 0, 0, (void*)"CBM::System", 0}; static swig_type_info _swigt__p_CBM__XMLAttribute = {"_p_CBM__XMLAttribute", "CBM::XMLAttribute *", 0, 0, (void*)"CBM::XMLAttribute", 0}; *************** *** 10071,10074 **** --- 10334,10338 ---- &_swigt__p_CBM__Package, &_swigt__p_CBM__Plan, + &_swigt__p_CBM__Result, &_swigt__p_CBM__System, &_swigt__p_CBM__XMLAttribute, *************** *** 10090,10093 **** --- 10354,10358 ---- static swig_cast_info _swigc__p_CBM__Package[] = { {&_swigt__p_CBM__Package, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_CBM__Plan[] = { {&_swigt__p_CBM__Plan, 0, 0, 0},{0, 0, 0, 0}}; + static swig_cast_info _swigc__p_CBM__Result[] = { {&_swigt__p_CBM__Result, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_CBM__System[] = { {&_swigt__p_CBM__System, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_CBM__XMLAttribute[] = { {&_swigt__p_CBM__XMLAttribute, 0, 0, 0},{0, 0, 0, 0}}; *************** *** 10109,10112 **** --- 10374,10378 ---- _swigc__p_CBM__Package, _swigc__p_CBM__Plan, + _swigc__p_CBM__Result, _swigc__p_CBM__System, _swigc__p_CBM__XMLAttribute, *************** *** 10145,10150 **** {"CBMc::Package_hasPatch", _wrap_Package_hasPatch}, {"CBMc::Package_resetContext", _wrap_Package_resetContext}, - {"CBMc::Package_display", _wrap_Package_display}, - {"CBMc::Package_displayBenchmarks", _wrap_Package_displayBenchmarks}, {"CBMc::Package_System", _wrap_Package_System}, {"CBMc::Package_Benchmarks", _wrap_Package_Benchmarks}, --- 10411,10414 ---- *************** *** 10183,10187 **** {"CBMc::delete_Package", _wrap_delete_Package}, {"CBMc::Benchmark_Package", _wrap_Benchmark_Package}, - {"CBMc::Benchmark_display", _wrap_Benchmark_display}, {"CBMc::Benchmark_Name", _wrap_Benchmark_Name}, {"CBMc::Benchmark_Comments", _wrap_Benchmark_Comments}, --- 10447,10450 ---- *************** *** 10229,10232 **** --- 10492,10503 ---- {"CBMc::Config_ignoreChanges", _wrap_Config_ignoreChanges}, {"CBMc::delete_Config", _wrap_delete_Config}, + {"CBMc::new_Result", _wrap_new_Result}, + {"CBMc::Result_Value", _wrap_Result_Value}, + {"CBMc::Result_compilationTime", _wrap_Result_compilationTime}, + {"CBMc::Result_executionTime", _wrap_Result_executionTime}, + {"CBMc::Result_tested", _wrap_Result_tested}, + {"CBMc::Result_testOk", _wrap_Result_testOk}, + {"CBMc::Result_resultNode", _wrap_Result_resultNode}, + {"CBMc::delete_Result", _wrap_delete_Result}, {"CBMc::System_init", _wrap_System_init}, {"CBMc::System_Version", _wrap_System_Version}, *************** *** 10248,10253 **** {"CBMc::System_Package", _wrap_System_Package}, {"CBMc::System_Benchmark", _wrap_System_Benchmark}, - {"CBMc::System_displayAllPackages", _wrap_System_displayAllPackages}, - {"CBMc::System_displayAllBenchmarks", _wrap_System_displayAllBenchmarks}, {"CBMc::System_Split", _wrap_System_Split}, {"CBMc::System_Chomp", _wrap_System_Chomp}, --- 10519,10522 ---- *************** *** 10656,10659 **** --- 10925,10934 ---- SWIG_TypeClientData(SWIGTYPE_p_CBM__Config, (void*) "CBM::Config"); /*@SWIG:%set_constant@*/ do { + SV *sv = get_sv((char*) SWIG_prefix "H_CBMRESULT", TRUE | 0x2); + sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(1))); + SvREADONLY_on(sv); + } while(0) /*@SWIG@*/; + SWIG_TypeClientData(SWIGTYPE_p_CBM__Result, (void*) "CBM::Result"); + /*@SWIG:%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "System_Root", TRUE | 0x2); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CBM::System::Root))); Index: CBM.i =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM.i,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** CBM.i 26 Jan 2007 13:07:51 -0000 1.10 --- CBM.i 5 Feb 2007 20:03:22 -0000 1.11 *************** *** 12,15 **** --- 12,16 ---- #include "Base/XMLReader.h" #include "Base/Config.h" + #include "Base/Result.h" #include "Plan/Plan.h" using namespace CBM; *************** *** 22,25 **** --- 23,27 ---- %include "Base/XMLReader.h" %include "Base/Config.h" + %include "Base/Result.h" %include "System/System.h" %include "Compiler/Compiler.h" |
|
From: Frederic T. <xf...@us...> - 2007-02-05 20:02:59
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Base In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19632 Modified Files: Makefile.am Log Message: Result.* added. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Base/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.am 26 Jan 2007 13:01:56 -0000 1.6 --- Makefile.am 5 Feb 2007 20:02:51 -0000 1.7 *************** *** 10,14 **** noinst_LTLIBRARIES = libBase.la ! sources = XML.cpp XMLReader.cpp md5.cpp Config.cpp libBase_la_SOURCES = $(sources) $(source_sys) --- 10,14 ---- noinst_LTLIBRARIES = libBase.la ! sources = XML.cpp XMLReader.cpp md5.cpp Config.cpp Result.cpp libBase_la_SOURCES = $(sources) $(source_sys) |
|
From: Frederic T. <xf...@us...> - 2007-02-05 20:02:13
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Base In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19535 Added Files: Result.cpp Result.h Log Message: First import. --- NEW FILE: Result.cpp --- /* ---------------------------------------------------------------------------- $Id: Result.cpp,v 1.1 2007/02/05 20:01:59 xfred Exp $ This is free software. For details, see the GNU Public License in the COPYING file, or Look http://www.fsf.org ------------------------------------------------------------------------- */ #include <Base/Result.h> using namespace CBM; Result::Result(std::string _value, std::string _compilationTime, std::string _executionTime, std::string _tested, std::string _testOk) { node=new XMLNode("result"); node->addAttribute("value", _value); node->addAttribute("compilation-time", _compilationTime); node->addAttribute("execution-time", _executionTime); node->addAttribute("tested", _tested); node->addAttribute("test-ok", _testOk); } Result::Result(CBM::XMLNode *_node) { node=_node; } std::string Result::getAttributeStr(std::string _attr) { std::string result = "0"; CBM::XMLAttribute *att; att=node->getAttribute(_attr); if (att) result=att->Value(); return(result); } std::string Result::Value(void) { return(getAttributeStr("value")); } std::string Result::compilationTime(void) { return(getAttributeStr("compilation-time")); } std::string Result::executionTime(void) { return(getAttributeStr("execution-time")); } std::string Result::tested(void) { return(getAttributeStr("tested")); } std::string Result::testOk(void) { return(getAttributeStr("test-ok")); } CBM::XMLNode *Result::resultNode(void) { return(node); } Result::~Result() { } --- NEW FILE: Result.h --- /* ---------------------------------------------------------------------------- $Id: Result.h,v 1.1 2007/02/05 20:01:59 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_CBMRESULT #define H_CBMRESULT 1 #include <Base/XML.h> namespace CBM { /** \brief Class for storing and managing results */ class Result { protected: XMLNode *node; virtual std::string getAttributeStr(std::string _attr); public: Result(std::string _value, std::string _compilationTime, std::string _executionTime, std::string _tested, std::string _testOk); Result(XMLNode *_node); virtual std::string Value(void); virtual std::string compilationTime(void); virtual std::string executionTime(void); virtual std::string tested(void); virtual std::string testOk(void); virtual XMLNode *resultNode(void); /** Destructor */ virtual ~Result(); }; } #endif |
|
From: Frederic T. <xf...@us...> - 2007-02-05 20:01:09
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/System In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19030 Modified Files: System.cpp Log Message: display*() methods obsoleted. Index: System.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/System/System.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** System.cpp 30 Jan 2007 20:00:16 -0000 1.3 --- System.cpp 5 Feb 2007 20:01:01 -0000 1.4 *************** *** 294,297 **** --- 294,298 ---- } + /* void System::displayAllPackages(void) { *************** *** 318,321 **** --- 319,323 ---- } } + */ std::string System::Split(const std::string& str, const std::string& delim, unsigned int wantedIndex) |
|
From: Frederic T. <xf...@us...> - 2007-02-05 19:59:48
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/System In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18555 Modified Files: System.h Log Message: display*() methods obsoleted. Index: System.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/System/System.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** System.h 30 Jan 2007 20:00:16 -0000 1.3 --- System.h 5 Feb 2007 19:59:41 -0000 1.4 *************** *** 177,185 **** /** Display informations about all packages * Used by compbenchmarks-core */ ! virtual void displayAllPackages(void); /** Display informations about all benchmarks * Used by compbenchmarks-core */ ! virtual void displayAllBenchmarks(void); /** Split a std::string. --- 177,185 ---- /** Display informations about all packages * Used by compbenchmarks-core */ ! // virtual void displayAllPackages(void); /** Display informations about all benchmarks * Used by compbenchmarks-core */ ! // virtual void displayAllBenchmarks(void); /** Split a std::string. |
|
From: Frederic T. <xf...@us...> - 2007-02-05 19:59:08
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18180 Modified Files: Benchmark.cpp Log Message: display() method obsoleted. Index: Benchmark.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Benchmark.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Benchmark.cpp 26 Jan 2007 12:59:31 -0000 1.3 --- Benchmark.cpp 5 Feb 2007 19:58:55 -0000 1.4 *************** *** 12,16 **** package=_package; } ! void Benchmark::display(void) { --- 12,16 ---- package=_package; } ! /* void Benchmark::display(void) { *************** *** 23,26 **** --- 23,27 ---- << std::endl; } + */ std::string Benchmark::Name(void) |
|
From: Frederic T. <xf...@us...> - 2007-02-05 19:57:10
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17668 Modified Files: Benchmark.h Log Message: display() method obsoleted. Index: Benchmark.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Benchmark.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Benchmark.h 26 Jan 2007 12:59:31 -0000 1.3 --- Benchmark.h 5 Feb 2007 19:57:07 -0000 1.4 *************** *** 56,60 **** /** Display informations about benchmark */ ! void display(void); /** Benchmark name \return a std::string representing current benchmark's identification --- 56,61 ---- /** Display informations about benchmark */ ! // void display(void); ! /** Benchmark name \return a std::string representing current benchmark's identification |
|
From: Frederic T. <xf...@us...> - 2007-02-05 19:56:37
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17377 Modified Files: Package.cpp Log Message: display*() methods obsoleted. lastBuildTime set to 0 if make() call isn't needed. Index: Package.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Package.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Package.cpp 26 Jan 2007 13:00:23 -0000 1.5 --- Package.cpp 5 Feb 2007 19:56:33 -0000 1.6 *************** *** 49,52 **** --- 49,53 ---- } + /* void Package::display(void) { *************** *** 73,76 **** --- 74,78 ---- } } + */ System *Package::System(void) *************** *** 403,406 **** --- 405,409 ---- if ((getStatus()>=Made) && (!_force)) { + lastBuildTime="0"; return(1); } |
|
From: Frederic T. <xf...@us...> - 2007-02-05 19:55:28
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17000 Modified Files: Package.h Log Message: display*() methods obsoleted. Index: Package.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Package.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Package.h 26 Jan 2007 12:58:32 -0000 1.2 --- Package.h 5 Feb 2007 19:55:25 -0000 1.3 *************** *** 189,196 **** /** Display informations about package */ ! virtual void display(void); /** Display informations about all supported benchmarks */ ! virtual void displayBenchmarks(void); /** Get system abstraction object --- 189,196 ---- /** Display informations about package */ ! // virtual void display(void); /** Display informations about all supported benchmarks */ ! // virtual void displayBenchmarks(void); /** Get system abstraction object |
|
From: Frederic T. <xf...@us...> - 2007-02-05 19:54:39
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16619 Modified Files: Makefile.am Log Message: Added : 07-compbenchmarks-core.pl Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/Makefile.am,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Makefile.am 30 Jan 2007 19:58:56 -0000 1.11 --- Makefile.am 5 Feb 2007 19:54:30 -0000 1.12 *************** *** 8,12 **** 04-Config.pl \ 05-Plan.pl \ ! 06-CBM-LibUI.pl tests = $(top_srcdir)/CBM-PI/t/00-Glue.pl \ --- 8,13 ---- 04-Config.pl \ 05-Plan.pl \ ! 06-CBM-LibUI.pl \ ! 07-compbenchmarks-core.pl tests = $(top_srcdir)/CBM-PI/t/00-Glue.pl \ *************** *** 18,22 **** $(top_srcdir)/CBM-PI/t/04-Config.pl \ $(top_srcdir)/CBM-PI/t/05-Plan.pl \ ! $(top_srcdir)/CBM-PI/t/06-CBM-LibUI.pl dist_noinst_DATA = $(prog_tests) --- 19,24 ---- $(top_srcdir)/CBM-PI/t/04-Config.pl \ $(top_srcdir)/CBM-PI/t/05-Plan.pl \ ! $(top_srcdir)/CBM-PI/t/06-CBM-LibUI.pl \ ! $(top_srcdir)/CBM-PI/t/07-compbenchmarks-core.pl dist_noinst_DATA = $(prog_tests) |
|
From: Frederic T. <xf...@us...> - 2007-02-05 19:54:05
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16243 Added Files: 07-compbenchmarks-core.pl Log Message: First import. --- NEW FILE: 07-compbenchmarks-core.pl --- #!/usr/bin/perl -w -I .. # ----------------------------------------------------------------------------- # $Id: 07-compbenchmarks-core.pl,v 1.1 2007/02/05 19:53:45 xfred Exp $ # # This is free software. # For details, see the GNU Public License in the COPYING file, or # Look http://www.fsf.org # ----------------------------------------------------------------------------- use strict; use CBM::LibUI; use Test::Simple tests => 58; sub test_options { my @valid_options = ( ['-v', 0, '\d\.\d.\d'], ['-h', 0, '.*'], ['-qap', 0, '.*'], ['-qip', 0, '.*'], ['-qa', 255, ''], ['-qi', 255, ''], ['-qab', 0, '.*'], ['-qib', 0, '.*'], ['-I', 255, ''], ['-U', 255, ''], ['-M -I', 255, ''], ['-M -U', 255, ''], ['-m -I', 255, 'requires an argument'], ['-m -U', 255, 'requires an argument'] ); my %incompatible_options = ( '-q' => ['-v', '-m', '-M', '-B', '', '-U', '-I' ], '-I' => ['-v', '', '-b'], '-v' => ['-a', '-i', '-b', '-p' ], '-m' => ['-a', '-i', '-b', '-p', '-U', '-I' ], '-M' => ['-a', '-i', '-b', '-p' ], '-B' => ['-a', '-i', '-b', '-p', '-U', '-I' ], ); my $item; my $i; foreach $i (keys %incompatible_options) { foreach $item (@{$incompatible_options{$i}}) { my $cmd = "../../compbenchmarks-core $i $item"; my $output = `$cmd 2>&1`; my $code = $? >> 8; ok($code != 0, "Incompatible options : return-code is not 0 for $cmd"); } } foreach $item (@valid_options) { my ($option, $xcode, $xoutput) = @{$item}; my $cmd = "../../compbenchmarks-core $option"; my $output = `$cmd 2>&1`; my $code = $? >> 8; chomp($output); ok($code eq $xcode, "Valid options : return-code is $xcode for $cmd (has $code)"); ok($output =~ /$xoutput/, "output matches $xoutput for $cmd"); } } test_options(); |
|
From: Frederic T. <xf...@us...> - 2007-01-31 20:46:22
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27375 Modified Files: cloptions.cpp Log Message: Updates. Index: cloptions.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/cloptions.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** cloptions.cpp 21 Jan 2007 21:42:17 -0000 1.13 --- cloptions.cpp 31 Jan 2007 20:45:48 -0000 1.14 *************** *** 13,16 **** --- 13,17 ---- #include <unistd.h> #include <getopt.h> + #include <stdio.h> using namespace CBM; *************** *** 20,54 **** int parseExitValue = -1; void cbmOptionsHelp(void) { std::cout << "Usage: compbenchmarks-core [specs]" << std::endl << "Where specs is one of :" << std::endl ! << " --install <b-id> : download and pre-configure specified benchmark" << std::endl ! << " --fetch <b-id> <tarball> : uses local gzipped-tarball file to prepare" << std::endl ! << " installation of <b-id>" << std::endl ! << " --version : display software version" << std::endl ! << " --uninstall <b-id> : remove specified benchmark" << std::endl ! << " --list-benchmarks : show information about supported benchmarks" << std::endl ! << " (including b-id)" << std::endl ! << " --host-infos : detect host system" << std::endl ! << " --program-infos : list used programs" << std::endl ! << " --compiler-infos <c-bin> : use specified binary as compiler and display " << std::endl ! << " information about it" << std::endl ! << " --benchmark-infos <b-id> : display benchmark's information" << std::endl << " --bench <b-id> <c-bin> [c-options]" << std::endl ! << " use specified compiler and options (if provided)" << std::endl ! << " to run benchmark b-id" << std::endl << std::endl << "Fine grained operations gives more specs :" << std::endl ! << " --download <b-id> : download a benchmark" << std::endl ! << " --extract <b-id> : extract a benchmark" << std::endl ! << " --patch <b-id> : patch a benchmark" << std::endl ! << " --preconfigure <b-id> : preconfigure a benchmark" << std::endl ! << " --test <b-id> : test a benchmark" << std::endl ! << " --release <b-id> : release a benchmark" << std::endl << std::endl << "Other options affecting behaviour :" << std::endl ! << " --disable-testsuite : disable package's test suite" << std::endl ! << " --force : force operation" << std::endl << std::endl; } --- 21,59 ---- int parseExitValue = -1; + int optQuery = 0; + int optQueryAll = 0; + void cbmOptionsHelp(void) { std::cout << "Usage: compbenchmarks-core [specs]" << std::endl << "Where specs is one of :" << std::endl ! << " --help | -h : this help" << std::endl ! << " --version | -v : display software version" << std::endl ! << " --install | -i <p-id> : download and pre-configure specified package" << std::endl ! << " --fetch | -f <b-id> <fn> : uses local file <fn> to prepare" << std::endl ! << " installation of <b-id>" << std::endl ! << " --uninstall <b-id> : remove specified benchmark" << std::endl ! << " --list-benchmarks : show information about supported benchmarks" << std::endl ! << " (including b-id)" << std::endl ! << " --host-infos : detect host system" << std::endl ! << " --program-infos : list used programs" << std::endl ! << " --compiler-infos <c-bin> : use specified binary as compiler and display " << std::endl ! << " information about it" << std::endl ! << " --benchmark-infos <b-id> : display benchmark's information" << std::endl << " --bench <b-id> <c-bin> [c-options]" << std::endl ! << " use specified compiler and options (if provided)" << std::endl ! << " to run benchmark b-id" << std::endl << std::endl << "Fine grained operations gives more specs :" << std::endl ! << " --package-download <b-id> : download a benchmark" << std::endl ! << " --extract <b-id> : extract a benchmark" << std::endl ! << " --patch <b-id> : patch a benchmark" << std::endl ! << " --package-preconfigure <b-id> : preconfigure a benchmark" << std::endl ! << " --test <b-id> : test a benchmark" << std::endl ! << " --release <b-id> : release a benchmark" << std::endl << std::endl << "Other options affecting behaviour :" << std::endl ! << " --disable-testsuite : disable package's test suite" << std::endl ! << " --force : force operation" << std::endl << std::endl; } *************** *** 56,65 **** void cbmUnknownBenchmark(char *bench) { ! std::cerr << "Unknow benchmark '" << bench << "'" << std::endl; } void cbmUnknownPackage(char *pack) { ! std::cerr << "Unknow package '" << pack << "'" << std::endl; } --- 61,92 ---- void cbmUnknownBenchmark(char *bench) { ! int i; ! int n = cbmSystem->packageNumber(); ! int j; ! int m; ! ! CBM::Package *P; ! ! std::cerr << "Unknow benchmark '" << bench << "'. Valid entries are :" << std::endl; ! for(i=0; i<n; i++) { ! P=cbmSystem->Package(i); ! m=P->benchmarkNumber(); ! for(j=0;j<m;j++) { ! std::cerr << " * " << P->Benchmark(j)->Name() << std::endl; ! } ! } } void cbmUnknownPackage(char *pack) { ! std::cerr << "Unknow package '" << pack << "'. Valid entries are :" << std::endl; ! int i; ! int n = cbmSystem->packageNumber(); ! CBM::Package *P; ! ! for(i=0; i<n; i++) { ! P=cbmSystem->Package(i); ! std::cerr << " * " << P->Name() << std::endl; ! } } *************** *** 124,146 **** std::string options; ! static struct option long_options[] = { ! {"help", 0, 0, 'h' }, ! {"version", 0, 0, 'v'}, ! {"install", 1, 0, 'i' }, ! {"fetch", 1, 0, 'f'}, ! {"uninstall", 1, 0, 'u' }, ! {"list-benchmarks", 0, 0, 'L'}, ! {"host-infos", 0, 0, 'H' }, ! {"program-infos", 0, 0, 'P' }, ! {"compiler-infos", 1, 0, 'C' }, ! {"benchmark-infos", 1, 0, 'I' }, {"bench", 1, 0, 'B'}, ! {"download", 1, 0, 'D' }, ! {"extract", 1, 0, 'E' }, ! {"patch", 1, 0, 'p' }, ! {"preconfigure", 1, 0, 'g' }, ! {"test", 1, 0, 't' }, ! {"release", 1, 0, 'r' }, {"disable-testsuite", 0, 0, 'T' }, {"force", 0, 0, 'F' }, --- 151,181 ---- std::string options; ! static const struct option long_options[] = { ! {"help", no_argument, 0, 'h' }, ! {"version", no_argument, 0, 'v'}, ! {"install", required_argument, 0, 'i' }, ! {"fetch", required_argument, 0, 'f'}, ! {"uninstall", required_argument, 0, 'u' }, ! ! {"query", 0, 0, 'q' }, ! {"all", 0, 0, 'a' }, ! ! ! {"package", optional_argument, 0, 'p' }, ! {"package-benchmarks-info", 1, 0, 'I' }, ! ! {"benchmarks-info", 0, 0, 'L'}, ! {"host-info", 0, 0, 'H' }, ! {"programs-info", 0, 0, 'P' }, ! {"compiler-info", 1, 0, 'C' }, ! {"bench", 1, 0, 'B'}, ! {"package-download", 1, 0, 'D' }, ! {"package-extract", 1, 0, 'E' }, ! {"package-patch", 1, 0, 1011 }, ! {"package-preconfigure", 1, 0, 'g' }, ! {"package-test", 1, 0, 't' }, ! {"package-release", 1, 0, 'r' }, {"disable-testsuite", 0, 0, 'T' }, {"force", 0, 0, 'F' }, *************** *** 154,158 **** break; ! c = getopt_long (argc, argv, "vhi:u:LHPCF:1:I:B:2", /* :011000112", */ long_options, &option_index); if (c==-1) { --- 189,193 ---- break; ! c = getopt_long (argc, argv, "hvi:f:u:qp::a", // uLHPCFIB", /* :011000112", */ long_options, &option_index); if (c==-1) { *************** *** 165,172 **** --- 200,256 ---- parseExitValue=0; break; + case 'q': + optQuery=1; + break; + case 'a': + optQueryAll=1; + break; case 'h': cbmOptionsHelp(); parseExitValue=0; break; + case 'p': + printf("-p optarg=%s\n", optarg); + if (!optQuery) { + std::cerr << "-p option requires -q" << std::endl; + parseExitValue=1; + break; + } + + if ((optarg) && (!optQueryAll)) { + P=cbmOptionsExpectPackage(optarg); + if (P) + P->display(); + parseExitValue=0; + } else { + if (optQueryAll) { + if (optarg) { + std::cerr << "-qap options' set don't expect any argument" << std::endl; + } else { + printf("qap\n"); + // !!! + } + } else { + printf("there %x\n", (unsigned int) optarg); + if (optarg) { + P=cbmOptionsExpectPackage(optarg); + if (P) + P->display(); + parseExitValue=0; + } else { + P=cbmOptionsExpectPackage(optarg); + } + } + } + break; + /* + case 1011: + P=cbmOptionsExpectPackage(optarg); + if (P) + P->displayBenchmarks(); + parseExitValue=0; + break; + !!! + */ case 'i': P=cbmOptionsExpectPackage(optarg); *************** *** 239,243 **** parseExitValue=!P->Extract(UO_force); break; ! case 'p': P=cbmOptionsExpectPackage(optarg); if (P) --- 323,327 ---- parseExitValue=!P->Extract(UO_force); break; ! case 1011: P=cbmOptionsExpectPackage(optarg); if (P) *************** *** 289,294 **** options=""; } ! O=new CBM::CompilerOptions(C, ! (char*) options.c_str()); P=B->Package(); if (P->getStatus()<CBM::Package::Preconfigured) { --- 373,377 ---- options=""; } ! O=new CBM::CompilerOptions(options); P=B->Package(); if (P->getStatus()<CBM::Package::Preconfigured) { *************** *** 313,316 **** --- 396,401 ---- parseExitValue=0; break; + case '?': + break; } } |
|
From: Frederic T. <xf...@us...> - 2007-01-30 21:14:11
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19399 Modified Files: Doxyfile Log Message: Various changes. Index: Doxyfile =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Doxyfile,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Doxyfile 27 Dec 2006 18:21:14 -0000 1.8 --- Doxyfile 30 Jan 2007 21:13:56 -0000 1.9 *************** *** 1,3 **** ! # Doxyfile 1.4.7 #--------------------------------------------------------------------------- --- 1,3 ---- ! # Doxyfile 1.5.1 #--------------------------------------------------------------------------- *************** *** 5,9 **** #--------------------------------------------------------------------------- PROJECT_NAME = CompBenchmarks ! PROJECT_NUMBER = 0.4.1 OUTPUT_DIRECTORY = doc CREATE_SUBDIRS = NO --- 5,9 ---- #--------------------------------------------------------------------------- PROJECT_NAME = CompBenchmarks ! PROJECT_NUMBER = 0.5.0 OUTPUT_DIRECTORY = doc CREATE_SUBDIRS = NO *************** *** 77,81 **** WARN_IF_UNDOCUMENTED = YES WARN_IF_DOC_ERROR = YES ! WARN_NO_PARAMDOC = NO WARN_FORMAT = "$file:$line: $text" WARN_LOGFILE = --- 77,81 ---- WARN_IF_UNDOCUMENTED = YES WARN_IF_DOC_ERROR = YES ! WARN_NO_PARAMDOC = YES WARN_FORMAT = "$file:$line: $text" WARN_LOGFILE = *************** *** 139,150 **** # configuration options related to source browsing #--------------------------------------------------------------------------- ! SOURCE_BROWSER = NO INLINE_SOURCES = NO STRIP_CODE_COMMENTS = YES ! REFERENCED_BY_RELATION = NO ! REFERENCES_RELATION = NO REFERENCES_LINK_SOURCE = YES USE_HTAGS = NO ! VERBATIM_HEADERS = NO #--------------------------------------------------------------------------- # configuration options related to the alphabetical class index --- 139,150 ---- # configuration options related to source browsing #--------------------------------------------------------------------------- ! SOURCE_BROWSER = YES INLINE_SOURCES = NO STRIP_CODE_COMMENTS = YES ! REFERENCED_BY_RELATION = YES ! REFERENCES_RELATION = YES REFERENCES_LINK_SOURCE = YES USE_HTAGS = NO ! VERBATIM_HEADERS = YES #--------------------------------------------------------------------------- # configuration options related to the alphabetical class index *************** *** 176,180 **** # configuration options related to the LaTeX output #--------------------------------------------------------------------------- ! GENERATE_LATEX = YES LATEX_OUTPUT = latex LATEX_CMD_NAME = latex --- 176,180 ---- # configuration options related to the LaTeX output #--------------------------------------------------------------------------- ! GENERATE_LATEX = NO LATEX_OUTPUT = latex LATEX_CMD_NAME = latex *************** *** 207,211 **** # configuration options related to the XML output #--------------------------------------------------------------------------- ! GENERATE_XML = YES XML_OUTPUT = xml XML_SCHEMA = --- 207,211 ---- # configuration options related to the XML output #--------------------------------------------------------------------------- ! GENERATE_XML = NO XML_OUTPUT = xml XML_SCHEMA = *************** *** 227,231 **** #--------------------------------------------------------------------------- ENABLE_PREPROCESSING = YES ! MACRO_EXPANSION = NO EXPAND_ONLY_PREDEF = NO SEARCH_INCLUDES = YES --- 227,231 ---- #--------------------------------------------------------------------------- ENABLE_PREPROCESSING = YES ! MACRO_EXPANSION = YES EXPAND_ONLY_PREDEF = NO SEARCH_INCLUDES = YES *************** *** 250,254 **** HAVE_DOT = YES CLASS_GRAPH = YES ! COLLABORATION_GRAPH = YES GROUP_GRAPHS = YES UML_LOOK = NO --- 250,254 ---- HAVE_DOT = YES CLASS_GRAPH = YES ! COLLABORATION_GRAPH = NO GROUP_GRAPHS = YES UML_LOOK = NO *************** *** 256,261 **** INCLUDE_GRAPH = YES INCLUDED_BY_GRAPH = YES ! CALL_GRAPH = NO ! CALLER_GRAPH = NO GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES --- 256,261 ---- INCLUDE_GRAPH = YES INCLUDED_BY_GRAPH = YES ! CALL_GRAPH = YES ! CALLER_GRAPH = YES GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES *************** *** 267,271 **** MAX_DOT_GRAPH_DEPTH = 1000 DOT_TRANSPARENT = NO ! DOT_MULTI_TARGETS = NO GENERATE_LEGEND = YES DOT_CLEANUP = YES --- 267,271 ---- MAX_DOT_GRAPH_DEPTH = 1000 DOT_TRANSPARENT = NO ! DOT_MULTI_TARGETS = YES GENERATE_LEGEND = YES DOT_CLEANUP = YES |
|
From: Frederic T. <xf...@us...> - 2007-01-30 20:57:21
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10898 Modified Files: configure.in Log Message: New perl directory in share. Index: configure.in =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/configure.in,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** configure.in 26 Jan 2007 13:09:12 -0000 1.25 --- configure.in 30 Jan 2007 20:57:07 -0000 1.26 *************** *** 274,277 **** --- 274,279 ---- libcompbenchmarks/share/system/Makefile libcompbenchmarks/share/system/cygwin/Makefile + libcompbenchmarks/share/perl/CBM/Makefile + libcompbenchmarks/share/perl/Makefile libcompbenchmarks/Base/Makefile libcompbenchmarks/System/Makefile |
|
From: Frederic T. <xf...@us...> - 2007-01-30 20:13:46
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16871 Modified Files: config.h.in Log Message: AC Changes. Index: config.h.in =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/config.h.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** config.h.in 22 Jan 2007 17:42:42 -0000 1.1 --- config.h.in 30 Jan 2007 20:02:55 -0000 1.2 *************** *** 1,4 **** --- 1,7 ---- /* libcompbenchmarks/config.h.in. Generated from configure.in by autoheader. */ + /* Gtk2 */ + #undef CBM_GTK2 + /* bzip2 */ #undef CBM_PROG_BZIP2 |
|
From: Frederic T. <xf...@us...> - 2007-01-30 20:13:37
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14554 Modified Files: 00-CBMSystem-public.pl Log Message: More tests. Index: 00-CBMSystem-public.pl =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/00-CBMSystem-public.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** 00-CBMSystem-public.pl 25 Jan 2007 15:42:35 -0000 1.4 --- 00-CBMSystem-public.pl 30 Jan 2007 19:58:11 -0000 1.5 *************** *** 5,9 **** require "libtest.pl"; ! use Test::Simple tests => 26; my $sys; --- 5,9 ---- require "libtest.pl"; ! use Test::Simple tests => 27; my $sys; *************** *** 157,160 **** --- 157,161 ---- test_getLastCommand(); test_getLastCommandOutput(); + ok($sys->Version() eq "0.5.0"); $sys->done(); |
|
From: Frederic T. <xf...@us...> - 2007-01-30 20:13:36
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/System In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15540 Modified Files: System.cpp System.h Log Message: API improvements and interface to Plan. Index: System.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/System/System.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** System.cpp 25 Jan 2007 15:38:49 -0000 1.2 --- System.cpp 30 Jan 2007 20:00:16 -0000 1.3 *************** *** 1,3 **** --- 1,4 ---- #include <System/System.h> + #include <Plan/Plan.h> #include <Base/Config.h> #include <Base/md5.h> *************** *** 29,33 **** configurationFile=_filename; ! cbmSystem=this; --- 30,34 ---- configurationFile=_filename; ! plan=0; cbmSystem=this; *************** *** 43,47 **** } ! int System::CheckDirectory(Dir where) { std::string dir = Directory(where); --- 44,58 ---- } ! std::string System::Version(void) ! { ! return(VERSION); ! } ! ! CBM::Plan *System::Plan(void) ! { ! return(plan); ! } ! ! int System::CheckDirectory(Dir where) { std::string dir = Directory(where); *************** *** 122,125 **** --- 133,138 ---- packageList(); + plan=new CBM::Plan(); + plan->restore(configuration->planNode()); return(1); } *************** *** 357,360 **** --- 370,452 ---- } + std::string System::Program(std::string pid) + { + std::string r; + + if (pid == "BZIP2") { + r=CBM_PROG_BZIP2; + } + if (pid == "CUT") { + r=CBM_PROG_CUT; + } + if (pid == "DD") { + r=CBM_PROG_DD; + } + if (pid == "DIALOG") { + r=CBM_PROG_DIALOG; + } + + if (pid == "GREP") { + r=CBM_PROG_GREP; + } + + if (pid == "GZIP") { + r=CBM_PROG_GZIP; + } + + if (pid == "HEAD") { + r=CBM_PROG_HEAD; + } + + if (pid == "MAKE") { + r=CBM_PROG_MAKE; + } + + if (pid == "MKDIR") { + r=CBM_PROG_MKDIR; + } + + if (pid == "PATCH") { + r=CBM_PROG_PATCH; + } + + if (pid == "RM") { + r=CBM_PROG_RM; + } + + if (pid == "TAIL") { + r=CBM_PROG_TAIL; + } + + if (pid == "TAR") { + r=CBM_PROG_TAR; + } + + if (pid == "UNZIP") { + r=CBM_PROG_UNZIP; + } + + if (pid == "WGET") { + r=CBM_PROG_WGET; + } + + if (pid == "ZCAT") { + r=CBM_PROG_ZCAT; + } + + if (pid == "CAT") { + r=CBM_PROG_CAT; + } + if (pid == "PERL") { + r=CBM_PROG_PERL; + } + + if (r == "") { + cbmUI->Fatal("No such external program"); + } + + return(r); + } + void System::display(void) { Index: System.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/System/System.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** System.h 25 Jan 2007 15:38:49 -0000 1.2 --- System.h 30 Jan 2007 20:00:16 -0000 1.3 *************** *** 10,13 **** --- 10,15 ---- #define H_CBMSYSTEM + #include <Plan/Plan.h> + #include <vector> *************** *** 29,34 **** protected: class Config *configuration; ! std::string configurationFile; public: /** Temporary directory. --- 31,38 ---- protected: class Config *configuration; ! CBM::Plan *plan; + std::string configurationFile; + public: /** Temporary directory. *************** *** 86,89 **** --- 90,97 ---- virtual int init(void); + virtual std::string Version(void); + + virtual CBM::Plan *Plan(void); + /** Get used configuration. \return A configuration instance (CBM::Config) *************** *** 192,195 **** --- 200,206 ---- */ virtual void display(void); + + virtual std::string Program(std::string pid); + /** Describe external programs. * Displays informations about external programs used in CompBenchmarks or in |
|
From: Frederic T. <xf...@us...> - 2007-01-30 20:13:34
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17378 Modified Files: CBM.pm CBM_wrap.cxx Log Message: API changes. Index: CBM.pm =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM.pm,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** CBM.pm 25 Jan 2007 20:39:25 -0000 1.16 --- CBM.pm 30 Jan 2007 20:03:34 -0000 1.17 *************** *** 313,316 **** --- 313,317 ---- } + *planNode = *CBMc::Config_planNode; *getStatus = *CBMc::Config_getStatus; *setStatus = *CBMc::Config_setStatus; *************** *** 362,365 **** --- 363,368 ---- *Download = *CBMc::System_Download; *init = *CBMc::System_init; + *Version = *CBMc::System_Version; + *Plan = *CBMc::System_Plan; *Config = *CBMc::System_Config; *storeConfiguration = *CBMc::System_storeConfiguration; *************** *** 383,386 **** --- 386,390 ---- *Chomp = *CBMc::System_Chomp; *display = *CBMc::System_display; + *Program = *CBMc::System_Program; *displayPrograms = *CBMc::System_displayPrograms; *exec = *CBMc::System_exec; *************** *** 514,518 **** --- 518,526 ---- *currentBenchmark = *CBMc::Plan_currentBenchmark; *nextIteration = *CBMc::Plan_nextIteration; + *stop = *CBMc::Plan_stop; + *XML = *CBMc::Plan_XML; + *reset = *CBMc::Plan_reset; *store = *CBMc::Plan_store; + *restore = *CBMc::Plan_restore; sub DESTROY { return unless $_[0]->isa('HASH'); *************** *** 548,551 **** --- 556,560 ---- *UO_force = *CBMc::UO_force; *UO_verbose = *CBMc::UO_verbose; + *UO_verbose_dl = *CBMc::UO_verbose_dl; *UO_fatal = *CBMc::UO_fatal; *H_XMLREADER = *CBMc::H_XMLREADER; Index: CBM_wrap.cxx =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM_wrap.cxx,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** CBM_wrap.cxx 25 Jan 2007 20:39:25 -0000 1.16 --- CBM_wrap.cxx 30 Jan 2007 20:03:34 -0000 1.17 *************** *** 1427,1450 **** /* -------- TYPES TABLE (BEGIN) -------- */ ! #define SWIGTYPE_p_Benchmark swig_types[0] ! #define SWIGTYPE_p_CBM__Benchmark swig_types[1] ! #define SWIGTYPE_p_CBM__Compiler swig_types[2] ! #define SWIGTYPE_p_CBM__CompilerSelector swig_types[3] ! #define SWIGTYPE_p_CBM__Config swig_types[4] ! #define SWIGTYPE_p_CBM__Package swig_types[5] ! #define SWIGTYPE_p_CBM__Plan swig_types[6] ! #define SWIGTYPE_p_CBM__System swig_types[7] ! #define SWIGTYPE_p_CBM__XMLAttribute swig_types[8] ! #define SWIGTYPE_p_CBM__XMLNode swig_types[9] ! #define SWIGTYPE_p_CBM__XMLReader swig_types[10] ! #define SWIGTYPE_p_Compiler swig_types[11] ! #define SWIGTYPE_p_CompilerOptions swig_types[12] ! #define SWIGTYPE_p_XMLNode swig_types[13] ! #define SWIGTYPE_p_char swig_types[14] ! #define SWIGTYPE_p_std__string swig_types[15] ! #define SWIGTYPE_p_std__vectorTstd__string_t swig_types[16] ! #define SWIGTYPE_p_time_t swig_types[17] ! static swig_type_info *swig_types[19]; ! static swig_module_info swig_module = {swig_types, 18, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) --- 1427,1449 ---- /* -------- TYPES TABLE (BEGIN) -------- */ ! #define SWIGTYPE_p_CBM__Benchmark swig_types[0] ! #define SWIGTYPE_p_CBM__Compiler swig_types[1] ! #define SWIGTYPE_p_CBM__CompilerSelector swig_types[2] ! #define SWIGTYPE_p_CBM__Config swig_types[3] ! #define SWIGTYPE_p_CBM__Package swig_types[4] ! #define SWIGTYPE_p_CBM__Plan swig_types[5] ! #define SWIGTYPE_p_CBM__System swig_types[6] ! #define SWIGTYPE_p_CBM__XMLAttribute swig_types[7] ! #define SWIGTYPE_p_CBM__XMLNode swig_types[8] ! #define SWIGTYPE_p_CBM__XMLReader swig_types[9] ! #define SWIGTYPE_p_Compiler swig_types[10] ! #define SWIGTYPE_p_CompilerOptions swig_types[11] ! #define SWIGTYPE_p_XMLNode swig_types[12] ! #define SWIGTYPE_p_char swig_types[13] ! #define SWIGTYPE_p_std__string swig_types[14] ! #define SWIGTYPE_p_std__vectorTstd__string_t swig_types[15] ! #define SWIGTYPE_p_time_t swig_types[16] ! static swig_type_info *swig_types[18]; ! static swig_module_info swig_module = {swig_types, 17, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) *************** *** 1519,1524 **** #include "Glue.h" #include "System/System.h" - #include "Benchmark/Package.h" #include "Benchmark/Benchmark.h" #include "Compiler/Compiler.h" #include "Base/XML.h" --- 1518,1523 ---- #include "Glue.h" #include "System/System.h" #include "Benchmark/Benchmark.h" + #include "Benchmark/Package.h" #include "Compiler/Compiler.h" #include "Base/XML.h" *************** *** 1749,1752 **** --- 1748,1754 ---- + #include <Benchmark/Benchmark.h> + + SWIGINTERN int SWIG_AsPtr_std_string SWIG_PERL_DECL_ARGS_2(SV * obj, std::string **val) *************** *** 1957,1960 **** --- 1959,1984 ---- + SWIGCLASS_STATIC int _wrap_UO_verbose_dl_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 '""CBM::UO_verbose_dl""' of type '""int""'"); + } + CBM::UO_verbose_dl = static_cast< int >(val); + } + fail: + return 1; + } + + + SWIGCLASS_STATIC int _wrap_UO_verbose_dl_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) { + MAGIC_PPERL + sv_setsv(sv,SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CBM::UO_verbose_dl))) ; + return 1; + } + + SWIGCLASS_STATIC int _wrap_UO_fatal_set(pTHX_ SV* sv, MAGIC * SWIGUNUSEDPARM(mg)) { MAGIC_PPERL *************** *** 2238,2242 **** CBM::Package *arg1 = (CBM::Package *) 0 ; int arg2 ; ! Benchmark *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; --- 2262,2266 ---- CBM::Package *arg1 = (CBM::Package *) 0 ; int arg2 ; ! CBM::Benchmark *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; *************** *** 2259,2264 **** } arg2 = static_cast< int >(val2); ! result = (Benchmark *)(arg1)->Benchmark(arg2); ! ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Benchmark, 0 | 0); argvi++ ; --- 2283,2288 ---- } arg2 = static_cast< int >(val2); ! result = (CBM::Benchmark *)(arg1)->Benchmark(arg2); ! ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CBM__Benchmark, 0 | SWIG_SHADOW); argvi++ ; *************** *** 2276,2280 **** CBM::Package *arg1 = (CBM::Package *) 0 ; std::string arg2 ; ! Benchmark *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; --- 2300,2304 ---- CBM::Package *arg1 = (CBM::Package *) 0 ; std::string arg2 ; ! CBM::Benchmark *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; *************** *** 2299,2304 **** if (SWIG_IsNewObj(res)) delete ptr; } ! result = (Benchmark *)(arg1)->Benchmark(arg2); ! ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Benchmark, 0 | 0); argvi++ ; --- 2323,2328 ---- if (SWIG_IsNewObj(res)) delete ptr; } ! result = (CBM::Benchmark *)(arg1)->Benchmark(arg2); ! ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CBM__Benchmark, 0 | SWIG_SHADOW); argvi++ ; *************** *** 6239,6242 **** --- 6263,6294 ---- + XS(_wrap_Config_planNode) { + { + CBM::Config *arg1 = (CBM::Config *) 0 ; + CBM::XMLNode *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: Config_planNode(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Config, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Config_planNode" "', argument " "1"" of type '" "CBM::Config *""'"); + } + arg1 = reinterpret_cast< CBM::Config * >(argp1); + result = (CBM::XMLNode *)(arg1)->planNode(); + ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CBM__XMLNode, 0 | SWIG_SHADOW); argvi++ ; + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } + } + + XS(_wrap_Config_getStatus) { { *************** *** 6780,6783 **** --- 6832,6891 ---- + XS(_wrap_System_Version) { + { + CBM::System *arg1 = (CBM::System *) 0 ; + std::string result; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: System_Version(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__System, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "System_Version" "', argument " "1"" of type '" "CBM::System *""'"); + } + arg1 = reinterpret_cast< CBM::System * >(argp1); + result = (arg1)->Version(); + ST(argvi) = SWIG_From_std_string SWIG_PERL_CALL_ARGS_1(static_cast< std::string >(result)); argvi++ ; + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } + } + + + XS(_wrap_System_Plan) { + { + CBM::System *arg1 = (CBM::System *) 0 ; + CBM::Plan *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: System_Plan(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__System, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "System_Plan" "', argument " "1"" of type '" "CBM::System *""'"); + } + arg1 = reinterpret_cast< CBM::System * >(argp1); + result = (CBM::Plan *)(arg1)->Plan(); + ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CBM__Plan, 0 | SWIG_SHADOW); argvi++ ; + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } + } + + XS(_wrap_System_Config) { { *************** *** 7687,7690 **** --- 7795,7838 ---- + XS(_wrap_System_Program) { + { + CBM::System *arg1 = (CBM::System *) 0 ; + std::string arg2 ; + std::string result; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: System_Program(self,pid);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__System, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "System_Program" "', argument " "1"" of type '" "CBM::System *""'"); + } + arg1 = reinterpret_cast< CBM::System * >(argp1); + { + std::string *ptr = (std::string *)0; + int res = SWIG_AsPtr_std_string SWIG_PERL_CALL_ARGS_2(ST(1), &ptr); + if (!SWIG_IsOK(res) || !ptr) { + SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "System_Program" "', argument " "2"" of type '" "std::string""'"); + } + arg2 = *ptr; + if (SWIG_IsNewObj(res)) delete ptr; + } + result = (arg1)->Program(arg2); + ST(argvi) = SWIG_From_std_string SWIG_PERL_CALL_ARGS_1(static_cast< std::string >(result)); argvi++ ; + + + XSRETURN(argvi); + fail: + + + SWIG_croak_null(); + } + } + + XS(_wrap_System_displayPrograms) { { *************** *** 9560,9563 **** --- 9708,9793 ---- + XS(_wrap_Plan_stop) { + { + CBM::Plan *arg1 = (CBM::Plan *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: Plan_stop(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Plan, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Plan_stop" "', argument " "1"" of type '" "CBM::Plan *""'"); + } + arg1 = reinterpret_cast< CBM::Plan * >(argp1); + (arg1)->stop(); + + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } + } + + + XS(_wrap_Plan_XML) { + { + CBM::Plan *arg1 = (CBM::Plan *) 0 ; + CBM::XMLNode *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: Plan_XML(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Plan, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Plan_XML" "', argument " "1"" of type '" "CBM::Plan *""'"); + } + arg1 = reinterpret_cast< CBM::Plan * >(argp1); + result = (CBM::XMLNode *)(arg1)->XML(); + ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CBM__XMLNode, 0 | SWIG_SHADOW); argvi++ ; + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } + } + + + XS(_wrap_Plan_reset) { + { + CBM::Plan *arg1 = (CBM::Plan *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: Plan_reset(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Plan, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Plan_reset" "', argument " "1"" of type '" "CBM::Plan *""'"); + } + arg1 = reinterpret_cast< CBM::Plan * >(argp1); + (arg1)->reset(); + + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } + } + + XS(_wrap_Plan_store) { { *************** *** 9588,9591 **** --- 9818,9859 ---- + XS(_wrap_Plan_restore) { + { + CBM::Plan *arg1 = (CBM::Plan *) 0 ; + CBM::XMLNode *arg2 = (CBM::XMLNode *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: Plan_restore(self,_planRootNode);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Plan, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Plan_restore" "', argument " "1"" of type '" "CBM::Plan *""'"); + } + arg1 = reinterpret_cast< CBM::Plan * >(argp1); + res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_CBM__XMLNode, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Plan_restore" "', argument " "2"" of type '" "CBM::XMLNode *""'"); + } + arg2 = reinterpret_cast< CBM::XMLNode * >(argp2); + result = (int)(arg1)->restore(arg2); + ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ; + + + XSRETURN(argvi); + fail: + + + SWIG_croak_null(); + } + } + + XS(_wrap_delete_Plan) { { *************** *** 9778,9782 **** /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */ - static swig_type_info _swigt__p_Benchmark = {"_p_Benchmark", "Benchmark *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_CBM__Benchmark = {"_p_CBM__Benchmark", "CBM::Benchmark *", 0, 0, (void*)"CBM::Benchmark", 0}; static swig_type_info _swigt__p_CBM__Compiler = {"_p_CBM__Compiler", "CBM::Compiler *", 0, 0, (void*)"CBM::Compiler", 0}; --- 10046,10049 ---- *************** *** 9798,9802 **** static swig_type_info *swig_type_initial[] = { - &_swigt__p_Benchmark, &_swigt__p_CBM__Benchmark, &_swigt__p_CBM__Compiler, --- 10065,10068 ---- *************** *** 9818,9822 **** }; - static swig_cast_info _swigc__p_Benchmark[] = { {&_swigt__p_Benchmark, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_CBM__Benchmark[] = { {&_swigt__p_CBM__Benchmark, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_CBM__Compiler[] = { {&_swigt__p_CBM__Compiler, 0, 0, 0},{0, 0, 0, 0}}; --- 10084,10087 ---- *************** *** 9838,9842 **** static swig_cast_info *swig_cast_initial[] = { - _swigc__p_Benchmark, _swigc__p_CBM__Benchmark, _swigc__p_CBM__Compiler, --- 10103,10106 ---- *************** *** 9872,9875 **** --- 10136,10140 ---- { "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::UO_verbose_dl", MAGIC_CLASS _wrap_UO_verbose_dl_set, MAGIC_CLASS _wrap_UO_verbose_dl_get,0 }, { "CBMc::UO_fatal", MAGIC_CLASS _wrap_UO_fatal_set, MAGIC_CLASS _wrap_UO_fatal_get,0 }, { "CBMc::cbmSystem", MAGIC_CLASS _wrap_cbmSystem_set, MAGIC_CLASS _wrap_cbmSystem_get,&SWIGTYPE_p_CBM__System }, *************** *** 9950,9953 **** --- 10215,10219 ---- {"CBMc::delete_XMLReader", _wrap_delete_XMLReader}, {"CBMc::new_Config", _wrap_new_Config}, + {"CBMc::Config_planNode", _wrap_Config_planNode}, {"CBMc::Config_getStatus", _wrap_Config_getStatus}, {"CBMc::Config_setStatus", _wrap_Config_setStatus}, *************** *** 9964,9967 **** --- 10230,10235 ---- {"CBMc::delete_Config", _wrap_delete_Config}, {"CBMc::System_init", _wrap_System_init}, + {"CBMc::System_Version", _wrap_System_Version}, + {"CBMc::System_Plan", _wrap_System_Plan}, {"CBMc::System_Config", _wrap_System_Config}, {"CBMc::System_storeConfiguration", _wrap_System_storeConfiguration}, *************** *** 9985,9988 **** --- 10253,10257 ---- {"CBMc::System_Chomp", _wrap_System_Chomp}, {"CBMc::System_display", _wrap_System_display}, + {"CBMc::System_Program", _wrap_System_Program}, {"CBMc::System_displayPrograms", _wrap_System_displayPrograms}, {"CBMc::System_exec", _wrap_System_exec}, *************** *** 10026,10030 **** --- 10295,10303 ---- {"CBMc::Plan_currentBenchmark", _wrap_Plan_currentBenchmark}, {"CBMc::Plan_nextIteration", _wrap_Plan_nextIteration}, + {"CBMc::Plan_stop", _wrap_Plan_stop}, + {"CBMc::Plan_XML", _wrap_Plan_XML}, + {"CBMc::Plan_reset", _wrap_Plan_reset}, {"CBMc::Plan_store", _wrap_Plan_store}, + {"CBMc::Plan_restore", _wrap_Plan_restore}, {"CBMc::delete_Plan", _wrap_delete_Plan}, {"CBMc::Init", _wrap_Init}, |
|
From: Frederic T. <xf...@us...> - 2007-01-30 20:13:32
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14657 Modified Files: Makefile.am Log Message: LibUI added. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile.am 25 Jan 2007 20:35:38 -0000 1.10 --- Makefile.am 30 Jan 2007 19:58:56 -0000 1.11 *************** *** 7,11 **** 03-CBMCompilerSelector-public.pl \ 04-Config.pl \ ! 05-Plan.pl tests = $(top_srcdir)/CBM-PI/t/00-Glue.pl \ --- 7,12 ---- 03-CBMCompilerSelector-public.pl \ 04-Config.pl \ ! 05-Plan.pl \ ! 06-CBM-LibUI.pl tests = $(top_srcdir)/CBM-PI/t/00-Glue.pl \ *************** *** 16,23 **** $(top_srcdir)/CBM-PI/t/03-CBMCompilerSelector-public.pl \ $(top_srcdir)/CBM-PI/t/04-Config.pl \ ! $(top_srcdir)/CBM-PI/t/05-Plan.pl dist_noinst_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:$(top_srcdir)/CBM-PI/t/lib', '$(INST_ARCHLIB)')" $(tests) \ No newline at end of file --- 17,25 ---- $(top_srcdir)/CBM-PI/t/03-CBMCompilerSelector-public.pl \ $(top_srcdir)/CBM-PI/t/04-Config.pl \ ! $(top_srcdir)/CBM-PI/t/05-Plan.pl \ ! $(top_srcdir)/CBM-PI/t/06-CBM-LibUI.pl dist_noinst_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:$(top_srcdir)/CBM-PI/t/lib', '$(INST_ARCHLIB):$(top_srcdir)/libcompbenchmarks/share/perl')" $(tests) \ No newline at end of file |
|
From: Frederic T. <xf...@us...> - 2007-01-30 19:11:51
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25467 Added Files: 06-CBM-LibUI.pl Log Message: First import. --- NEW FILE: 06-CBM-LibUI.pl --- #!/usr/bin/perl -w -I .. # ----------------------------------------------------------------------------- # $Id: 06-CBM-LibUI.pl,v 1.1 2007/01/30 19:11:44 xfred Exp $ # # This is free software. # For details, see the GNU Public License in the COPYING file, or # Look http://www.fsf.org # ----------------------------------------------------------------------------- use strict; use CBM::LibUI; use Test::Simple tests => 225; my $EXPECTED_PACKAGES = 7; my $EXPECTED_BENCHMARKS = 61; my $libui; our $top_srcdir; my $P; sub test_libui { ok(defined($libui)); ok(defined($libui->cbmSystem())); my @PACKAGES = $libui->Packages(); foreach(@PACKAGES) { ok(defined($_)); ok(defined($_->Name())); } ok((@PACKAGES)+0 == $EXPECTED_PACKAGES); my @BENCHMARKS = $libui->Benchmarks(); foreach(@BENCHMARKS) { ok(defined($_)); ok(defined($_->Name())); } ok((@BENCHMARKS)+0 == $EXPECTED_BENCHMARKS); my %host = $libui->Host(); my @HPARAMS = ('os', 'os_version', 'host_id', 'hostname', 'processor_name', 'processor_mhz', 'processor_cache', 'processor_number', 'arch'); foreach(@HPARAMS) { ok(defined($host{$_}), "$_ is defined in host description"); ok($host{$_} ne "", "$_ is not empty in host descrption"); ok(!($host{$_} =~ /^\s*$/)); } } sub test_libui_programs { my %progs = $libui->Programs(); my %used; my @XPROGRAMS = qw ( BZIP2 CUT DD DIALOG GREP GZIP HEAD MAKE MKDIR PATCH RM TAIL TAR UNZIP WGET ZCAT CAT PERL ); foreach(@XPROGRAMS) { ok(defined($progs{$_})); ok(-x $progs{$_}); $used{$progs{$_}}++; } foreach(keys %used) { ok($used{$_} == 1); } ok(((keys %progs)+0)==(@XPROGRAMS+0)); } sub test_libui_plan { my $plan = $libui->Plan(); $plan->reset(); ok($plan->compilerNumber()==0); ok($plan->compilerOptionNumber()==0); ok($plan->benchmarkNumber()==0); } $libui=CBM::LibUI->new(); $libui->cbmSystem(); test_libui(); test_libui_programs(); test_libui_plan(); |
|
From: Frederic T. <xf...@us...> - 2007-01-30 19:11:14
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/perl/CBM In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv24762 Added Files: LibUI.pm Log Message: First import. --- NEW FILE: LibUI.pm --- # ----------------------------------------------------------------------------- # $Id: LibUI.pm,v 1.1 2007/01/30 19:10:54 xfred Exp $ # # Description : High-level API for handling command-line arguments. # # This is free software. # For details, see the GNU Public License in the COPYING file, or # Look http://www.fsf.org # ----------------------------------------------------------------------------- package CBM::LibUI; use warnings; use strict; use CBM; my $sys; use vars qw($VERSION @ISA @EXPORT_OK); $VERSION="0.5.0"; sub new { my $class = shift; my $self = {}; $sys = CBM::Init(); bless($self, $class); return($self); } sub cbmSystem { my $self = shift; # my $sys = $self->{system}; return($sys); } sub Version { my $self = shift; return($sys->Version()); } sub Host { my $self = shift; my %result; $result{os}=$sys->os(); $result{os_version}=$sys->os_version(); $result{host_id}=$sys->hostid(); $result{hostname}=$sys->hostname(); $result{processor_name}=$sys->processor_name(); $result{processor_mhz}=$sys->processor_mhz(); $result{processor_cache}=$sys->processor_cache(); $result{processor_number}=$sys->processor_number(); $result{arch}=$sys->arch(); return(%result); } sub Programs { my $self = shift; my %result; my @PROGRAMS = qw ( BZIP2 CUT DD DIALOG GREP GZIP HEAD MAKE MKDIR PATCH RM TAIL TAR UNZIP WGET ZCAT CAT PERL ); my $p; foreach $p(@PROGRAMS) { $result{$p}=$sys->Program($p); } return(%result); } sub Packages { my $self = shift; my @results; my $i; my $P; my $n = $sys->packageNumber(); for($i=0;$i<$n;$i++) { $P=$sys->Package($i); push(@results, $P); } return(@results); } sub Benchmarks { my $self = shift; my $package_id = shift; my @results; my $i; if (!defined($package_id)) { my @P = $self->Packages(); my $n = $sys->packageNumber(); for($i=0; $i<$n; $i++) { my @r = $self->Benchmarks($sys->Package($i)->Name()); foreach(@r) { push(@results, $_); } } } else { my $P = $sys->Package($package_id); my $B; my $n = $P->benchmarkNumber(); for($i=0;$i<$n;$i++) { $B=$P->Benchmark($i); push(@results, $B); } } return(@results); } sub Plan { my $self = shift; return($sys->Plan()); } sub DESTROY { my $self = shift; # my $sys = $self->{system}; # $sys->done(); } 1; __END__ |
|
From: Frederic T. <xf...@us...> - 2007-01-30 19:10:02
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/perl/CBM In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv24310/CBM Log Message: Directory /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/perl/CBM added to the repository |
|
From: Frederic T. <xf...@us...> - 2007-01-30 19:09:26
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/perl In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv24128/perl Log Message: Directory /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/perl added to the repository |
|
From: Frederic T. <xf...@us...> - 2007-01-26 13:10:04
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5287 Modified Files: 02-CBMSystem-benchs.pl 05-Plan.pl Log Message: More tests. Index: 02-CBMSystem-benchs.pl =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/02-CBMSystem-benchs.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** 02-CBMSystem-benchs.pl 21 Jan 2007 21:27:51 -0000 1.6 --- 02-CBMSystem-benchs.pl 26 Jan 2007 13:09:57 -0000 1.7 *************** *** 9,14 **** my @benchmarks = `cat $top_srcdir/../../SupportedBenchmarks/benchmarks.list | grep -v '^#' | cut -f1 -d':'`; chomp(@benchmarks); ! plan tests => ((@benchmarks+0)*59); my $sys; --- 9,24 ---- my @benchmarks = `cat $top_srcdir/../../SupportedBenchmarks/benchmarks.list | grep -v '^#' | cut -f1 -d':'`; + my @a_packages = `cat $top_srcdir/../../SupportedBenchmarks/benchmarks.list | grep -v '^#' | cut -f1 -d':' | cut -f1 -d'-'`; + chomp(@benchmarks); ! chomp(@a_packages); ! ! my %packages; ! foreach(@a_packages) { ! $packages{$_}=1; ! } ! my @packages = keys %packages; ! ! plan tests => ((@benchmarks+0)*61); my $sys; *************** *** 22,26 **** foreach(@benchmarks) { - print ">$_\n"; $b = $sys->Benchmark($_); ok(defined($b), "loading $_"); --- 32,35 ---- *************** *** 32,36 **** next; } ! $p=$b->Package(); ok(defined($p), "package for $_"); --- 41,45 ---- next; } ! $bm_hash{$_}=1; $p=$b->Package(); ok(defined($p), "package for $_"); *************** *** 80,82 **** --- 89,110 ---- } + my $i; + my $n; + my $pid; + + foreach $pid (@packages) { + $p=$sys->Package($pid); + + $n=$p->benchmarkNumber(); + for($i=0;$i<$n;$i++) { + $b=$p->Benchmark($i); + ok(defined($b->Name())); + $bm_hash{$b->Name()}++; + } + } + + foreach(keys %bm_hash) { + ok($bm_hash{$_}==2, "hash $_ is 2 ($bm_hash{$_})"); + } + $sys->done(); Index: 05-Plan.pl =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/05-Plan.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** 05-Plan.pl 25 Jan 2007 22:09:39 -0000 1.4 --- 05-Plan.pl 26 Jan 2007 13:09:57 -0000 1.5 *************** *** 6,10 **** require "libtest.pl"; ! use Test::Simple tests => 136; my $sys; --- 6,10 ---- require "libtest.pl"; ! use Test::Simple tests => 137; my $sys; *************** *** 114,118 **** $X=$R->read("$top_srcdir/reference/plan.xml"); ! $P->restore($X); my $x = `cat $top_srcdir/reference/plan.xml`; --- 114,118 ---- $X=$R->read("$top_srcdir/reference/plan.xml"); ! ok($P->restore($X) == 1); my $x = `cat $top_srcdir/reference/plan.xml`; |
