[Compbench-devel] CompBenchmarks++/CBM-PI CBM.i, 1.7, 1.8 CBM.pm, 1.12, 1.13 CBM_wrap.cxx, 1.12, 1.
Brought to you by:
xfred
From: Frederic T. <xf...@us...> - 2007-01-24 19:33:50
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv31711 Modified Files: CBM.i CBM.pm CBM_wrap.cxx Log Message: XML related API improvements. Index: CBM.pm =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM.pm,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** CBM.pm 23 Jan 2007 18:56:28 -0000 1.12 --- CBM.pm 24 Jan 2007 19:33:41 -0000 1.13 *************** *** 142,145 **** --- 142,146 ---- *Comments = *CBMc::Benchmark_Comments; *Bench = *CBMc::Benchmark_Bench; + *executionTime = *CBMc::Benchmark_executionTime; sub DESTROY { return unless $_[0]->isa('HASH'); *************** *** 182,185 **** --- 183,187 ---- *Value = *CBMc::XMLAttribute_Value; *setValue = *CBMc::XMLAttribute_setValue; + *append = *CBMc::XMLAttribute_append; sub DESTROY { return unless $_[0]->isa('HASH'); *************** *** 222,225 **** --- 224,228 ---- *Value = *CBMc::XMLNode_Value; *setValue = *CBMc::XMLNode_setValue; + *append = *CBMc::XMLNode_append; *childNumber = *CBMc::XMLNode_childNumber; *getChild = *CBMc::XMLNode_getChild; *************** *** 292,295 **** --- 295,338 ---- + ############# Class : CBM::Config ############## + + package CBM::Config; + use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); + @ISA = qw( CBM ); + %OWNER = (); + %ITERATORS = (); + sub new { + my $pkg = shift; + my $self = CBMc::new_Config(@_); + bless $self, $pkg if defined($self); + } + + *getStatus = *CBMc::Config_getStatus; + *setStatus = *CBMc::Config_setStatus; + *str = *CBMc::Config_str; + sub DESTROY { + return unless $_[0]->isa('HASH'); + my $self = tied(%{$_[0]}); + return unless defined $self; + delete $ITERATORS{$self}; + if (exists $OWNER{$self}) { + CBMc::delete_Config($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 ############## *************** *** 441,444 **** --- 484,488 ---- *UO_fatal = *CBMc::UO_fatal; *H_XMLREADER = *CBMc::H_XMLREADER; + *H_XMLCONFIG = *CBMc::H_XMLCONFIG; my %__cbmSystem_hash; Index: CBM_wrap.cxx =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM_wrap.cxx,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** CBM_wrap.cxx 23 Jan 2007 18:56:28 -0000 1.12 --- CBM_wrap.cxx 24 Jan 2007 19:33:41 -0000 1.13 *************** *** 1384,1400 **** #define SWIGTYPE_p_CBM__Compiler swig_types[2] #define SWIGTYPE_p_CBM__CompilerSelector swig_types[3] ! #define SWIGTYPE_p_CBM__Package swig_types[4] ! #define SWIGTYPE_p_CBM__System swig_types[5] ! #define SWIGTYPE_p_CBM__XMLAttribute swig_types[6] ! #define SWIGTYPE_p_CBM__XMLNode swig_types[7] ! #define SWIGTYPE_p_CBM__XMLReader swig_types[8] ! #define SWIGTYPE_p_Compiler swig_types[9] ! #define SWIGTYPE_p_CompilerOptions swig_types[10] ! #define SWIGTYPE_p_char swig_types[11] ! #define SWIGTYPE_p_std__string swig_types[12] ! #define SWIGTYPE_p_std__vectorTstd__string_t swig_types[13] ! #define SWIGTYPE_p_time_t swig_types[14] ! static swig_type_info *swig_types[16]; ! static swig_module_info swig_module = {swig_types, 15, 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) --- 1384,1401 ---- #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__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_char swig_types[12] ! #define SWIGTYPE_p_std__string swig_types[13] ! #define SWIGTYPE_p_std__vectorTstd__string_t swig_types[14] ! #define SWIGTYPE_p_time_t swig_types[15] ! static swig_type_info *swig_types[17]; ! static swig_module_info swig_module = {swig_types, 16, 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) *************** *** 1472,1475 **** --- 1473,1477 ---- #include "Base/XML.h" #include "Base/XMLReader.h" + #include "Base/Config.h" using namespace CBM; *************** *** 4362,4365 **** --- 4364,4396 ---- + XS(_wrap_Benchmark_executionTime) { + { + CBM::Benchmark *arg1 = (CBM::Benchmark *) 0 ; + std::string result; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: Benchmark_executionTime(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_executionTime" "', argument " "1"" of type '" "CBM::Benchmark *""'"); + } + arg1 = reinterpret_cast<CBM::Benchmark * >(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_delete_Benchmark) { { *************** *** 4630,4633 **** --- 4661,4704 ---- + XS(_wrap_XMLAttribute_append) { + { + CBM::XMLAttribute *arg1 = (CBM::XMLAttribute *) 0 ; + std::string arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: XMLAttribute_append(self,_value);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__XMLAttribute, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XMLAttribute_append" "', argument " "1"" of type '" "CBM::XMLAttribute *""'"); + } + arg1 = reinterpret_cast<CBM::XMLAttribute * >(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 '" "XMLAttribute_append" "', argument " "2"" of type '" "std::string""'"); + } + arg2 = *ptr; + if (SWIG_IsNewObj(res)) delete ptr; + } + (arg1)->append(arg2); + + + + + XSRETURN(argvi); + fail: + + + SWIG_croak_null(); + } + } + + XS(_wrap_delete_XMLAttribute) { { *************** *** 4898,4901 **** --- 4969,5012 ---- + XS(_wrap_XMLNode_append) { + { + CBM::XMLNode *arg1 = (CBM::XMLNode *) 0 ; + std::string arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: XMLNode_append(self,_value);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__XMLNode, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XMLNode_append" "', argument " "1"" of type '" "CBM::XMLNode *""'"); + } + arg1 = reinterpret_cast<CBM::XMLNode * >(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 '" "XMLNode_append" "', argument " "2"" of type '" "std::string""'"); + } + arg2 = *ptr; + if (SWIG_IsNewObj(res)) delete ptr; + } + (arg1)->append(arg2); + + + + + XSRETURN(argvi); + fail: + + + SWIG_croak_null(); + } + } + + XS(_wrap_XMLNode_childNumber) { { *************** *** 4927,4931 **** ! XS(_wrap_XMLNode_getChild) { { CBM::XMLNode *arg1 = (CBM::XMLNode *) 0 ; --- 5038,5042 ---- ! XS(_wrap_XMLNode_getChild__SWIG_0) { { CBM::XMLNode *arg1 = (CBM::XMLNode *) 0 ; *************** *** 4966,4969 **** --- 5077,5201 ---- + XS(_wrap_XMLNode_getChild__SWIG_1) { + { + CBM::XMLNode *arg1 = (CBM::XMLNode *) 0 ; + std::string arg2 ; + CBM::XMLNode *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: XMLNode_getChild(self,_name);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__XMLNode, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XMLNode_getChild" "', argument " "1"" of type '" "CBM::XMLNode *""'"); + } + arg1 = reinterpret_cast<CBM::XMLNode * >(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 '" "XMLNode_getChild" "', argument " "2"" of type '" "std::string""'"); + } + arg2 = *ptr; + if (SWIG_IsNewObj(res)) delete ptr; + } + result = (CBM::XMLNode *)(arg1)->getChild(arg2); + + ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CBM__XMLNode, 0 | SWIG_SHADOW); argvi++ ; + + + XSRETURN(argvi); + fail: + + + SWIG_croak_null(); + } + } + + + XS(_wrap_XMLNode_getChild) { + dXSARGS; + + { + unsigned long _index = 0; + SWIG_TypeRank _rank = 0; + if (items == 2) { + 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; + { + { + int res = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), NULL); + _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 == 2) { + 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_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; + 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_XMLNode_getChild__SWIG_0); return; + case 2: + (*PL_markstack_ptr++);SWIG_CALLXS(_wrap_XMLNode_getChild__SWIG_1); return; + } + } + + croak("No matching function for overloaded 'XMLNode_getChild'"); + XSRETURN(0); + } + + XS(_wrap_XMLNode_attributeNumber) { { *************** *** 4995,4999 **** ! XS(_wrap_XMLNode_getAttribute) { { CBM::XMLNode *arg1 = (CBM::XMLNode *) 0 ; --- 5227,5272 ---- ! XS(_wrap_XMLNode_getAttribute__SWIG_0) { ! { ! CBM::XMLNode *arg1 = (CBM::XMLNode *) 0 ; ! std::string arg2 ; ! CBM::XMLAttribute *result = 0 ; ! void *argp1 = 0 ; ! int res1 = 0 ; ! int argvi = 0; ! dXSARGS; ! ! if ((items < 2) || (items > 2)) { ! SWIG_croak("Usage: XMLNode_getAttribute(self,_name);"); ! } ! res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__XMLNode, 0 | 0 ); ! if (!SWIG_IsOK(res1)) { ! SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XMLNode_getAttribute" "', argument " "1"" of type '" "CBM::XMLNode *""'"); ! } ! arg1 = reinterpret_cast<CBM::XMLNode * >(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 '" "XMLNode_getAttribute" "', argument " "2"" of type '" "std::string""'"); ! } ! arg2 = *ptr; ! if (SWIG_IsNewObj(res)) delete ptr; ! } ! result = (CBM::XMLAttribute *)(arg1)->getAttribute(arg2); ! ! ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CBM__XMLAttribute, 0 | SWIG_SHADOW); argvi++ ; ! ! ! XSRETURN(argvi); ! fail: ! ! ! SWIG_croak_null(); ! } ! } ! ! ! XS(_wrap_XMLNode_getAttribute__SWIG_1) { { CBM::XMLNode *arg1 = (CBM::XMLNode *) 0 ; *************** *** 5034,5037 **** --- 5307,5390 ---- + XS(_wrap_XMLNode_getAttribute) { + dXSARGS; + + { + unsigned long _index = 0; + SWIG_TypeRank _rank = 0; + if (items == 2) { + 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; + { + { + int res = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), NULL); + _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 == 2) { + 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_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; + 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_XMLNode_getAttribute__SWIG_1); return; + case 2: + (*PL_markstack_ptr++);SWIG_CALLXS(_wrap_XMLNode_getAttribute__SWIG_0); return; + } + } + + croak("No matching function for overloaded 'XMLNode_getAttribute'"); + XSRETURN(0); + } + + XS(_wrap_XMLNode_add__SWIG_0) { { *************** *** 5808,5811 **** --- 6161,6343 ---- + XS(_wrap_new_Config) { + { + std::string arg1 ; + CBM::Config *result = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: new_Config(_filename);"); + } + { + 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_Config" "', argument " "1"" of type '" "std::string""'"); + } + arg1 = *ptr; + if (SWIG_IsNewObj(res)) delete ptr; + } + result = (CBM::Config *)new CBM::Config(arg1); + + ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CBM__Config, SWIG_OWNER | SWIG_SHADOW); argvi++ ; + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } + } + + + XS(_wrap_Config_getStatus) { + { + CBM::Config *arg1 = (CBM::Config *) 0 ; + std::string arg2 ; + CBM::Package::Status result; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: Config_getStatus(self,_bid);"); + } + 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_getStatus" "', argument " "1"" of type '" "CBM::Config *""'"); + } + arg1 = reinterpret_cast<CBM::Config * >(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 '" "Config_getStatus" "', argument " "2"" of type '" "std::string""'"); + } + arg2 = *ptr; + if (SWIG_IsNewObj(res)) delete ptr; + } + result = (CBM::Package::Status)(arg1)->getStatus(arg2); + + ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast<int >(result)); argvi++ ; + + + XSRETURN(argvi); + fail: + + + SWIG_croak_null(); + } + } + + + XS(_wrap_Config_setStatus) { + { + CBM::Config *arg1 = (CBM::Config *) 0 ; + std::string arg2 ; + CBM::Package::Status arg3 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val3 ; + int ecode3 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 3) || (items > 3)) { + SWIG_croak("Usage: Config_setStatus(self,_bid,_status);"); + } + 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_setStatus" "', argument " "1"" of type '" "CBM::Config *""'"); + } + arg1 = reinterpret_cast<CBM::Config * >(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 '" "Config_setStatus" "', argument " "2"" of type '" "std::string""'"); + } + arg2 = *ptr; + if (SWIG_IsNewObj(res)) delete ptr; + } + ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Config_setStatus" "', argument " "3"" of type '" "CBM::Package::Status""'"); + } + arg3 = static_cast<CBM::Package::Status >(val3); + (arg1)->setStatus(arg2,arg3); + + + + + + XSRETURN(argvi); + fail: + + + + SWIG_croak_null(); + } + } + + + XS(_wrap_Config_str) { + { + CBM::Config *arg1 = (CBM::Config *) 0 ; + std::string result; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: Config_str(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_str" "', argument " "1"" of type '" "CBM::Config *""'"); + } + arg1 = reinterpret_cast<CBM::Config * >(argp1); + result = (arg1)->str(); + + 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_Config) { + { + CBM::Config *arg1 = (CBM::Config *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: delete_Config(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__Config, SWIG_POINTER_DISOWN | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Config" "', argument " "1"" of type '" "CBM::Config *""'"); + } + arg1 = reinterpret_cast<CBM::Config * >(argp1); + delete arg1; + + + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } + } + + XS(_wrap_System_init) { { *************** *** 7747,7750 **** --- 8279,8283 ---- 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}; + static swig_type_info _swigt__p_CBM__Config = {"_p_CBM__Config", "CBM::Config *", 0, 0, (void*)"CBM::Config", 0}; 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__System = {"_p_CBM__System", "CBM::System *", 0, 0, (void*)"CBM::System", 0}; *************** *** 7764,7767 **** --- 8297,8301 ---- &_swigt__p_CBM__Compiler, &_swigt__p_CBM__CompilerSelector, + &_swigt__p_CBM__Config, &_swigt__p_CBM__Package, &_swigt__p_CBM__System, *************** *** 7781,7784 **** --- 8315,8319 ---- 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}}; + static swig_cast_info _swigc__p_CBM__Config[] = { {&_swigt__p_CBM__Config, 0, 0, 0},{0, 0, 0, 0}}; 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__System[] = { {&_swigt__p_CBM__System, 0, 0, 0},{0, 0, 0, 0}}; *************** *** 7798,7801 **** --- 8333,8337 ---- _swigc__p_CBM__Compiler, _swigc__p_CBM__CompilerSelector, + _swigc__p_CBM__Config, _swigc__p_CBM__Package, _swigc__p_CBM__System, *************** *** 7875,7878 **** --- 8411,8415 ---- {"CBMc::Benchmark_Comments", _wrap_Benchmark_Comments}, {"CBMc::Benchmark_Bench", _wrap_Benchmark_Bench}, + {"CBMc::Benchmark_executionTime", _wrap_Benchmark_executionTime}, {"CBMc::delete_Benchmark", _wrap_delete_Benchmark}, {"CBMc::new_XMLAttribute", _wrap_new_XMLAttribute}, *************** *** 7880,7883 **** --- 8417,8421 ---- {"CBMc::XMLAttribute_Value", _wrap_XMLAttribute_Value}, {"CBMc::XMLAttribute_setValue", _wrap_XMLAttribute_setValue}, + {"CBMc::XMLAttribute_append", _wrap_XMLAttribute_append}, {"CBMc::delete_XMLAttribute", _wrap_delete_XMLAttribute}, {"CBMc::new_XMLNode", _wrap_new_XMLNode}, *************** *** 7885,7888 **** --- 8423,8427 ---- {"CBMc::XMLNode_Value", _wrap_XMLNode_Value}, {"CBMc::XMLNode_setValue", _wrap_XMLNode_setValue}, + {"CBMc::XMLNode_append", _wrap_XMLNode_append}, {"CBMc::XMLNode_childNumber", _wrap_XMLNode_childNumber}, {"CBMc::XMLNode_getChild", _wrap_XMLNode_getChild}, *************** *** 7897,7900 **** --- 8436,8444 ---- {"CBMc::XMLReader_read", _wrap_XMLReader_read}, {"CBMc::delete_XMLReader", _wrap_delete_XMLReader}, + {"CBMc::new_Config", _wrap_new_Config}, + {"CBMc::Config_getStatus", _wrap_Config_getStatus}, + {"CBMc::Config_setStatus", _wrap_Config_setStatus}, + {"CBMc::Config_str", _wrap_Config_str}, + {"CBMc::delete_Config", _wrap_delete_Config}, {"CBMc::System_init", _wrap_System_init}, {"CBMc::System_hostid", _wrap_System_hostid}, *************** *** 8275,8278 **** --- 8819,8828 ---- SWIG_TypeClientData(SWIGTYPE_p_CBM__XMLReader, (void*) "CBM::XMLReader"); /*@SWIG:%set_constant@*/ do { + SV *sv = get_sv((char*) SWIG_prefix "H_XMLCONFIG", 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__Config, (void*) "CBM::Config"); + /*@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.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CBM.i 23 Jan 2007 18:56:28 -0000 1.7 --- CBM.i 24 Jan 2007 19:33:41 -0000 1.8 *************** *** 11,14 **** --- 11,15 ---- #include "Base/XML.h" #include "Base/XMLReader.h" + #include "Base/Config.h" using namespace CBM; %} *************** *** 19,22 **** --- 20,24 ---- %include "Base/XML.h" %include "Base/XMLReader.h" + %include "Base/Config.h" %include "System/System.h" %include "Compiler/Compiler.h" |