Commit 7dd6135f authored 8 years ago by Mick Jordan

Merge pull request #236 in G/fastr from ~MICK.JORDAN_ORACLE.COM/fastr:feature/rprof to master

* commit '8cf7fe96':
  retire RPerfStats and replace with .fastr.stats.xxx builtins

parents 34478f44 8cf7fe96

Branches

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

com.oracle.truffle.r.agents/src/com/oracle/truffle/r/agents/objsize/ObjSizeAgent.java 37 additions, 0 deletions

...src/com/oracle/truffle/r/agents/objsize/ObjSizeAgent.java
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/TruffleRLanguage.java 0 additions, 2 deletions

...ine/src/com/oracle/truffle/r/engine/TruffleRLanguage.java
com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/utils/Rprof.java 132 additions, 75 deletions

...library/src/com/oracle/truffle/r/library/utils/Rprof.java
com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/utils/Rprofmem.java 44 additions, 23 deletions

...rary/src/com/oracle/truffle/r/library/utils/Rprofmem.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/BasePackage.java 7 additions, 6 deletions

.../com/oracle/truffle/r/nodes/builtin/base/BasePackage.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/fastr/FastRContext.java 1 addition, 0 deletions

...om/oracle/truffle/r/nodes/builtin/fastr/FastRContext.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/fastr/FastRFunctionProfiler.java 0 additions, 257 deletions

.../truffle/r/nodes/builtin/fastr/FastRFunctionProfiler.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/fastr/FastRStats.java 445 additions, 0 deletions

.../com/oracle/truffle/r/nodes/builtin/fastr/FastRStats.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrumentation/RFunctionProfiler.java 0 additions, 210 deletions

...le/truffle/r/nodes/instrumentation/RFunctionProfiler.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrumentation/RInstrumentation.java 1 addition, 4 deletions

...cle/truffle/r/nodes/instrumentation/RInstrumentation.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/FastROptions.java 0 additions, 2 deletions

...untime/src/com/oracle/truffle/r/runtime/FastROptions.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RCleanUp.java 17 additions, 0 deletions

....r.runtime/src/com/oracle/truffle/r/runtime/RCleanUp.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RPerfStats.java 0 additions, 211 deletions

....runtime/src/com/oracle/truffle/r/runtime/RPerfStats.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/Utils.java 0 additions, 3 deletions

...fle.r.runtime/src/com/oracle/truffle/r/runtime/Utils.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RAttributes.java 59 additions, 44 deletions

...me/src/com/oracle/truffle/r/runtime/data/RAttributes.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RDataFactory.java 1 addition, 66 deletions

...e/src/com/oracle/truffle/r/runtime/data/RDataFactory.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RVector.java 0 additions, 43 deletions

...untime/src/com/oracle/truffle/r/runtime/data/RVector.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/instrument/InstrumentationState.java 45 additions, 119 deletions

...le/truffle/r/runtime/instrument/InstrumentationState.java
com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/TestBase.java 0 additions, 2 deletions

...ruffle.r.test/src/com/oracle/truffle/r/test/TestBase.java

with 789 additions and 1067 deletions

Please register or to comment