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