[Compbench-devel] CompBenchmarks++/CBM-PI CBM.i, 1.10, 1.11 CBM.pm, 1.17, 1.18 CBM_wrap.cxx, 1.17,
Brought to you by:
xfred
Menu
▾
▴
[Compbench-devel] CompBenchmarks++/CBM-PI CBM.i, 1.10, 1.11 CBM.pm, 1.17, 1.18 CBM_wrap.cxx, 1.17, 1.18
|
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" |
