[Compbench-devel] CompBenchmarks++/CBM-PI CBM.pm, 1.18, 1.19 CBM_wrap.cxx, 1.18, 1.19
Brought to you by:
xfred
From: Frederic T. <xf...@us...> - 2007-02-15 19:03:37
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22984 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.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** CBM.pm 5 Feb 2007 20:03:22 -0000 1.18 --- CBM.pm 15 Feb 2007 19:03:24 -0000 1.19 *************** *** 55,58 **** --- 55,99 ---- *c_str = *CBMc::c_str; + ############# Class : CBM::BenchmarkCached ############## + + package CBM::BenchmarkCached; + use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); + @ISA = qw( CBM ); + %OWNER = (); + %ITERATORS = (); + *swig_id_get = *CBMc::BenchmarkCached_id_get; + *swig_id_set = *CBMc::BenchmarkCached_id_set; + *swig_instance_get = *CBMc::BenchmarkCached_instance_get; + *swig_instance_set = *CBMc::BenchmarkCached_instance_set; + sub new { + my $pkg = shift; + my $self = CBMc::new_BenchmarkCached(@_); + bless $self, $pkg if defined($self); + } + + sub DESTROY { + return unless $_[0]->isa('HASH'); + my $self = tied(%{$_[0]}); + return unless defined $self; + delete $ITERATORS{$self}; + if (exists $OWNER{$self}) { + CBMc::delete_BenchmarkCached($self); + delete $OWNER{$self}; + } + } + + sub DISOWN { + my $self = shift; + my $ptr = tied(%$self); + delete $OWNER{$ptr}; + } + + sub ACQUIRE { + my $self = shift; + my $ptr = tied(%$self); + $OWNER{$ptr} = 1; + } + + ############# Class : CBM::Package ############## *************** *** 71,74 **** --- 112,116 ---- *Tested = *CBMc::Package_Tested; *Benchmarked = *CBMc::Package_Benchmarked; + *removeCached = *CBMc::Package_removeCached; *hasPatch = *CBMc::Package_hasPatch; *resetContext = *CBMc::Package_resetContext; *************** *** 107,110 **** --- 149,153 ---- *Uninstall = *CBMc::Package_Uninstall; *getStatus = *CBMc::Package_getStatus; + *getStatusStr = *CBMc::Package_getStatusStr; sub DESTROY { return unless $_[0]->isa('HASH'); *************** *** 139,142 **** --- 182,186 ---- %ITERATORS = (); *Package = *CBMc::Benchmark_Package; + *setPlan = *CBMc::Benchmark_setPlan; *Name = *CBMc::Benchmark_Name; *Comments = *CBMc::Benchmark_Comments; *************** *** 423,429 **** *Split = *CBMc::System_Split; *Chomp = *CBMc::System_Chomp; - *display = *CBMc::System_display; *Program = *CBMc::System_Program; - *displayPrograms = *CBMc::System_displayPrograms; *exec = *CBMc::System_exec; *md5 = *CBMc::System_md5; --- 467,471 ---- *************** *** 461,470 **** %OWNER = (); %ITERATORS = (); ! *display = *CBMc::Compiler_display; *compiler = *CBMc::Compiler_compiler; ! *compilerName = *CBMc::Compiler_compilerName; ! *compilerVersion = *CBMc::Compiler_compilerVersion; *Binary = *CBMc::Compiler_Binary; ! *language = *CBMc::Compiler_language; sub DESTROY { return unless $_[0]->isa('HASH'); --- 503,512 ---- %OWNER = (); %ITERATORS = (); ! *setPlan = *CBMc::Compiler_setPlan; *compiler = *CBMc::Compiler_compiler; ! *Name = *CBMc::Compiler_Name; ! *Version = *CBMc::Compiler_Version; *Binary = *CBMc::Compiler_Binary; ! *Language = *CBMc::Compiler_Language; sub DESTROY { return unless $_[0]->isa('HASH'); *************** *** 604,607 **** $cbmSystem= \%__cbmSystem_hash; bless $cbmSystem, CBM::System; ! *CBM_PLAN = *CBMc::CBM_PLAN; 1; --- 646,649 ---- $cbmSystem= \%__cbmSystem_hash; bless $cbmSystem, CBM::System; ! *H_CBM_PLAN = *CBMc::H_CBM_PLAN; 1; Index: CBM_wrap.cxx =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM_wrap.cxx,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** CBM_wrap.cxx 5 Feb 2007 20:03:22 -0000 1.18 --- CBM_wrap.cxx 15 Feb 2007 19:03:24 -0000 1.19 *************** *** 1428,1450 **** #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__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) --- 1428,1452 ---- #define SWIGTYPE_p_CBM__Benchmark swig_types[0] ! #define SWIGTYPE_p_CBM__BenchmarkCached 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__Result swig_types[7] ! #define SWIGTYPE_p_CBM__System swig_types[8] ! #define SWIGTYPE_p_CBM__XMLAttribute swig_types[9] ! #define SWIGTYPE_p_CBM__XMLNode swig_types[10] ! #define SWIGTYPE_p_CBM__XMLReader swig_types[11] ! #define SWIGTYPE_p_Compiler swig_types[12] ! #define SWIGTYPE_p_CompilerOptions swig_types[13] ! #define SWIGTYPE_p_XMLNode swig_types[14] ! #define SWIGTYPE_p_char swig_types[15] ! #define SWIGTYPE_p_std__string swig_types[16] ! #define SWIGTYPE_p_std__vectorTCBM__BenchmarkCached_p_t swig_types[17] ! #define SWIGTYPE_p_std__vectorTstd__string_t swig_types[18] ! #define SWIGTYPE_p_time_t swig_types[19] ! static swig_type_info *swig_types[21]; ! static swig_module_info swig_module = {swig_types, 20, 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) *************** *** 1798,1801 **** --- 1800,1809 ---- + #include <Plan/Plan.h> + + + #include <Plan/Plan.h> + + SWIGINTERN int SWIG_AsVal_unsigned_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, unsigned long *val) *************** *** 1856,1859 **** --- 1864,1873 ---- } + + #include <Plan/Plan.h> + + + #include <Benchmark/Benchmark.h> + #ifdef PERL_OBJECT #define MAGIC_CLASS _wrap_CBM_var:: *************** *** 2063,2066 **** --- 2077,2303 ---- + XS(_wrap_BenchmarkCached_id_set) { + { + CBM::BenchmarkCached *arg1 = (CBM::BenchmarkCached *) 0 ; + std::string *arg2 = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 = SWIG_OLDOBJ ; + int argvi = 0; + dXSARGS; + + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: BenchmarkCached_id_set(self,id);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__BenchmarkCached, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BenchmarkCached_id_set" "', argument " "1"" of type '" "CBM::BenchmarkCached *""'"); + } + arg1 = reinterpret_cast< CBM::BenchmarkCached * >(argp1); + { + std::string *ptr = (std::string *)0; + res2 = SWIG_AsPtr_std_string SWIG_PERL_CALL_ARGS_2(ST(1), &ptr); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "BenchmarkCached_id_set" "', argument " "2"" of type '" "std::string const &""'"); + } + if (!ptr) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "BenchmarkCached_id_set" "', argument " "2"" of type '" "std::string const &""'"); + } + arg2 = ptr; + } + if (arg1) (arg1)->id = *arg2; + + + + if (SWIG_IsNewObj(res2)) delete arg2; + XSRETURN(argvi); + fail: + + if (SWIG_IsNewObj(res2)) delete arg2; + SWIG_croak_null(); + } + } + + + XS(_wrap_BenchmarkCached_id_get) { + { + CBM::BenchmarkCached *arg1 = (CBM::BenchmarkCached *) 0 ; + std::string *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: BenchmarkCached_id_get(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__BenchmarkCached, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BenchmarkCached_id_get" "', argument " "1"" of type '" "CBM::BenchmarkCached *""'"); + } + arg1 = reinterpret_cast< CBM::BenchmarkCached * >(argp1); + { + std::string const &_result_ref = ((arg1)->id); + result = (std::string *) &_result_ref; + } + 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_BenchmarkCached_instance_set) { + { + CBM::BenchmarkCached *arg1 = (CBM::BenchmarkCached *) 0 ; + CBM::Benchmark *arg2 = (CBM::Benchmark *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: BenchmarkCached_instance_set(self,instance);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__BenchmarkCached, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BenchmarkCached_instance_set" "', argument " "1"" of type '" "CBM::BenchmarkCached *""'"); + } + arg1 = reinterpret_cast< CBM::BenchmarkCached * >(argp1); + res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_CBM__Benchmark, SWIG_POINTER_DISOWN | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "BenchmarkCached_instance_set" "', argument " "2"" of type '" "CBM::Benchmark *""'"); + } + arg2 = reinterpret_cast< CBM::Benchmark * >(argp2); + if (arg1) (arg1)->instance = arg2; + + + + + XSRETURN(argvi); + fail: + + + SWIG_croak_null(); + } + } + + + XS(_wrap_BenchmarkCached_instance_get) { + { + CBM::BenchmarkCached *arg1 = (CBM::BenchmarkCached *) 0 ; + CBM::Benchmark *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: BenchmarkCached_instance_get(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__BenchmarkCached, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BenchmarkCached_instance_get" "', argument " "1"" of type '" "CBM::BenchmarkCached *""'"); + } + arg1 = reinterpret_cast< CBM::BenchmarkCached * >(argp1); + result = (CBM::Benchmark *) ((arg1)->instance); + ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CBM__Benchmark, 0 | SWIG_SHADOW); argvi++ ; + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } + } + + + XS(_wrap_new_BenchmarkCached) { + { + CBM::BenchmarkCached *result = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 0) || (items > 0)) { + SWIG_croak("Usage: new_BenchmarkCached();"); + } + result = (CBM::BenchmarkCached *)new CBM::BenchmarkCached(); + ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CBM__BenchmarkCached, SWIG_OWNER | SWIG_SHADOW); argvi++ ; + XSRETURN(argvi); + fail: + SWIG_croak_null(); + } + } + + + XS(_wrap_delete_BenchmarkCached) { + { + CBM::BenchmarkCached *arg1 = (CBM::BenchmarkCached *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: delete_BenchmarkCached(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__BenchmarkCached, SWIG_POINTER_DISOWN | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_BenchmarkCached" "', argument " "1"" of type '" "CBM::BenchmarkCached *""'"); + } + arg1 = reinterpret_cast< CBM::BenchmarkCached * >(argp1); + delete arg1; + + + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } + } + + + XS(_wrap_Package_removeCached) { + { + CBM::Package *arg1 = (CBM::Package *) 0 ; + CBM::Benchmark *arg2 = (CBM::Benchmark *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: Package_removeCached(self,_benchmark);"); + } + 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_removeCached" "', argument " "1"" of type '" "CBM::Package *""'"); + } + arg1 = reinterpret_cast< CBM::Package * >(argp1); + res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_CBM__Benchmark, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Package_removeCached" "', argument " "2"" of type '" "CBM::Benchmark *""'"); + } + arg2 = reinterpret_cast< CBM::Benchmark * >(argp2); + (arg1)->removeCached(arg2); + + + + XSRETURN(argvi); + fail: + + + SWIG_croak_null(); + } + } + + XS(_wrap_Package_hasPatch) { { *************** *** 2168,2172 **** result = (CBM::BenchmarkVector *) &_result_ref; } ! ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTstd__string_t, 0 | 0); argvi++ ; XSRETURN(argvi); --- 2405,2409 ---- result = (CBM::BenchmarkVector *) &_result_ref; } ! ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTCBM__BenchmarkCached_p_t, 0 | 0); argvi++ ; XSRETURN(argvi); *************** *** 4172,4175 **** --- 4409,4440 ---- + XS(_wrap_Package_getStatusStr) { + { + CBM::Package *arg1 = (CBM::Package *) 0 ; + std::string result; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: Package_getStatusStr(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_getStatusStr" "', argument " "1"" of type '" "CBM::Package *""'"); + } + arg1 = reinterpret_cast< CBM::Package * >(argp1); + result = (arg1)->getStatusStr(); + 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_delete_Package) { { *************** *** 4228,4231 **** --- 4493,4543 ---- + XS(_wrap_Benchmark_setPlan) { + { + CBM::Benchmark *arg1 = (CBM::Benchmark *) 0 ; + CBM::Plan *arg2 = (CBM::Plan *) 0 ; + int arg3 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + int val3 ; + int ecode3 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 3) || (items > 3)) { + SWIG_croak("Usage: Benchmark_setPlan(self,_plan,modifyPlanObject);"); + } + 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_setPlan" "', argument " "1"" of type '" "CBM::Benchmark *""'"); + } + arg1 = reinterpret_cast< CBM::Benchmark * >(argp1); + res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_CBM__Plan, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Benchmark_setPlan" "', argument " "2"" of type '" "CBM::Plan *""'"); + } + arg2 = reinterpret_cast< CBM::Plan * >(argp2); + ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Benchmark_setPlan" "', argument " "3"" of type '" "int""'"); + } + arg3 = static_cast< int >(val3); + (arg1)->setPlan(arg2,arg3); + + + + + XSRETURN(argvi); + fail: + + + + SWIG_croak_null(); + } + } + + XS(_wrap_Benchmark_Name) { { *************** *** 8030,8060 **** - XS(_wrap_System_display) { - { - 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_display(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_display" "', argument " "1"" of type '" "CBM::System *""'"); - } - arg1 = reinterpret_cast< CBM::System * >(argp1); - (arg1)->display(); - - - XSRETURN(argvi); - fail: - - SWIG_croak_null(); - } - } - - XS(_wrap_System_Program) { { --- 8342,8345 ---- *************** *** 8097,8127 **** - XS(_wrap_System_displayPrograms) { - { - 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_displayPrograms(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_displayPrograms" "', argument " "1"" of type '" "CBM::System *""'"); - } - arg1 = reinterpret_cast< CBM::System * >(argp1); - (arg1)->displayPrograms(); - - - XSRETURN(argvi); - fail: - - SWIG_croak_null(); - } - } - - XS(_wrap_System_exec) { { --- 8382,8385 ---- *************** *** 8732,8752 **** ! XS(_wrap_Compiler_display) { { CBM::Compiler *arg1 = (CBM::Compiler *) 0 ; void *argp1 = 0 ; int res1 = 0 ; int argvi = 0; dXSARGS; ! if ((items < 1) || (items > 1)) { ! SWIG_croak("Usage: Compiler_display(self);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Compiler, 0 | 0 ); if (!SWIG_IsOK(res1)) { ! SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Compiler_display" "', argument " "1"" of type '" "CBM::Compiler *""'"); } arg1 = reinterpret_cast< CBM::Compiler * >(argp1); ! (arg1)->display(); --- 8990,9028 ---- ! XS(_wrap_Compiler_setPlan) { { CBM::Compiler *arg1 = (CBM::Compiler *) 0 ; + CBM::Plan *arg2 = (CBM::Plan *) 0 ; + int arg3 ; void *argp1 = 0 ; int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + int val3 ; + int ecode3 = 0 ; int argvi = 0; dXSARGS; ! if ((items < 3) || (items > 3)) { ! SWIG_croak("Usage: Compiler_setPlan(self,_plan,modifyPlanObject);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Compiler, 0 | 0 ); if (!SWIG_IsOK(res1)) { ! SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Compiler_setPlan" "', argument " "1"" of type '" "CBM::Compiler *""'"); } arg1 = reinterpret_cast< CBM::Compiler * >(argp1); ! res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_CBM__Plan, 0 | 0 ); ! if (!SWIG_IsOK(res2)) { ! SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Compiler_setPlan" "', argument " "2"" of type '" "CBM::Plan *""'"); ! } ! arg2 = reinterpret_cast< CBM::Plan * >(argp2); ! ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val3); ! if (!SWIG_IsOK(ecode3)) { ! SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Compiler_setPlan" "', argument " "3"" of type '" "int""'"); ! } ! arg3 = static_cast< int >(val3); ! (arg1)->setPlan(arg2,arg3); ! ! *************** *** 8754,8757 **** --- 9030,9035 ---- fail: + + SWIG_croak_null(); } *************** *** 8787,8791 **** ! XS(_wrap_Compiler_compilerName) { { CBM::Compiler *arg1 = (CBM::Compiler *) 0 ; --- 9065,9069 ---- ! XS(_wrap_Compiler_Name) { { CBM::Compiler *arg1 = (CBM::Compiler *) 0 ; *************** *** 8797,8808 **** if ((items < 1) || (items > 1)) { ! SWIG_croak("Usage: Compiler_compilerName(self);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Compiler, 0 | 0 ); if (!SWIG_IsOK(res1)) { ! SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Compiler_compilerName" "', argument " "1"" of type '" "CBM::Compiler *""'"); } arg1 = reinterpret_cast< CBM::Compiler * >(argp1); ! result = (arg1)->compilerName(); ST(argvi) = SWIG_From_std_string SWIG_PERL_CALL_ARGS_1(static_cast< std::string >(result)); argvi++ ; --- 9075,9086 ---- if ((items < 1) || (items > 1)) { ! SWIG_croak("Usage: Compiler_Name(self);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Compiler, 0 | 0 ); if (!SWIG_IsOK(res1)) { ! SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Compiler_Name" "', argument " "1"" of type '" "CBM::Compiler *""'"); } arg1 = reinterpret_cast< CBM::Compiler * >(argp1); ! result = (arg1)->Name(); ST(argvi) = SWIG_From_std_string SWIG_PERL_CALL_ARGS_1(static_cast< std::string >(result)); argvi++ ; *************** *** 8815,8819 **** ! XS(_wrap_Compiler_compilerVersion) { { CBM::Compiler *arg1 = (CBM::Compiler *) 0 ; --- 9093,9097 ---- ! XS(_wrap_Compiler_Version) { { CBM::Compiler *arg1 = (CBM::Compiler *) 0 ; *************** *** 8825,8836 **** if ((items < 1) || (items > 1)) { ! SWIG_croak("Usage: Compiler_compilerVersion(self);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Compiler, 0 | 0 ); if (!SWIG_IsOK(res1)) { ! SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Compiler_compilerVersion" "', argument " "1"" of type '" "CBM::Compiler *""'"); } arg1 = reinterpret_cast< CBM::Compiler * >(argp1); ! result = (arg1)->compilerVersion(); ST(argvi) = SWIG_From_std_string SWIG_PERL_CALL_ARGS_1(static_cast< std::string >(result)); argvi++ ; --- 9103,9114 ---- if ((items < 1) || (items > 1)) { ! SWIG_croak("Usage: Compiler_Version(self);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Compiler, 0 | 0 ); if (!SWIG_IsOK(res1)) { ! SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Compiler_Version" "', argument " "1"" of type '" "CBM::Compiler *""'"); } arg1 = reinterpret_cast< CBM::Compiler * >(argp1); ! result = (arg1)->Version(); ST(argvi) = SWIG_From_std_string SWIG_PERL_CALL_ARGS_1(static_cast< std::string >(result)); argvi++ ; *************** *** 8871,8875 **** ! XS(_wrap_Compiler_language) { { CBM::Compiler *arg1 = (CBM::Compiler *) 0 ; --- 9149,9153 ---- ! XS(_wrap_Compiler_Language) { { CBM::Compiler *arg1 = (CBM::Compiler *) 0 ; *************** *** 8881,8892 **** if ((items < 1) || (items > 1)) { ! SWIG_croak("Usage: Compiler_language(self);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Compiler, 0 | 0 ); if (!SWIG_IsOK(res1)) { ! SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Compiler_language" "', argument " "1"" of type '" "CBM::Compiler *""'"); } arg1 = reinterpret_cast< CBM::Compiler * >(argp1); ! result = (char *)(arg1)->language(); ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ; --- 9159,9170 ---- if ((items < 1) || (items > 1)) { ! SWIG_croak("Usage: Compiler_Language(self);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Compiler, 0 | 0 ); if (!SWIG_IsOK(res1)) { ! SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Compiler_Language" "', argument " "1"" of type '" "CBM::Compiler *""'"); } arg1 = reinterpret_cast< CBM::Compiler * >(argp1); ! result = (char *)(arg1)->Language(); ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ; *************** *** 10309,10312 **** --- 10587,10591 ---- 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__BenchmarkCached = {"_p_CBM__BenchmarkCached", "CBM::BenchmarkCached *", 0, 0, (void*)"CBM::BenchmarkCached", 0}; static swig_type_info _swigt__p_CBM__Compiler = {"_p_CBM__Compiler", "CBM::Compiler *", 0, 0, (void*)"CBM::Compiler", 0}; static swig_type_info _swigt__p_CBM__CompilerSelector = {"_p_CBM__CompilerSelector", "CBM::CompilerSelector *", 0, 0, (void*)"CBM::CompilerSelector", 0}; *************** *** 10324,10327 **** --- 10603,10607 ---- static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_std__string = {"_p_std__string", "std::string *", 0, 0, (void*)0, 0}; + static swig_type_info _swigt__p_std__vectorTCBM__BenchmarkCached_p_t = {"_p_std__vectorTCBM__BenchmarkCached_p_t", "std::vector<CBM::BenchmarkCached * > *|CBM::BenchmarkVector *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_std__vectorTstd__string_t = {"_p_std__vectorTstd__string_t", "std::vector<std::string > *|CBM::PackageVector *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_time_t = {"_p_time_t", "time_t *", 0, 0, (void*)0, 0}; *************** *** 10329,10332 **** --- 10609,10613 ---- static swig_type_info *swig_type_initial[] = { &_swigt__p_CBM__Benchmark, + &_swigt__p_CBM__BenchmarkCached, &_swigt__p_CBM__Compiler, &_swigt__p_CBM__CompilerSelector, *************** *** 10344,10347 **** --- 10625,10629 ---- &_swigt__p_char, &_swigt__p_std__string, + &_swigt__p_std__vectorTCBM__BenchmarkCached_p_t, &_swigt__p_std__vectorTstd__string_t, &_swigt__p_time_t, *************** *** 10349,10352 **** --- 10631,10635 ---- 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__BenchmarkCached[] = { {&_swigt__p_CBM__BenchmarkCached, 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}}; static swig_cast_info _swigc__p_CBM__CompilerSelector[] = { {&_swigt__p_CBM__CompilerSelector, 0, 0, 0},{0, 0, 0, 0}}; *************** *** 10364,10367 **** --- 10647,10651 ---- static swig_cast_info _swigc__p_char[] = { {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_std__string[] = { {&_swigt__p_std__string, 0, 0, 0},{0, 0, 0, 0}}; + static swig_cast_info _swigc__p_std__vectorTCBM__BenchmarkCached_p_t[] = { {&_swigt__p_std__vectorTCBM__BenchmarkCached_p_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_std__vectorTstd__string_t[] = { {&_swigt__p_std__vectorTstd__string_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_time_t[] = { {&_swigt__p_time_t, 0, 0, 0},{0, 0, 0, 0}}; *************** *** 10369,10372 **** --- 10653,10657 ---- static swig_cast_info *swig_cast_initial[] = { _swigc__p_CBM__Benchmark, + _swigc__p_CBM__BenchmarkCached, _swigc__p_CBM__Compiler, _swigc__p_CBM__CompilerSelector, *************** *** 10384,10387 **** --- 10669,10673 ---- _swigc__p_char, _swigc__p_std__string, + _swigc__p_std__vectorTCBM__BenchmarkCached_p_t, _swigc__p_std__vectorTstd__string_t, _swigc__p_time_t, *************** *** 10409,10412 **** --- 10695,10705 ---- static swig_command_info swig_commands[] = { {"CBMc::setVerbosity", _wrap_setVerbosity}, + {"CBMc::BenchmarkCached_id_set", _wrap_BenchmarkCached_id_set}, + {"CBMc::BenchmarkCached_id_get", _wrap_BenchmarkCached_id_get}, + {"CBMc::BenchmarkCached_instance_set", _wrap_BenchmarkCached_instance_set}, + {"CBMc::BenchmarkCached_instance_get", _wrap_BenchmarkCached_instance_get}, + {"CBMc::new_BenchmarkCached", _wrap_new_BenchmarkCached}, + {"CBMc::delete_BenchmarkCached", _wrap_delete_BenchmarkCached}, + {"CBMc::Package_removeCached", _wrap_Package_removeCached}, {"CBMc::Package_hasPatch", _wrap_Package_hasPatch}, {"CBMc::Package_resetContext", _wrap_Package_resetContext}, *************** *** 10445,10450 **** --- 10738,10745 ---- {"CBMc::Package_Uninstall", _wrap_Package_Uninstall}, {"CBMc::Package_getStatus", _wrap_Package_getStatus}, + {"CBMc::Package_getStatusStr", _wrap_Package_getStatusStr}, {"CBMc::delete_Package", _wrap_delete_Package}, {"CBMc::Benchmark_Package", _wrap_Benchmark_Package}, + {"CBMc::Benchmark_setPlan", _wrap_Benchmark_setPlan}, {"CBMc::Benchmark_Name", _wrap_Benchmark_Name}, {"CBMc::Benchmark_Comments", _wrap_Benchmark_Comments}, *************** *** 10521,10527 **** {"CBMc::System_Split", _wrap_System_Split}, {"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}, {"CBMc::System_md5", _wrap_System_md5}, --- 10816,10820 ---- *************** *** 10539,10548 **** {"CBMc::System_getLastCommand", _wrap_System_getLastCommand}, {"CBMc::System_getLastCommandOutput", _wrap_System_getLastCommandOutput}, ! {"CBMc::Compiler_display", _wrap_Compiler_display}, {"CBMc::Compiler_compiler", _wrap_Compiler_compiler}, ! {"CBMc::Compiler_compilerName", _wrap_Compiler_compilerName}, ! {"CBMc::Compiler_compilerVersion", _wrap_Compiler_compilerVersion}, {"CBMc::Compiler_Binary", _wrap_Compiler_Binary}, ! {"CBMc::Compiler_language", _wrap_Compiler_language}, {"CBMc::delete_Compiler", _wrap_delete_Compiler}, {"CBMc::new_CompilerSelector", _wrap_new_CompilerSelector}, --- 10832,10841 ---- {"CBMc::System_getLastCommand", _wrap_System_getLastCommand}, {"CBMc::System_getLastCommandOutput", _wrap_System_getLastCommandOutput}, ! {"CBMc::Compiler_setPlan", _wrap_Compiler_setPlan}, {"CBMc::Compiler_compiler", _wrap_Compiler_compiler}, ! {"CBMc::Compiler_Name", _wrap_Compiler_Name}, ! {"CBMc::Compiler_Version", _wrap_Compiler_Version}, {"CBMc::Compiler_Binary", _wrap_Compiler_Binary}, ! {"CBMc::Compiler_Language", _wrap_Compiler_Language}, {"CBMc::delete_Compiler", _wrap_delete_Compiler}, {"CBMc::new_CompilerSelector", _wrap_new_CompilerSelector}, *************** *** 10863,10866 **** --- 11156,11160 ---- SvREADONLY_on(sv); } while(0) /*@SWIG@*/; + SWIG_TypeClientData(SWIGTYPE_p_CBM__BenchmarkCached, (void*) "CBM::BenchmarkCached"); /*@SWIG:%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Package_Unknown", TRUE | 0x2); *************** *** 10964,10968 **** SWIG_TypeClientData(SWIGTYPE_p_CBM__CompilerSelector, (void*) "CBM::CompilerSelector"); /*@SWIG:%set_constant@*/ do { ! SV *sv = get_sv((char*) SWIG_prefix "CBM_PLAN", TRUE | 0x2); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(1))); SvREADONLY_on(sv); --- 11258,11262 ---- SWIG_TypeClientData(SWIGTYPE_p_CBM__CompilerSelector, (void*) "CBM::CompilerSelector"); /*@SWIG:%set_constant@*/ do { ! SV *sv = get_sv((char*) SWIG_prefix "H_CBM_PLAN", TRUE | 0x2); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(1))); SvREADONLY_on(sv); |