sampling_prof 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  metadata.gz: 0794324a024699df824bed72d7ce8b80d886ea80
-  data.tar.gz: f0255164047aaf6d2a9161d0c3a7526d104cac93
-SHA512: 
-  metadata.gz: d52a265a89052c49eea16e4dbd74d3e2efe7f66edafe8be016e0f4aa0ec1dba8e2604db45af20bdc91ceb508d05cea3a607df58560e0c8e5016f65179b1c49b2
-  data.tar.gz: edc8d90595a712a04726364829e752bfa400b78be5cffeaee621c09d9718bc888fc969024c60eb150a897d86cd3fcacce07125c548f7e303ed75432a42a00448
+---
+SHA1:
+  metadata.gz: 63a43eb1a925cf63bf8fdac46684dec8aa383dd9
+  data.tar.gz: 594f3bef449906f6070b6d7340cd3b84ea508871
+SHA512:
+  metadata.gz: a2cd2222cbd8d514eb7fe44105b049ace04900b2f5e693e9d4b9f093b359e2436efd27866f27868de0bac322c3d9985af20894630786444f76aa8d1fdcdfefef
+  data.tar.gz: 48e70656def151a0edf1d598aec45ba83da147fbd04b6c0b9cb893f6ddaa141763c6e3ab03e68c23b6420e8fbef74cdc8595dea2348482f65f0190e1fc4dd7be

data/README.md

@@ -25,24 +25,16 @@ SamplingProf class initializer takes 1 argument:
 
 SamplingProf class also takes block as another option to overwite default output handler, the default output handler will write output data to a local file defined by output_file attribute, which is default to SamplingProf::DEFAULT_OUTPUT_FILE
 
-Notice, the output handler should be called in the context of the thread start profiling. So you can pass parameters to the output handler by Thread local variables.
+Notice, for the performance and thread-safe concerns, the output handler will not be called in the context of the thread start profiling.
 
 When a SamplingProf is initialized, a thread will be started to handle sampling process.
-So you need call SamplingProf#terminate to shutdown the sampling thread after everything is done.
+You need call SamplingProf#terminate to shutdown the sampling thread after everything is done.
 
 ### Sampling interval
 
 This is an interval to control how frequent SamplingProf should take sample of target thread stacktrace.
 The default value is 0.1 seconds.
 
-### Multithreading
-
-When running SamplingProf in multithreading environment (e.g. Rails multithreading production environment), it can profile all requests processing at same time cross threads.
-
-For performance concerns, you should controll how many number of threads' sample while profiling.
-
-Randomly select some threads for profiling, the result is still a statistical approximation.
-
 Output data format
 ---------------
 

data/lib/sampling_prof.rb

@@ -1,5 +1,6 @@
 if RUBY_PLATFORM =~ /java/
   require 'sampling_prof.jar'
+  require 'sampling_profiler'
 else
   require 'sampling_prof/internal'
 end
@@ -11,23 +12,41 @@ class SamplingProf
 
   # options:
   #   sampling_interval: default to 0.1 second
-  #   max: max sampling threads, default to 8 threads
   #   &output_handler: default to write into output_file
-  def initialize(*args, &output_handler)
-    self.sampling_interval = args[0] || 0.1
-    self.output_handler = block_given? ? output_handler : default_output_handler
-    internal_initialize if respond_to?(:internal_initialize)
+  def initialize(sampling_interval=0.1, &output_handler)
+    @profiler = SamplingProfiler.new(sampling_interval)
+    @output_handler = block_given? ? output_handler : default_output_handler
+  end
+
+  def start(handler=nil)
+    @profiler.start(handler || @output_handler)
+  end
+
+  def stop
+    @profiler.stop
+  end
+
+  def profiling?
+    @profiler.profiling?
+  end
+
+  def sampling_interval
+    @profiler.sampling_interval
+  end
+
+  def terminate
+    @profiler.terminate
   end
 
   def output_file
     @output_file ||= DEFAULT_OUTPUT_FILE
   end
 
-  def profile(&block)
-    start
-    yield if block_given?
+  def profile(handler=nil, &block)
+    start(handler)
+    yield
   ensure
-    stop if block_given?
+    stop
   end
 
   def default_output_handler

data/lib/sampling_prof/internal.rb

@@ -1,13 +1,22 @@
-require 'set'
 require 'thread'
 
-class SamplingProf
+class SamplingProfiler
   class Sampling
-    def initialize
+    def initialize(output_handler)
       @samples = Hash.new{|h,k| h[k] = [0, 0] }
       @call_graph = Hash.new{|h,k| h[k] = 0}
       @nodes = {}
       @start_at = Time.now
+      @output_handler = output_handler
+      @stop = false
+    end
+
+    def stop
+      @stop = true
+    end
+
+    def stopped?
+      @stop
     end
 
     def runtime
@@ -18,6 +27,12 @@ class SamplingProf
       !@nodes.empty?
     end
 
+    def output
+      if sampling_data?
+        @output_handler.call(result)
+      end
+    end
+
     def result
       ret = [runtime * 1000]
       ret << @nodes.map {|node| node.join(',')}.join("\n")
@@ -60,27 +75,29 @@ class SamplingProf
     end
   end
 
-  attr_accessor :sampling_interval, :output_handler
+  attr_accessor :sampling_interval
 
-  def internal_initialize
+  def initialize(sampling_interval)
+    @sampling_interval = sampling_interval
     @samplings = {}
+    @running = false
     start_sampling_thread
   end
 
-  def start
+  def start(output_handler)
     unless @samplings.has_key?(Thread.current)
-      @samplings[Thread.current] = Sampling.new
+      @samplings[Thread.current] = Sampling.new(output_handler)
       true
     end
   end
 
   def stop
     if @running
-      if sampling = @samplings.delete(Thread.current)
-        if sampling.sampling_data?
-          @output_handler.call(sampling.result)
+      if sampling = @samplings[Thread.current]
+        unless sampling.stopped?
+          sampling.stop
+          true
         end
-        true
       end
     end
   end
@@ -105,11 +122,19 @@ class SamplingProf
     @sampling_thread ||= Thread.start do
       loop do
         @samplings.dup.each do |t, s|
-          s.process(t)
+          if s.stopped?
+            s.output
+            @samplings.delete(t)
+          else
+            s.process(t)
+          end
         end
         sleep @sampling_interval
         break unless @running
       end
+      @samplings.each do |t, s|
+        s.output
+      end
     end
   end
 end

metadata

@@ -1,70 +1,69 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sampling_prof
-version: !ruby/object:Gem::Version 
-  version: 0.4.4
+version: !ruby/object:Gem::Version
+  version: 0.4.5
 platform: ruby
-authors: 
-  - Xiao Li
-autorequire: 
+authors:
+- Xiao Li
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2014-06-18 00:00:00 Z
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: rake-compiler
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: "0.9"
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 0.9.2
-    type: :development
-    version_requirements: *id001
+date: 2014-06-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  prerelease: false
+  type: :development
 description: |
   SamplingProf is a profiling tool that operates by sampling your running thread stacktrace. The result is statistical approximation, but it allows your code to run near full speed
-
-email: 
-  - swing1979@gmail.com
+email:
+- swing1979@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-  - README.md
-  - lib/sampling_prof.jar
-  - lib/sampling_prof.rb
-  - lib/sampling_prof/internal.rb
+files:
+- README.md
+- lib/sampling_prof.jar
+- lib/sampling_prof.rb
+- lib/sampling_prof/internal.rb
 homepage: https://github.com/xli/sampling_prof
-licenses: 
-  - MIT
+licenses:
+- MIT
 metadata: {}
-
-post_install_message: 
+post_install_message:
 rdoc_options: []
-
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-    - &id002 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-    - *id002
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.1.9
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Simple sampling profiler for ruby
 test_files: []
-