[Compbench-devel] CompBenchmarks++/CBM-PI CBM.i, 1.8, 1.9 CBM.pm, 1.15, 1.16 CBM_wrap.cxx, 1.15, 1.
Brought to you by:
xfred
Menu
▾
▴
[Compbench-devel] CompBenchmarks++/CBM-PI CBM.i, 1.8, 1.9 CBM.pm, 1.15, 1.16 CBM_wrap.cxx, 1.15, 1.16 Makefile.am, 1.11, 1.12
|
From: Frederic T. <xf...@us...> - 2007-01-25 20:39:32
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20175 Modified Files: CBM.i CBM.pm CBM_wrap.cxx Makefile.am Log Message: Interface to CBM::Plan added. Index: CBM.pm =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM.pm,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** CBM.pm 25 Jan 2007 15:42:55 -0000 1.15 --- CBM.pm 25 Jan 2007 20:39:25 -0000 1.16 *************** *** 187,190 **** --- 187,191 ---- *setValue = *CBMc::XMLAttribute_setValue; *append = *CBMc::XMLAttribute_append; + *setParent = *CBMc::XMLAttribute_setParent; sub DESTROY { return unless $_[0]->isa('HASH'); *************** *** 224,233 **** } *Name = *CBMc::XMLNode_Name; *Value = *CBMc::XMLNode_Value; *setValue = *CBMc::XMLNode_setValue; *append = *CBMc::XMLNode_append; ! *childNumber = *CBMc::XMLNode_childNumber; ! *getChild = *CBMc::XMLNode_getChild; *attributeNumber = *CBMc::XMLNode_attributeNumber; *getAttribute = *CBMc::XMLNode_getAttribute; --- 225,235 ---- } + *unreference = *CBMc::XMLNode_unreference; *Name = *CBMc::XMLNode_Name; *Value = *CBMc::XMLNode_Value; *setValue = *CBMc::XMLNode_setValue; *append = *CBMc::XMLNode_append; ! *nodeNumber = *CBMc::XMLNode_nodeNumber; ! *getNode = *CBMc::XMLNode_getNode; *attributeNumber = *CBMc::XMLNode_attributeNumber; *getAttribute = *CBMc::XMLNode_getAttribute; *************** *** 320,324 **** --- 322,328 ---- *Path = *CBMc::Config_Path; *str = *CBMc::Config_str; + *setPlan = *CBMc::Config_setPlan; *Changes = *CBMc::Config_Changes; + *ignoreChanges = *CBMc::Config_ignoreChanges; sub DESTROY { return unless $_[0]->isa('HASH'); *************** *** 483,486 **** --- 487,542 ---- + ############# Class : CBM::Plan ############## + + package CBM::Plan; + use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); + @ISA = qw( CBM ); + %OWNER = (); + %ITERATORS = (); + sub new { + my $pkg = shift; + my $self = CBMc::new_Plan(@_); + bless $self, $pkg if defined($self); + } + + *add = *CBMc::Plan_add; + *remove = *CBMc::Plan_remove; + *compilerNumber = *CBMc::Plan_compilerNumber; + *compilerOptionNumber = *CBMc::Plan_compilerOptionNumber; + *benchmarkNumber = *CBMc::Plan_benchmarkNumber; + *getCompiler = *CBMc::Plan_getCompiler; + *getCompilerOptions = *CBMc::Plan_getCompilerOptions; + *getBenchmark = *CBMc::Plan_getBenchmark; + *totalIterations = *CBMc::Plan_totalIterations; + *currentIteration = *CBMc::Plan_currentIteration; + *currentCompiler = *CBMc::Plan_currentCompiler; + *currentCompilerOptions = *CBMc::Plan_currentCompilerOptions; + *currentBenchmark = *CBMc::Plan_currentBenchmark; + *nextIteration = *CBMc::Plan_nextIteration; + *store = *CBMc::Plan_store; + sub DESTROY { + return unless $_[0]->isa('HASH'); + my $self = tied(%{$_[0]}); + return unless defined $self; + delete $ITERATORS{$self}; + if (exists $OWNER{$self}) { + CBMc::delete_Plan($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; + } + + # ------- VARIABLE STUBS -------- *************** *** 500,502 **** --- 556,559 ---- $cbmSystem= \%__cbmSystem_hash; bless $cbmSystem, CBM::System; + *CBM_PLAN = *CBMc::CBM_PLAN; 1; Index: CBM_wrap.cxx =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM_wrap.cxx,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** CBM_wrap.cxx 25 Jan 2007 15:42:55 -0000 1.15 --- CBM_wrap.cxx 25 Jan 2007 20:39:25 -0000 1.16 *************** *** 1433,1448 **** #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] [...1515 lines suppressed...] + {"CBMc::Plan_currentCompilerOptions", _wrap_Plan_currentCompilerOptions}, + {"CBMc::Plan_currentBenchmark", _wrap_Plan_currentBenchmark}, + {"CBMc::Plan_nextIteration", _wrap_Plan_nextIteration}, + {"CBMc::Plan_store", _wrap_Plan_store}, + {"CBMc::delete_Plan", _wrap_delete_Plan}, {"CBMc::Init", _wrap_Init}, {"CBMc::stringref", _wrap_stringref}, *************** *** 9241,9244 **** --- 10415,10424 ---- SWIG_TypeClientData(SWIGTYPE_p_CBM__Compiler, (void*) "CBM::Compiler"); 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); + } while(0) /*@SWIG@*/; + SWIG_TypeClientData(SWIGTYPE_p_CBM__Plan, (void*) "CBM::Plan"); ST(0) = &PL_sv_yes; XSRETURN(1); Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Makefile.am,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Makefile.am 24 Jan 2007 20:29:18 -0000 1.11 --- Makefile.am 25 Jan 2007 20:39:25 -0000 1.12 *************** *** 22,25 **** --- 22,26 ---- $(top_srcdir)/libcompbenchmarks/Base/XMLReader.h \ $(top_srcdir)/libcompbenchmarks/Base/Config.h \ + $(top_srcdir)/libcompbenchmarks/Plan/Plan.h \ $(top_srcdir)/CBM-PI/Glue.h Index: CBM.i =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM.i,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** CBM.i 24 Jan 2007 19:33:41 -0000 1.8 --- CBM.i 25 Jan 2007 20:39:25 -0000 1.9 *************** *** 12,15 **** --- 12,16 ---- #include "Base/XMLReader.h" #include "Base/Config.h" + #include "Plan/Plan.h" using namespace CBM; %} *************** *** 23,25 **** --- 24,27 ---- %include "System/System.h" %include "Compiler/Compiler.h" + %include "Plan/Plan.h" %include "Glue.h" \ No newline at end of file |
