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: 899b638b7fc9
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3320b8a2c6b3
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 12, 2015

  1. Merge pull request #2292 from zanker/jruby-gc-profiler-puts 

    Remove unnecessary puts for GC::Profiler.total_time
    @headius
    headius committed Jan 12, 2015
    Copy the full SHA
    75dd8b1 View commit details

  2. Merge remote-tracking branch 'origin/jruby-1_7' into jruby-1_7

    @headius
    headius committed Jan 12, 2015
    Copy the full SHA
    3320b8a View commit details
Showing with 0 additions and 2 deletions.
  1. +0 −2 core/src/main/ruby/jruby/kernel19/gc.rb
2 changes: 0 additions & 2 deletions core/src/main/ruby/jruby/kernel19/gc.rb
View file
Original file line number Diff line number Diff line change
@@ -214,8 +214,6 @@ def total_time
duration = 0

@gc_listener.lines.each_with_index do |line, i|
puts HEADER if i % 20 == 0

gc_notification = com.sun.management.GarbageCollectionNotificationInfo.from(line.user_data)
gc_info = gc_notification.gc_info