Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bb85d423be5d
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9459764370d2
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 2, 2014

  1. Fix profile output 

    86a75dc incorrectly updated the method names the profiler needs to
ignore, resulting in incorrect profiler output.

This resulted in graph output including JRuby::Profiler calls and
incorrectly reported a total time of "0.00" with "100%" time spent in
every method.

Revert to the correct names, fixing the output.
    @dmarcotte
    dmarcotte committed Nov 2, 2014
    Copy the full SHA
    51faa56 View commit details

Commits on Nov 5, 2014

  1. Merge pull request #2081 from dmarcotte/test-block-profile 

    Fix profile output
    @headius
    headius committed Nov 5, 2014
    Copy the full SHA
    9459764 View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 core/src/main/java/org/jruby/runtime/profile/builtin/ProfilePrinter.java
8 changes: 4 additions & 4 deletions core/src/main/java/org/jruby/runtime/profile/builtin/ProfilePrinter.java
View file
Original file line number Diff line number Diff line change
@@ -170,15 +170,15 @@ private static void methodData1(final IntHashMap<MethodData> methods, Invocation
}
}

private static final String PROFILER_START_METHOD = "JRuby::ProfilingService.start";
private static final String PROFILER_STOP_METHOD = "JRuby::ProfilingService.stop";
private static final String PROFILER_START_METHOD = "JRuby::Profiler.start";
private static final String PROFILER_STOP_METHOD = "JRuby::Profiler.stop";

/*
* Here to keep these in one place if the hash format gets updated
* @see ProfileData#computeResults()
*/
static final String PROFILER_PROFILE_METHOD = "JRuby::ProfilingService.profile";
static final String PROFILER_PROFILED_CODE_METHOD = "JRuby::ProfilingService.profiled_code";
static final String PROFILER_PROFILE_METHOD = "JRuby::Profiler.profile";
static final String PROFILER_PROFILED_CODE_METHOD = "JRuby::Profiler.profiled_code";

private static String moduleHashMethod(RubyModule module, String name) {
if (module instanceof MetaClass) {