Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/rdp/ruby-prof
Browse files Browse the repository at this point in the history
  • Loading branch information
goncalossilva committed Mar 9, 2012
2 parents aece113 + 42b4c63 commit 20525a3
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.rdoc
Expand Up @@ -29,7 +29,7 @@ The easiest way to install ruby-prof is by using Ruby Gems. To install:


gem install ruby-prof gem install ruby-prof


If you on windows mswin [not mingw] (check via ruby -v) and If you're on windows mswin [not mingw] (check via ruby -v) and
don't have an MSVC compiler, please install v0.8.1 which don't have an MSVC compiler, please install v0.8.1 which
has a prebuilt binary has a prebuilt binary
C:> gem install ruby-prof -v0.8.1 C:> gem install ruby-prof -v0.8.1
Expand Down
2 changes: 1 addition & 1 deletion ext/ruby_prof/ruby_prof.c
Expand Up @@ -1290,7 +1290,7 @@ static inline void walk_up_until_right_frame(prof_frame_t *frame, thread_data_t*


/* Document-class: RubyProf::Result /* Document-class: RubyProf::Result
The RubyProf::Result class is used to store the results of a The RubyProf::Result class is used to store the results of a
profiling run. And instace of the class is returned from profiling run. An instace of the class is returned from
the methods RubyProf#stop and RubyProf#profile. the methods RubyProf#stop and RubyProf#profile.
RubyProf::Result has one field, called threads, which is a hash RubyProf::Result has one field, called threads, which is a hash
Expand Down
2 changes: 1 addition & 1 deletion lib/ruby-prof/dot_printer.rb
Expand Up @@ -34,7 +34,7 @@ def initialize(result)
# STDOUT. # STDOUT.
# #
# options - Hash of print options. See #setup_options # options - Hash of print options. See #setup_options
# for more information. # for more information.
# #
# When profiling results that cover a large number of method calls it # When profiling results that cover a large number of method calls it
# helps to use the :min_percent option, for example: # helps to use the :min_percent option, for example:
Expand Down
2 changes: 1 addition & 1 deletion lib/ruby-prof/flat_printer.rb
Expand Up @@ -18,7 +18,7 @@ class FlatPrinter < AbstractPrinter
# The default value is STDOUT. # The default value is STDOUT.
# #
# options - Hash of print options. See #setup_options # options - Hash of print options. See #setup_options
# for more information. # for more information.
# #
def print(output = STDOUT, options = {}) def print(output = STDOUT, options = {})
@output = output @output = output
Expand Down
2 changes: 1 addition & 1 deletion lib/ruby-prof/graph_html_printer.rb
Expand Up @@ -42,7 +42,7 @@ def initialize(result)
# The default value is STDOUT. # The default value is STDOUT.
# #
# options - Hash of print options. See #setup_options # options - Hash of print options. See #setup_options
# for more information. # for more information.
# #
# unique options are: # unique options are:
# :filename - specify a file to use that contains the ERB # :filename - specify a file to use that contains the ERB
Expand Down
2 changes: 1 addition & 1 deletion lib/ruby-prof/graph_printer.rb
Expand Up @@ -44,7 +44,7 @@ def calculate_thread_times
# The default value is STDOUT. # The default value is STDOUT.
# #
# options - Hash of print options. See #setup_options # options - Hash of print options. See #setup_options
# for more information. # for more information.
# #
def print(output = STDOUT, options = {}) def print(output = STDOUT, options = {})
@output = output @output = output
Expand Down

0 comments on commit 20525a3

Please sign in to comment.