From: T. D. <tld...@us...> - 2014-08-14 22:57:06
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "compose-hpc". The branch, master has been updated via 4716d3e3483f4d6d8077bb8a6208b3741eb8ddfc (commit) from 4dba31488ae66670f248cee3f741e97c15885258 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4716d3e3483f4d6d8077bb8a6208b3741eb8ddfc Author: T. Dahlgren <dah...@ll...> Date: Thu Aug 14 15:47:51 2014 -0700 Latest changes from porting and upgrading to rose with edg-4.7 - Updated sources, makefiles, and environment.dox to reflect porting activity; - Modified include and macro instrumentation routines to support use of edg-4.7 and or changes to rose (0.9.6a); - Added instrumentReturnPoints to RoseHelpers as a work-around for issue in SageInterface::instrumentEndOfFunction for void methods with multiple return statements; - Added new examples/tests to include ones for which there are issues with the generated/instrumented code; - Tweaked makefiles to include improving handling of output differences resulting from rose adding up to two namespaces to generated code; and - Corrected the check comparing generated, unlabeld test case results. ----------------------------------------------------------------------- Summary of changes: pcontracts/TODO | 7 +- pcontracts/WARNING | 4 + pcontracts/dox/Environment.dox | 3 + pcontracts/include/ContractsProcessor.hpp | 12 +-- pcontracts/include/RoseHelpers.hpp | 15 ++ pcontracts/src/Makefile | 2 + pcontracts/src/Makefile.test | 76 ++++++++++ pcontracts/src/contracts/ContractsProcessor.cpp | 141 +++++++++++++------ pcontracts/src/contracts/Makefile | 4 +- pcontracts/src/contracts/RoseHelpers.cpp | 60 ++++++++- pcontracts/src/drivers/Makefile | 35 ++++-- .../src/drivers/RoutineContractInstrumenter.cpp | 21 +++- .../src/drivers/VisitContractsInstrumenter.cpp | 77 ++++++++--- pcontracts/src/examples/Makefile | 74 +++++++--- pcontracts/src/examples/Makefile.trans | 116 ++++++++++++---- pcontracts/src/examples/SimpleClass.cpp | 83 +++++++++++ pcontracts/src/examples/WeightsList.cpp | 3 + pcontracts/src/examples/WeightsList2.cpp | 146 ++++++++++++++++++++ pcontracts/src/examples/WeightsList2.hpp | 89 ++++++++++++ pcontracts/src/examples/hello.c | 24 ++++ pcontracts/src/examples/simple.c | 59 ++++++++ pcontracts/src/make.inc | 3 +- pcontracts/src/make_rose.inc | 4 +- pcontracts/src/make_test.inc | 5 +- pcontracts/src/runtime/Makefile | 1 + pcontracts/src/tests/Makefile | 2 + .../data/RoutineInstrumenter/Knapsack-v2.mout.edg4 | 7 + .../data/RoutineInstrumenter/SimpleClass.checks | 8 + .../data/RoutineInstrumenter/SimpleClass.mout | 10 ++ .../data/RoutineInstrumenter/SimpleClass.mout.edg4 | 9 ++ .../UnlabeledKnapsack-v2.mout.edg4 | 7 + .../data/RoutineInstrumenter/WeightsList.mout | 2 +- .../data/RoutineInstrumenter/WeightsList.mout.edg4 | 3 + .../data/RoutineInstrumenter/WeightsList2.checks | 8 + .../data/RoutineInstrumenter/WeightsList2.mout | 1 + .../RoutineInstrumenter/WeightsList2.mout.edg4 | 1 + .../tests/data/RoutineInstrumenter/hello.checks | 8 + .../src/tests/data/RoutineInstrumenter/hello.mout | 1 + .../tests/data/RoutineInstrumenter/hello.mout.edg4 | 1 + ...{helloworld-v2.mout => helloworld-v2.mout.edg4} | 0 ...{helloworld-v3.mout => helloworld-v3.mout.edg4} | 0 .../data/RoutineInstrumenter/helloworld.mout.edg4 | 5 + .../{knapsack.mout => knapsack.mout.edg4} | 0 .../tests/data/RoutineInstrumenter/simple.checks | 8 + .../src/tests/data/RoutineInstrumenter/simple.mout | 10 ++ .../data/RoutineInstrumenter/simple.mout.edg4 | 9 ++ .../{knapsack.mout => unlabeledknapsack.mout.edg4} | 0 .../data/VisitInstrumenter/Knapsack-v2.mout.edg4 | 7 + .../data/VisitInstrumenter/SimpleClass.checks | 8 + .../tests/data/VisitInstrumenter/SimpleClass.mout | 10 ++ .../data/VisitInstrumenter/SimpleClass.mout.edg4 | 9 ++ .../UnlabeledKnapsack-v2.mout.edg4 | 7 + .../data/VisitInstrumenter/WeightsList.mout.edg4 | 3 + .../data/VisitInstrumenter/WeightsList2.checks | 8 + .../tests/data/VisitInstrumenter/WeightsList2.mout | 1 + .../data/VisitInstrumenter/WeightsList2.mout.edg4 | 1 + .../src/tests/data/VisitInstrumenter/hello.checks | 8 + .../src/tests/data/VisitInstrumenter/hello.mout | 1 + .../tests/data/VisitInstrumenter/hello.mout.edg4 | 1 + .../data/VisitInstrumenter/helloworld-v2.mout.edg4 | 5 + .../data/VisitInstrumenter/helloworld-v3.mout.edg4 | 5 + .../data/VisitInstrumenter/helloworld.mout.edg4 | 5 + .../knapsack.mout.edg4} | 0 .../src/tests/data/VisitInstrumenter/simple.checks | 8 + .../src/tests/data/VisitInstrumenter/simple.mout | 10 ++ .../tests/data/VisitInstrumenter/simple.mout.edg4 | 9 ++ .../unlabeledknapsack.mout.edg4} | 0 .../src/tests/data/examples/SimpleClass.mout | 7 + .../src/tests/data/examples/WeightsList2.mout | 1 + pcontracts/src/tests/data/examples/hello.mout | 1 + pcontracts/src/tests/data/examples/simple.mout | 7 + pcontracts/src/tests/testContractsEnforcer.c | 5 +- 72 files changed, 1140 insertions(+), 151 deletions(-) create mode 100644 pcontracts/src/Makefile.test create mode 100644 pcontracts/src/examples/SimpleClass.cpp create mode 100644 pcontracts/src/examples/WeightsList2.cpp create mode 100644 pcontracts/src/examples/WeightsList2.hpp create mode 100644 pcontracts/src/examples/hello.c create mode 100644 pcontracts/src/examples/simple.c create mode 100644 pcontracts/src/tests/data/RoutineInstrumenter/Knapsack-v2.mout.edg4 create mode 100644 pcontracts/src/tests/data/RoutineInstrumenter/SimpleClass.checks create mode 100644 pcontracts/src/tests/data/RoutineInstrumenter/SimpleClass.mout create mode 100644 pcontracts/src/tests/data/RoutineInstrumenter/SimpleClass.mout.edg4 create mode 100644 pcontracts/src/tests/data/RoutineInstrumenter/UnlabeledKnapsack-v2.mout.edg4 create mode 100644 pcontracts/src/tests/data/RoutineInstrumenter/WeightsList.mout.edg4 create mode 100644 pcontracts/src/tests/data/RoutineInstrumenter/WeightsList2.checks create mode 100644 pcontracts/src/tests/data/RoutineInstrumenter/WeightsList2.mout create mode 100644 pcontracts/src/tests/data/RoutineInstrumenter/WeightsList2.mout.edg4 create mode 100644 pcontracts/src/tests/data/RoutineInstrumenter/hello.checks create mode 100644 pcontracts/src/tests/data/RoutineInstrumenter/hello.mout create mode 100644 pcontracts/src/tests/data/RoutineInstrumenter/hello.mout.edg4 copy pcontracts/src/tests/data/RoutineInstrumenter/{helloworld-v2.mout => helloworld-v2.mout.edg4} (100%) copy pcontracts/src/tests/data/RoutineInstrumenter/{helloworld-v3.mout => helloworld-v3.mout.edg4} (100%) create mode 100644 pcontracts/src/tests/data/RoutineInstrumenter/helloworld.mout.edg4 copy pcontracts/src/tests/data/RoutineInstrumenter/{knapsack.mout => knapsack.mout.edg4} (100%) create mode 100644 pcontracts/src/tests/data/RoutineInstrumenter/simple.checks create mode 100644 pcontracts/src/tests/data/RoutineInstrumenter/simple.mout create mode 100644 pcontracts/src/tests/data/RoutineInstrumenter/simple.mout.edg4 copy pcontracts/src/tests/data/RoutineInstrumenter/{knapsack.mout => unlabeledknapsack.mout.edg4} (100%) create mode 100644 pcontracts/src/tests/data/VisitInstrumenter/Knapsack-v2.mout.edg4 create mode 100644 pcontracts/src/tests/data/VisitInstrumenter/SimpleClass.checks create mode 100644 pcontracts/src/tests/data/VisitInstrumenter/SimpleClass.mout create mode 100644 pcontracts/src/tests/data/VisitInstrumenter/SimpleClass.mout.edg4 create mode 100644 pcontracts/src/tests/data/VisitInstrumenter/UnlabeledKnapsack-v2.mout.edg4 create mode 100644 pcontracts/src/tests/data/VisitInstrumenter/WeightsList.mout.edg4 create mode 100644 pcontracts/src/tests/data/VisitInstrumenter/WeightsList2.checks create mode 100644 pcontracts/src/tests/data/VisitInstrumenter/WeightsList2.mout create mode 100644 pcontracts/src/tests/data/VisitInstrumenter/WeightsList2.mout.edg4 create mode 100644 pcontracts/src/tests/data/VisitInstrumenter/hello.checks create mode 100644 pcontracts/src/tests/data/VisitInstrumenter/hello.mout create mode 100644 pcontracts/src/tests/data/VisitInstrumenter/hello.mout.edg4 create mode 100644 pcontracts/src/tests/data/VisitInstrumenter/helloworld-v2.mout.edg4 create mode 100644 pcontracts/src/tests/data/VisitInstrumenter/helloworld-v3.mout.edg4 create mode 100644 pcontracts/src/tests/data/VisitInstrumenter/helloworld.mout.edg4 copy pcontracts/src/tests/data/{RoutineInstrumenter/knapsack.mout => VisitInstrumenter/knapsack.mout.edg4} (100%) create mode 100644 pcontracts/src/tests/data/VisitInstrumenter/simple.checks create mode 100644 pcontracts/src/tests/data/VisitInstrumenter/simple.mout create mode 100644 pcontracts/src/tests/data/VisitInstrumenter/simple.mout.edg4 copy pcontracts/src/tests/data/{RoutineInstrumenter/knapsack.mout => VisitInstrumenter/unlabeledknapsack.mout.edg4} (100%) create mode 100644 pcontracts/src/tests/data/examples/SimpleClass.mout create mode 100644 pcontracts/src/tests/data/examples/WeightsList2.mout create mode 100644 pcontracts/src/tests/data/examples/hello.mout create mode 100644 pcontracts/src/tests/data/examples/simple.mout hooks/post-receive -- compose-hpc |