[Compbench-devel] CompBenchmarks++/CBM-PI CBM.i, 1.12, 1.13 CBM.pm, 1.19, 1.20 CBM_wrap.cxx, 1.19,
Brought to you by:
xfred
Menu
▾
▴
[Compbench-devel] CompBenchmarks++/CBM-PI CBM.i, 1.12, 1.13 CBM.pm, 1.19, 1.20 CBM_wrap.cxx, 1.19, 1.20
|
From: Frederic T. <xf...@us...> - 2007-05-23 15:34:00
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25907 Modified Files: CBM.i CBM.pm CBM_wrap.cxx Log Message: API changed. Index: CBM.pm =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM.pm,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** CBM.pm 15 Feb 2007 19:03:24 -0000 1.19 --- CBM.pm 23 May 2007 15:33:56 -0000 1.20 *************** *** 51,54 **** --- 51,56 ---- *setVerbosity = *CBMc::setVerbosity; + *descriptionIncludePathAdd = *CBMc::descriptionIncludePathAdd; + *descriptionFullIncludeName = *CBMc::descriptionFullIncludeName; *Init = *CBMc::Init; *stringref = *CBMc::stringref; *************** *** 182,186 **** %ITERATORS = (); *Package = *CBMc::Benchmark_Package; - *setPlan = *CBMc::Benchmark_setPlan; *Name = *CBMc::Benchmark_Name; *Comments = *CBMc::Benchmark_Comments; --- 184,187 ---- *************** *** 471,474 **** --- 472,476 ---- *md5 = *CBMc::System_md5; *md5File = *CBMc::System_md5File; + *downloadNow = *CBMc::System_downloadNow; *download = *CBMc::System_download; *copy = *CBMc::System_copy; *************** *** 479,483 **** *fileExists = *CBMc::System_fileExists; *fileWrite = *CBMc::System_fileWrite; ! *Time = *CBMc::System_Time; *done = *CBMc::System_done; *getLastCommand = *CBMc::System_getLastCommand; --- 481,487 ---- *fileExists = *CBMc::System_fileExists; *fileWrite = *CBMc::System_fileWrite; ! *fileSize = *CBMc::System_fileSize; ! *startTimer = *CBMc::System_startTimer; ! *endTimer = *CBMc::System_endTimer; *done = *CBMc::System_done; *getLastCommand = *CBMc::System_getLastCommand; *************** *** 496,499 **** --- 500,546 ---- + ############# Class : CBM::CompilerOptionLogicVar ############## + + package CBM::CompilerOptionLogicVar; + use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); + @ISA = qw( CBM ); + %OWNER = (); + %ITERATORS = (); + *swig_id_get = *CBMc::CompilerOptionLogicVar_id_get; + *swig_id_set = *CBMc::CompilerOptionLogicVar_id_set; + *swig_value_get = *CBMc::CompilerOptionLogicVar_value_get; + *swig_value_set = *CBMc::CompilerOptionLogicVar_value_set; + *swig_lastWriter_get = *CBMc::CompilerOptionLogicVar_lastWriter_get; + *swig_lastWriter_set = *CBMc::CompilerOptionLogicVar_lastWriter_set; + sub new { + my $pkg = shift; + my $self = CBMc::new_CompilerOptionLogicVar(@_); + 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_CompilerOptionLogicVar($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::Compiler ############## *************** *** 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'); --- 550,569 ---- %OWNER = (); %ITERATORS = (); *compiler = *CBMc::Compiler_compiler; *Name = *CBMc::Compiler_Name; *Version = *CBMc::Compiler_Version; + *VanillaVersion = *CBMc::Compiler_VanillaVersion; *Binary = *CBMc::Compiler_Binary; *Language = *CBMc::Compiler_Language; + *relativeDescriptionDirectory = *CBMc::Compiler_relativeDescriptionDirectory; + *OptionDescriptions = *CBMc::Compiler_OptionDescriptions; + *colVarGet = *CBMc::Compiler_colVarGet; + *colVarSet = *CBMc::Compiler_colVarSet; + *colVarWriter = *CBMc::Compiler_colVarWriter; + *colOptionHas = *CBMc::Compiler_colOptionHas; + *analyzeOptions = *CBMc::Compiler_analyzeOptions; + *shortHelpOptions = *CBMc::Compiler_shortHelpOptions; + *supportedVersionNumber = *CBMc::Compiler_supportedVersionNumber; + *supportedVersion = *CBMc::Compiler_supportedVersion; sub DESTROY { return unless $_[0]->isa('HASH'); *************** *** 571,574 **** --- 628,815 ---- + ############# Class : CBM::CompilerVersion ############## + + package CBM::CompilerVersion; + use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); + @ISA = qw( CBM ); + %OWNER = (); + %ITERATORS = (); + sub new { + my $pkg = shift; + my $self = CBMc::new_CompilerVersion(@_); + bless $self, $pkg if defined($self); + } + + *AsInteger = *CBMc::CompilerVersion_AsInteger; + sub DESTROY { + return unless $_[0]->isa('HASH'); + my $self = tied(%{$_[0]}); + return unless defined $self; + delete $ITERATORS{$self}; + if (exists $OWNER{$self}) { + CBMc::delete_CompilerVersion($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::CompilerOptionDescription ############## + + package CBM::CompilerOptionDescription; + use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); + @ISA = qw( CBM ); + %OWNER = (); + %ITERATORS = (); + sub new { + my $pkg = shift; + my $self = CBMc::new_CompilerOptionDescription(@_); + bless $self, $pkg if defined($self); + } + + *Id = *CBMc::CompilerOptionDescription_Id; + *ShortDescription = *CBMc::CompilerOptionDescription_ShortDescription; + *EditorDescription = *CBMc::CompilerOptionDescription_EditorDescription; + *Option = *CBMc::CompilerOptionDescription_Option; + *CompilationTwoPassNeeded = *CBMc::CompilerOptionDescription_CompilationTwoPassNeeded; + *CompilationPass = *CBMc::CompilerOptionDescription_CompilationPass; + *CompilationFirstPassOption = *CBMc::CompilerOptionDescription_CompilationFirstPassOption; + *Use = *CBMc::CompilerOptionDescription_Use; + sub DESTROY { + return unless $_[0]->isa('HASH'); + my $self = tied(%{$_[0]}); + return unless defined $self; + delete $ITERATORS{$self}; + if (exists $OWNER{$self}) { + CBMc::delete_CompilerOptionDescription($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::CompilerOptionDescriptions ############## + + package CBM::CompilerOptionDescriptions; + use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); + @ISA = qw( CBM ); + %OWNER = (); + %ITERATORS = (); + sub new { + my $pkg = shift; + my $self = CBMc::new_CompilerOptionDescriptions(@_); + bless $self, $pkg if defined($self); + } + + *DescriptionFile = *CBMc::CompilerOptionDescriptions_DescriptionFile; + *DescriptionNumber = *CBMc::CompilerOptionDescriptions_DescriptionNumber; + *Description = *CBMc::CompilerOptionDescriptions_Description; + *DescriptionLitteral = *CBMc::CompilerOptionDescriptions_DescriptionLitteral; + *Compiler = *CBMc::CompilerOptionDescriptions_Compiler; + sub DESTROY { + return unless $_[0]->isa('HASH'); + my $self = tied(%{$_[0]}); + return unless defined $self; + delete $ITERATORS{$self}; + if (exists $OWNER{$self}) { + CBMc::delete_CompilerOptionDescriptions($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::PlanBatch ############## + + package CBM::PlanBatch; + use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); + @ISA = qw( CBM ); + %OWNER = (); + %ITERATORS = (); + sub new { + my $pkg = shift; + my $self = CBMc::new_PlanBatch(@_); + bless $self, $pkg if defined($self); + } + + *Id = *CBMc::PlanBatch_Id; + *setId = *CBMc::PlanBatch_setId; + *addOptions = *CBMc::PlanBatch_addOptions; + *add = *CBMc::PlanBatch_add; + *remove = *CBMc::PlanBatch_remove; + *compilerNumber = *CBMc::PlanBatch_compilerNumber; + *compilerOptionNumber = *CBMc::PlanBatch_compilerOptionNumber; + *benchmarkNumber = *CBMc::PlanBatch_benchmarkNumber; + *getCompiler = *CBMc::PlanBatch_getCompiler; + *getCompilerOptions = *CBMc::PlanBatch_getCompilerOptions; + *getBenchmark = *CBMc::PlanBatch_getBenchmark; + *totalIterations = *CBMc::PlanBatch_totalIterations; + *currentIteration = *CBMc::PlanBatch_currentIteration; + *currentCompiler = *CBMc::PlanBatch_currentCompiler; + *currentCompilerOptions = *CBMc::PlanBatch_currentCompilerOptions; + *currentBenchmark = *CBMc::PlanBatch_currentBenchmark; + *nextIteration = *CBMc::PlanBatch_nextIteration; + *stop = *CBMc::PlanBatch_stop; + *XML = *CBMc::PlanBatch_XML; + *reset = *CBMc::PlanBatch_reset; + *store = *CBMc::PlanBatch_store; + *restore = *CBMc::PlanBatch_restore; + sub DESTROY { + return unless $_[0]->isa('HASH'); + my $self = tied(%{$_[0]}); + return unless defined $self; + delete $ITERATORS{$self}; + if (exists $OWNER{$self}) { + CBMc::delete_PlanBatch($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::Plan ############## *************** *** 584,595 **** } ! *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; --- 825,832 ---- } ! *addBatch = *CBMc::Plan_addBatch; ! *removeBatch = *CBMc::Plan_removeBatch; ! *batchNumber = *CBMc::Plan_batchNumber; ! *getBatch = *CBMc::Plan_getBatch; *totalIterations = *CBMc::Plan_totalIterations; *currentIteration = *CBMc::Plan_currentIteration; *************** *** 646,649 **** --- 883,889 ---- $cbmSystem= \%__cbmSystem_hash; bless $cbmSystem, CBM::System; + *H_CBMCOMPILER_VERSION = *CBMc::H_CBMCOMPILER_VERSION; + *descriptionIncludePaths = *CBMc::descriptionIncludePaths; + *H_CBM_PLANBATCH = *CBMc::H_CBM_PLANBATCH; *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.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** CBM_wrap.cxx 15 Feb 2007 19:03:24 -0000 1.19 --- CBM_wrap.cxx 23 May 2007 15:33:56 -0000 1.20 *************** *** 1430,1452 **** #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] [...4267 lines suppressed...] + SWIG_TypeClientData(SWIGTYPE_p_CBM__CompilerOptionLogicVar, (void*) "CBM::CompilerOptionLogicVar"); 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 "H_CBMCOMPILER_VERSION", 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__CompilerVersion, (void*) "CBM::CompilerVersion"); + SWIG_TypeClientData(SWIGTYPE_p_CBM__CompilerOptionDescription, (void*) "CBM::CompilerOptionDescription"); + SWIG_TypeClientData(SWIGTYPE_p_CBM__CompilerOptionDescriptions, (void*) "CBM::CompilerOptionDescriptions"); + /*@SWIG:%set_constant@*/ do { + SV *sv = get_sv((char*) SWIG_prefix "H_CBM_PLANBATCH", 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__PlanBatch, (void*) "CBM::PlanBatch"); + /*@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))); Index: CBM.i =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM.i,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** CBM.i 17 Apr 2007 17:56:17 -0000 1.12 --- CBM.i 23 May 2007 15:33:56 -0000 1.13 *************** *** 15,18 **** --- 15,19 ---- #include "Base/Config.h" #include "Base/Result.h" + #include "Plan/Plan-Batch.h" #include "Plan/Plan.h" using namespace CBM; *************** *** 30,33 **** --- 31,35 ---- %include "Compiler/Compiler-Version.h" %include "Compiler/Compiler-Option-Description.h" + %include "Plan/Plan-Batch.h" %include "Plan/Plan.h" %include "Glue.h" |
