Skip to content

Support JRuby by removing fast_stack as a hard dependency #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SamSaffron merged 1 commit into from
Apr 17, 2015
Merged

Support JRuby by removing fast_stack as a hard dependency #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions flamegraph.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,10 @@ Gem::Specification.new do |spec|
spec.test_files = spec.files.grep(%r{^(test)/})
spec.require_paths = ["lib"]

spec.add_dependency "fast_stack"

spec.add_development_dependency "bundler", "~> 1.3"
spec.add_development_dependency "rake"
spec.add_development_dependency "minitest"
spec.add_development_dependency "guard"
spec.add_development_dependency "guard-minitest"
spec.add_development_dependency "fast_stack"
end
11 changes: 9 additions & 2 deletions lib/flamegraph.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,15 @@
begin
require "fast_stack"
rescue LoadError
STDERR.puts "Please require the fast_stack gem, note flamegraph is only supported on Ruby 2.0 and above"
unless RUBY_PLATFORM == 'java'
STDERR.puts "Please require the fast_stack gem, note flamegraph is only supported on Ruby 2.0 and above"
end
end
end

require "flamegraph/version"
require "flamegraph/renderer"
require "flamegraph/sampler"

module Flamegraph
def self.generate(filename=nil, opts = {})
Expand All @@ -28,10 +31,14 @@ def self.generate(filename=nil, opts = {})
StackProfSampler.collect(fidelity) do
yield
end
else
elsif defined? FastStack
FastStack.profile(fidelity) do # , opts[:mode] || :ruby) do
yield
end
else
Sampler.collect(fidelity) do
yield
end
end

embed_resources = (filename && !opts.key?(:embed_resources)) || opts[:embed_resources]
Expand Down